FCL/sf/mw/appsupport: changeset 81:676b6116ca93

--- a/appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -23,6 +23,11 @@
 #include <apgcli.h>    // For RApaLsSession 
 #include <centralrepository.h>
 #include <apmstd.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "apfmimecontentpolicyTraces.h"
+#endif
+
 
 
 /* Closed content and extension information is stored in central repository with UID 0x10003A3F.
@@ -346,11 +351,14 @@
 */
 TBool CApfMimeContentPolicyImpl::IsClosedType(const TDesC& aMimeType) const 
 	{
-	TInt dummy = 0;
+    OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP2_CAPFMIMECONTENTPOLICYIMPL_ISCLOSEDTYPE, "CApfMimeContentPolicyImpl::IsClosedType: The MIME type to be checked : aMimeType=%S", aMimeType );
+    
+    TInt dummy = 0;
 	 
 	// Check if given descriptor is in closed content list.
 	// Find() returns 0 if found from array, non-zero if not.
 	const TBool found = (iCcl->FindIsq(aMimeType, dummy) == 0);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_CAPFMIMECONTENTPOLICYIMPL_ISCLOSEDTYPE, "CApfMimeContentPolicyImpl::IsClosedType: Is the MIME type in the closed content list : found=%d", found );
 	return found;
 	}
 
@@ -361,11 +369,16 @@
 */
 TBool CApfMimeContentPolicyImpl::IsClosedExtension(const TDesC& aFileExtension) const
 	{
+    OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP2_CAPFMIMECONTENTPOLICYIMPL_ISCLOSEDEXTENSION, "CApfMimeContentPolicyImpl::IsClosedExtension: File extension to be checked : aFileExtension=%S", aFileExtension );
+    
+    
 	TInt dummy = 0;
 
 	// Check if given descriptor is in closed content list.
 	// Find() returns 0 if found from array, non-zero if not.
 	const TBool found = (iExtList->FindIsq(aFileExtension, dummy) == 0);
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_CAPFMIMECONTENTPOLICYIMPL_ISCLOSEDEXTENSION, "CApfMimeContentPolicyImpl::IsClosedExtension : Is the file extension in the closed extension list : found=%d", found );
 	return found;
 	}

--- a/appfw/apparchitecture/apgrfx/APGCLI.CPP	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/apgrfx/APGCLI.CPP	Wed Oct 20 17:03:03 2010 +0300
@@ -34,6 +34,10 @@
 #include "APGICNFL.H"
 #include "APGPRIV.H"
 #include "apprivate.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "APGCLITraces.h"
+#endif
 
 const TUint KInitialIconBufSize = sizeof(TSize)*6 + sizeof(TInt);
 const TUint KInitialViewDataBufSize = sizeof(TApaAppViewInfo)*6 + sizeof(TInt);
@@ -150,6 +154,7 @@
 EXPORT_C TInt RApaLsSession::Connect()
 	{
 	TInt r=CreateSession(KAppListServerName,Version(),KAsyncMessageSlots);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, RAPALSSESSION_CONNECT, "RApaLsSession::Connect will return with r=%d", r );
 	return(r); 
 	}
 
@@ -197,6 +202,7 @@
 */
 EXPORT_C TInt RApaLsSession::EmbeddableAppCount(TInt& aCount) const
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_EMBEDDABLEAPPCOUNT, "RApaLsSession::EmbeddableAppCount" );    
 	return DoAppCount(aCount, EAppListServEmbedCount);
 	}
 
@@ -207,9 +213,13 @@
 	__ASSERT_DEBUG(aCommand==EAppListServEmbedCount || aCommand==EAppListServAppCount,Panic(EDPanicWrongCommand));
 	const TInt returnValue = SendReceiveWithReconnect(aCommand,TIpcArgs());
 	if (returnValue < 0)
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, RAPALSSESSION_DOAPPCOUNT, "RApaLsSession::DoAppCount returned with (returnValue)=%d", returnValue );        
 		return returnValue;
+	    }
 	
 	aCount = returnValue;
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_DOAPPCOUNT, "RApaLsSession::DoAppCount will return with KErrNone" );
 	return KErrNone;
 	}
 
@@ -456,6 +466,8 @@
 	{
 	TPckg<TApaAppInfo> info(aInfo);
 	TInt err = SendReceiveWithReconnect(EAppListServGetNextApp, TIpcArgs(aScreenMode,&info));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, RAPALSSESSION_GETNEXTAPP, "SendReceiveWithReconnect returned with error returned from SendReceiveWithReconnect : err=%d", err );
+	
 	if (!err)
 		aInfo = info();
 	else if (err==KErrNotFound)
@@ -463,6 +475,8 @@
 	else if (err==KErrCorrupt)
 		err = EAppListInvalid;
 	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP1_RAPALSSESSION_GETNEXTAPP, "RApaLsSession::GetNextApp will return with err=%d", err );
+	
 	return err;
 	}
 
@@ -516,9 +530,14 @@
 	{
 	const TInt result = SendReceiveWithReconnect(EAppListServGetDefaultScreenNumber, TIpcArgs(aAppUid.iUid));
 	if (result < 0)
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,APPARC_TRACE_NORMAL, RAPALSSESSION_GETDEFAULTSCREENNUMBER, "SendReceiveWithReconnect returned with result=%d. Return from here", result );
+        
 		return result;
-
+	    }
+	
 	aDefaultScreenNumber = result;
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_GETDEFAULTSCREENNUMBER, "RApaLsSession::GetDefaultScreenNumber will return with KErrNone" );
 	return KErrNone;
 	}
 
@@ -571,6 +590,7 @@
 EXPORT_C TInt RApaLsSession::GetAppIconSizes(TUid aAppUid, CArrayFixFlat<TSize>& aArrayToFill) const
 	{
 	TRAPD(error, DoGetAppIconSizesL(aAppUid,aArrayToFill));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG , APPARC_TRACE_FLOW, RAPALSSESSION_GETAPPICONSIZES, "RApaLsSession::GetAppIconSizes will return with error=%d", error );
 	return error;
 	}
 
@@ -598,6 +618,8 @@
 	// Get the data from the AppArc server
 	
 	const TInt sizeRequired = SendReceiveWithReconnect(aOpcode,TIpcArgs(aAppUid.iUid,buffer->Size(),&bufPtr));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_INTERNAL, RAPALSSESSION_FETCHARRAYL, "SendReceiveWithReconnect returned with sizeRequired=%d", sizeRequired );
+	
 	User::LeaveIfError(sizeRequired); 	// Negative values are error codes
 	if (sizeRequired > 0)	// If the initial buffer was too small...
 		{
@@ -650,13 +672,21 @@
 	SReturnData_AppIconByUidAndSize returnData = {0,0};
 	TPckg<SReturnData_AppIconByUidAndSize> returnData_asDescriptor(returnData);
 	TInt error = SendReceiveWithReconnect(EAppListServAppIconByUidAndSize, TIpcArgs(aAppUid.iUid,aSize.iWidth,aSize.iHeight,&returnData_asDescriptor));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, RAPALSSESSION_GETAPPICON, "SendReceiveWithReconnect returned with error=%d", error );
+	
 	if (!error)
 		{
 		error = aAppBitmap.Duplicate(returnData.iIcon);
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP1_RAPALSSESSION_GETAPPICON, "aAppBitmap.Duplicate returned with error=%d", error );
+		
 		if (!error)
+		    {
 			error = aAppBitmap.Mask()->Duplicate(returnData.iIconMask);
+		    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP2_RAPALSSESSION_GETAPPICON, "aAppBitmap.Mask->Duplicate returned with error=%d", error );
+		    }
 		}
-
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP3_RAPALSSESSION_GETAPPICON, "RApaLsSession::GetAppIcon will return with error=%d", error );
 	return error;
 	}
 
@@ -684,13 +714,22 @@
 	SReturnData_AppIconByUid returnData = {0,0};
 	TPckg<SReturnData_AppIconByUid> returnData_asDescriptor(returnData);
 	TInt error = SendReceiveWithReconnect(EAppListServAppIconByUid,TIpcArgs(aAppUid.iUid,aSize,&returnData_asDescriptor));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP5_RAPALSSESSION_GETAPPICON, "SendReceiveWithReconnect returned with error=%d", error );
+	
+	
 	if (!error)
 		{
 		error = aAppBitmap.Duplicate(returnData.iIcon);
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP6_RAPALSSESSION_GETAPPICON, "aAppBitmap.Duplicate returned with error=%d", error );
+		
 		if (!error)
+		    {
 			error = aAppBitmap.Mask()->Duplicate(returnData.iIconMask);
+			OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP7_RAPALSSESSION_GETAPPICON, "aAppBitmap.Mask()->Duplicate returned with error=%d", error );
+		    }
 		}
-		
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP8_RAPALSSESSION_GETAPPICON, "RApaLsSession::GetAppIcon will return with error=%d", error );
 	return error;
 	}
 
@@ -716,10 +755,14 @@
 	__ASSERT_ALWAYS(aFile.SubSessionHandle() == KNullHandle, Panic(EDPanicHandleAlreadySet));
 	TPckgBuf<TInt> fileHandle;
 	TInt sessionHandleOrErrorCode = SendReceiveWithReconnect(EAppListServAppIconFileHandle, TIpcArgs(aAppUid.iUid, &fileHandle));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP4_RAPALSSESSION_GETAPPICON, "SendReceiveWithReconnect returned with sessionHandleOrErrorCode=%d", sessionHandleOrErrorCode );
+	
 	if (sessionHandleOrErrorCode >= KErrNone)
 	    {
 	    sessionHandleOrErrorCode = aFile.AdoptFromServer(sessionHandleOrErrorCode, fileHandle());
+	    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP9_RAPALSSESSION_GETAPPICON, "aFile.AdoptFromServer returned with sessionHandleOrErrorCode=%d", sessionHandleOrErrorCode );
 	    }
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP10_RAPALSSESSION_GETAPPICON, "RApaLsSession::GetAppIcon will return with sessionHandleOrErrorCode=%d", sessionHandleOrErrorCode );
 	return sessionHandleOrErrorCode;
 	}   
 
@@ -735,7 +778,8 @@
 codes. */
 EXPORT_C TInt RApaLsSession::AppForDocument(const TDesC& aFileName, TUid& aAppUid, TDataType& aDataType) const
 	{
-	return DoAppForDocumentOptionallySpecifyingService(aFileName, TUid::Null(), aAppUid, aDataType, EAppListServAppForDocument);
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_APPFORDOCUMENT, "RApaLsSession::AppForDocument" );
+ 	return DoAppForDocumentOptionallySpecifyingService(aFileName, TUid::Null(), aAppUid, aDataType, EAppListServAppForDocument);
 	}
 
 
@@ -753,7 +797,8 @@
 */
 EXPORT_C TInt RApaLsSession::AppForDocument(const RFile& aFile, TUid& aAppUid, TDataType& aDataType) const
 	{
-	return DoAppForDocumentOptionallySpecifyingService(aFile, TUid::Null(), aAppUid, aDataType, EAppListServAppForDocumentPassedByFileHandle);
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_APPFORDOCUMENT, "RApaLsSession::AppForDocument" );
+ 	return DoAppForDocumentOptionallySpecifyingService(aFile, TUid::Null(), aAppUid, aDataType, EAppListServAppForDocumentPassedByFileHandle);
 	}
 
 
@@ -769,6 +814,7 @@
 	{
 	_LIT(KLitSysBin, "\\sys\\bin\\");
 	aProgram=(TParsePtrC(aFileName).Path().CompareF(KLitSysBin)==0);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_ISPROGRAM, "RApaLsSession::IsProgram will return with KErrNone" );
 	return KErrNone;
 	}
 
@@ -789,9 +835,13 @@
 	{
 	const TInt preferredBufSize = SendReceiveWithReconnect(EAppListServPreferredBufSize, TIpcArgs());
 	if (preferredBufSize < KErrNone)
-		return preferredBufSize; // it's an error
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_GETPREFERREDBUFSIZE, "Error condition - RApaLsSession::GetPreferredBufSize will return with preferredBufSize=%d", preferredBufSize );
+        return preferredBufSize; // it's an error
+	    }
 
 	aPreferredBufSize = preferredBufSize;
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_GETPREFERREDBUFSIZE, "RApaLsSession::GetPreferredBufSize will return with KErrNone" );
 	return KErrNone;
 	}
 
@@ -812,9 +862,12 @@
 	{
 	const TInt returnValue = SendReceiveWithReconnect(EAppListServGetBufSize, TIpcArgs());
 	if (returnValue < 0)
-		return returnValue;
-
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_GETMAXDATABUFSIZE, "RApaLsSession::GetMaxDataBufSize will return with returnValue=%d", returnValue );
+ 		return returnValue;
+	    }
 	aBufSize = returnValue;
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_GETMAXDATABUFSIZE, "RApaLsSession::GetMaxDataBufSize will return with KErrNone" );
 	return KErrNone;
 	}
 
@@ -838,7 +891,8 @@
 */
 EXPORT_C TInt RApaLsSession::SetMaxDataBufSize(TInt aBufSize)
 	{
-	return SendReceiveWithReconnect(EAppListServSetBufSize,TIpcArgs(aBufSize));
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_SETMAXDATABUFSIZE, "RApaLsSession::SetMaxDataBufSize" );
+ 	return SendReceiveWithReconnect(EAppListServSetBufSize,TIpcArgs(aBufSize));
 	} //lint !e1762 Suppress member function could be made const
 
 
@@ -863,13 +917,21 @@
 	SReturnData_ViewIconByUidAndSize returnData = {0,0};
 	TPckg<SReturnData_ViewIconByUidAndSize> returnData_asDescriptor(returnData);
 	TInt error = SendReceiveWithReconnect(EAppListServViewIconByUidAndSize,TIpcArgs(&inputData,&returnData_asDescriptor));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, RAPALSSESSION_GETAPPVIEWICON, "SendReceiveWithReconnect returned with error=%d", error );
+	
 	if (!error)
 		{
 		error = aViewBitmap.Duplicate(returnData.iIcon);
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP1_RAPALSSESSION_GETAPPVIEWICON, "aViewBitmap.Duplicate returned with error=%d", error );
+		
 		if (!error)
-			error = aViewBitmap.Mask()->Duplicate(returnData.iIconMask);
+		    {
+    		error = aViewBitmap.Mask()->Duplicate(returnData.iIconMask);
+    	    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP2_RAPALSSESSION_GETAPPVIEWICON, "aViewBitmap.Mask().Duplicate returned with error=%d", error );
+    	    }
 		}
-		
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP3_RAPALSSESSION_GETAPPVIEWICON, "RApaLsSession::GetAppViewIcon will return with error=%d", error );
 	return error;
 	}
 
@@ -889,6 +951,7 @@
 EXPORT_C TInt RApaLsSession::GetAppViews(CApaAppViewArray& aAppViews, TUid aAppUid) const
 	{
 	TRAPD(error,DoGetAppViewsL(aAppViews,aAppUid));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_GETAPPVIEWS, "DoGetAppViewsL returned.RApaLsSession::GetAppViews will return with error=%d", error );
 	return error;
 	}
 
@@ -915,6 +978,7 @@
 EXPORT_C TInt RApaLsSession::GetAppOwnedFiles(CDesCArray& aAppOwnedFiles, TUid aAppUid) const
 	{
 	TRAPD(error,DoGetAppOwnedFilesL(aAppOwnedFiles,aAppUid));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_GETAPPOWNEDFILES, "DoGetAppOwnedFilesL returned.RApaLsSession::GetAppOwnedFiles will return with error=%d", error );
 	return error;
 	}
 
@@ -932,11 +996,15 @@
 */
 EXPORT_C TInt RApaLsSession::NumberOfOwnDefinedIcons(TUid aAppUid, TInt& aCount) const
 	{
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_NUMBEROFOWNDEFINEDICONS, "RApaLsSession::NumberOfOwnDefinedIcons: Application UID - aAppUid.iUid=%d", aAppUid.iUid );
+    
+    
 	TPckgBuf<TInt> pckg;
 	const TInt err = SendReceiveWithReconnect(EAppListServNumberOfOwnDefinedIcons,TIpcArgs(aAppUid.iUid,&pckg));
 	if (!err)
 		aCount = pckg();
-
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_NUMBEROFOWNDEFINEDICONS, "RApaLsSession::NumberOfOwnDefinedIcons will return with err=%d", err );
 	return err;
 	}
 
@@ -957,21 +1025,29 @@
 */
 EXPORT_C TInt RApaLsSession::GetAppIcon(TUid aAppUid, HBufC*& aFullFileName) const
 	{
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP11_RAPALSSESSION_GETAPPICON, "RApaLsSession::GetAppIcon;aAppUid=%d;aFullFileName=%S", aAppUid.iUid, *aFullFileName );
+    
 	TFileName fileName;
 	TPckg<TFileName> filenamePckg(fileName);
 	const TInt err = SendReceiveWithReconnect(EAppListServAppIconFileName, TIpcArgs(aAppUid.iUid, &filenamePckg));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP12_RAPALSSESSION_GETAPPICON, "SendReceiveWithReconnect returned with err=%d", err );
+	
 	if (!err)
 		{
 		HBufC* fullFileName = HBufC::New(fileName.Length());
 		if (fullFileName == NULL)
-			return KErrNoMemory;
+		    {
+            OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP13_RAPALSSESSION_GETAPPICON, "RApaLsSession::GetAppIcon will return with KErrNoMemory" );
+            return KErrNoMemory;
+		    }
 		else
 			{
 			*fullFileName = fileName;
 			aFullFileName = fullFileName; // ownership transferred to caller
 			}
 		}
-		
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP14_RAPALSSESSION_GETAPPICON, "RApaLsSession::GetAppIcon will retun with err=%d", err );
 	return err;
 	}
 
@@ -994,14 +1070,21 @@
 */
 EXPORT_C TInt RApaLsSession::GetAppViewIcon(TUid aAppUid, TUid aViewUid, HBufC*& aFullFileName) const
 	{
-	TFileName fileName;
+    OstTraceDefExt3( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP6_RAPALSSESSION_GETAPPVIEWICON, "RApaLsSession::GetAppViewIcon;aAppUid=%d;aViewUid=%d;aFullFileName=%S", aAppUid.iUid, aViewUid.iUid , *aFullFileName );
+    
+  	TFileName fileName;
 	TPckg<TFileName> filenamePckg(fileName);
 	const TInt err = SendReceiveWithReconnect(EAppListServAppViewIconFileName, TIpcArgs(aAppUid.iUid, aViewUid.iUid, &filenamePckg));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP4_RAPALSSESSION_GETAPPVIEWICON, "SendReceiveWithReconnect returned with err=%d", err );
+	
 	if (!err)
 		{
 		HBufC* fullFileName = HBufC::New(fileName.Length());
 		if (fullFileName == NULL)
-			return KErrNoMemory;
+		    {
+            OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP5_RAPALSSESSION_GETAPPVIEWICON, "RApaLsSession::GetAppViewIcon will return with KErrNoMemory" );
+ 			return KErrNoMemory;
+		    }
 		else
 			{
 			*fullFileName = fileName;
@@ -1009,7 +1092,8 @@
 			}
 		}
 
-	return err;
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP7_RAPALSSESSION_GETAPPVIEWICON, "RApaLsSession::GetAppViewIcon will return with err=%d", err );
+ 	return err;
 	}
 
 
@@ -1072,7 +1156,8 @@
 	const TInt err = SendReceiveWithReconnect(EAppListInsertDataMappingIfHigher, TIpcArgs(&dataType, TInt(aPriority), aUid.iUid, &inserted));
 	if(!err)
 		aInserted = inserted();
-		
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_INSERTDATAMAPPINGIFHIGHER, "RApaLsSession::InsertDataMappingIfHigher will return with error returned by SendReceiveWithReconnect : err=%d", err );
 	return err;
 	} //lint !e1762 Suppress member function could be made const
 
@@ -1131,7 +1216,10 @@
 	TPckg<TUid> uid(aAppUid);
 	const TInt returnValue = SendReceiveWithReconnect(EAppListServGetAppByDataType,TIpcArgs(&dataType, aServiceUid.iUid, &uid));
 	if (returnValue < 0)
-		return returnValue;
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_GETAPPBYDATATYPE, "RApaLsSession::GetAppByDataType will return with error returned by SendReceiveWithReconnect : returnValue=%d", returnValue );
+        return returnValue;
+	    }
 	
 	return (aAppUid == KNullUid ? KErrNotFound : KErrNone);
 	} //lint !e1764 Suppress reference parameter 'aAppUid' could be declared const ref
@@ -1146,11 +1234,15 @@
 */
 EXPORT_C TInt RApaLsSession::ApplicationLanguage(TUid aAppUid, TLanguage& aLanguage) const
 	{
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_APPLICATIONLANGUAGE, "RApaLsSession::ApplicationLanguage;Application UID is aAppUid=%d", aAppUid.iUid );
+    
 	TPckgBuf<TLanguage> pckg;
 	const TInt err = SendReceiveWithReconnect(EAppListServApplicationLanguage, TIpcArgs(aAppUid.iUid, &pckg));
 	if (!err)
 		aLanguage = pckg();
-
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_INTERNAL, DUP2_RAPALSSESSION_APPLICATIONLANGUAGE, "Application language: aLanguage returned = %d", aLanguage );
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_APPLICATIONLANGUAGE, "RApaLsSession::ApplicationLanguage will return with err = %d", err );
 	return err;
 	}
 
@@ -1355,7 +1447,8 @@
 */
 EXPORT_C CApaAppServiceInfoArray* RApaLsSession::GetAppServiceOpaqueDataLC(TUid aAppUid, TUid aServiceUid) const
 	{
-	CArrayFixFlat<TApaAppServiceInfo>* serviceArray = new(ELeave) CArrayFixFlat<TApaAppServiceInfo>(4);
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_GETAPPSERVICEOPAQUEDATALC, "RApaLsSession::GetAppServiceOpaqueDataLC;aAppUid=%d;aServiceUid=%d", aAppUid.iUid, aServiceUid.iUid );
+    CArrayFixFlat<TApaAppServiceInfo>* serviceArray = new(ELeave) CArrayFixFlat<TApaAppServiceInfo>(4);
 	CleanupStack::PushL(TCleanupItem(CleanupAppServiceArray, serviceArray));
 	CBufBase* buffer = GetServiceBufferLC(EAppListServGetAppServiceOpaqueData, aAppUid, aServiceUid);
 	RBufReadStream readStream(*buffer);
@@ -1433,13 +1526,17 @@
 	if (!aFileName.Length())
 		{
 		aAppUid = KNullUid;
+		OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE, "RApaLsSession::DoAppForDocumentOptionallySpecifyingService will return with KErrNone" );
 		return KErrNone;
 		}
 		
 	HBufC8* buffer = NULL;
 	TInt error = GetNewBufferFromFile(buffer, aFileName);
 	if (error)
-		return error;
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP5_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE, "RApaLsSession::DoAppForDocumentOptionallySpecifyingService will return with error return by GetNewBufferFromFile : error=%d", error );
+        return error;
+	    }
 
 	SReturnData_AppForDocument returnData;
 	TPckg<SReturnData_AppForDocument> returnData_asDescriptor(returnData);
@@ -1452,7 +1549,8 @@
 		aAppUid = returnData.iUid;
 		aDataType = returnData.iDataType;
 		}
-
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP6_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE, "RApaLsSession::DoAppForDocumentOptionallySpecifyingService will return with thr return value from SendReceiveWithReconnect : error=%d", error );
 	return error;
 	}
 
@@ -1464,15 +1562,21 @@
 	TPckg<SReturnData_AppForDocument> returnData_asDescriptor(returnData);
 	TIpcArgs ipcArgs(&returnData_asDescriptor, aServiceUid.iUid);
 	TInt error = aFile.TransferToServer(ipcArgs, 2, 3);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP2_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE, "aFile.TransferToServer returned with error=%d", error );
+	
 	if (!error)
+	    {
 		error = SendReceiveWithReconnect(aOpcode, ipcArgs);
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP3_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE, "SendReceiveWithReconnect returned with error=%d", error );
+		}
 
 	if (!error)
 		{
 		aAppUid = returnData.iUid;
 		aDataType = returnData.iDataType;
 		}
-		
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP4_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE, "RApaLsSession::DoAppForDocumentOptionallySpecifyingService will return with error=%d", error );
 	return error;
 	}
 
@@ -1483,21 +1587,32 @@
 	aBuffer = NULL;
 	TInt preferredBufSize = 0;
 	const TInt error = GetPreferredBufSize(preferredBufSize);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, RAPALSSESSION_GETNEWBUFFERFROMFILE, "GetPrefferredBufSize returned with error=%d", error );
+	
 	if (error < KErrNone)
-		return error;
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_GETNEWBUFFERFROMFILE, "RApaLsSession::GetNewBufferFromFile returned with error=%d", error );
+  		return error;
+	    }
 
 	HBufC8* const buffer = HBufC8::New(Max(8, preferredBufSize)); // 8 is a sensible minimum
 	if (!buffer)
-		return KErrNoMemory;
+	    {
+        OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP2_RAPALSSESSION_GETNEWBUFFERFROMFILE, "RApaLsSession::GetNewBufferFromFile will return with KErrNoMemory" );
+        return KErrNoMemory;
+	    }
 
 	const RFs* fsSession = FsSession();
 	RFs tempFsSession;
 	if (!fsSession)
 		{
 		const TInt error = tempFsSession.Connect();
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP3_RAPALSSESSION_GETNEWBUFFERFROMFILE, "temFsSession.Connect() returned with error=%d", error );
+		
 		if (error)
 			{
 			delete buffer;
+			OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP4_RAPALSSESSION_GETNEWBUFFERFROMFILE, "RApaLsSession::GetNewBufferFromFile will return with error=%d", error );
 			return error;
 			}
 
@@ -1508,10 +1623,13 @@
 		{
 		TPtr8 buffer_asWritable(buffer->Des());
 		const TInt error = fsSession->ReadFileSection(aFileName, 0, buffer_asWritable, preferredBufSize);
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP5_RAPALSSESSION_GETNEWBUFFERFROMFILE, "fsSession->ReadFileSection returned with error=%d", error );
+		
 		if (error)
 			{
 			delete buffer;
 			tempFsSession.Close();
+			OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP6_RAPALSSESSION_GETNEWBUFFERFROMFILE, "RApaLsSession::GetNewBufferFromFile will return with error=%d", error );
 			return error;
 			}
 		}
@@ -1520,6 +1638,7 @@
 		tempFsSession.Close();
 		
 	aBuffer = buffer;
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP7_RAPALSSESSION_GETNEWBUFFERFROMFILE, "RApaLsSession::GetNewBufferFromFile will return with KErrNone" );
 	return KErrNone;
 	}
 
@@ -1654,7 +1773,8 @@
 	User::LeaveIfError(SendReceiveWithReconnect(EAppListServDeregisterNonNativeApplication, TIpcArgs(aApplication.iUid)));
 #else
 	(void) aApplication;
-    User::Leave(KErrNotSupported);  	
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_DEREGISTERNONNATIVEAPPLICATIONL, "RApaLsSession::DeregisterNonNativeApplicationL will leave with KErrNotSupported" );
+	User::Leave(KErrNotSupported);  	
 #endif
 	} //lint !e1762 Suppress member function could be made const
 	
@@ -1744,7 +1864,8 @@
 */
 EXPORT_C TInt RApaLsSession::GetAppType(TUid& aTypeUid, TUid aAppUid) const
 	{
-	TPckg<TUid> uid(aTypeUid);
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_GETAPPTYPE, "Applicatio's uid of of which to get the application type : aAppUid=%d", aAppUid.iUid );
+    TPckg<TUid> uid(aTypeUid);
 	return SendReceiveWithReconnect(EAppListServGetAppType,TIpcArgs(aAppUid.iUid,&uid));
 	} //lint !e1764 Suppress reference parameter 'aTypeUid' could be declared const ref
 	
@@ -1774,7 +1895,9 @@
 	CBufFlat* buffer = 0;
 	TRAPD(err, buffer = CreateRegFilesBufferL(aRegFiles));
 	if (err)
-		return err;
+	    {
+        return err;
+	    }
 	
 	TPtr8 ptr = buffer->Ptr(0);
 	const TInt returnValue=SendReceiveWithReconnect(EAppListServForceRegistration,TIpcArgs(&ptr));
@@ -1795,7 +1918,8 @@
 	TInt ret = SendReceive(aFunction, aIpcArgs);
 	if(ret != KErrServerTerminated)
 		{
-		return ret;
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_SENDRECEIVEWITHRECONNECT, "RApaLsSession::SendReceiveWithReconnect will return with ret=%d", ret );
+  		return ret;
 		}
 
 	RApaLsSession ls;
@@ -1807,6 +1931,9 @@
 		localThis->iHandle=ls.iHandle;
 		ret = SendReceive(aFunction, aIpcArgs);
 		}
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_SENDRECEIVEWITHRECONNECT, "RApaLsSession::SendReceiveWithReconnect will return with ret=%d", ret );
+	
 	return ret;
 	}
 
@@ -1950,12 +2077,18 @@
     //Create a buffer with the application UID and corresponding action information.
     CBufFlat* buffer = 0;
     TRAPD(err, buffer = CreateAppUpdateInfoBufferL(aAppUpdateInfo));
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, RAPALSSESSION_UPDATEAPPLISTL, "CreateAppUpdateInfoBufferL returned with error=%d", err );
+    
     if (err)
+        {
+        OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_UPDATEAPPLISTL, "RApaLsSession::UpdateAppListL will return with error returned from CreateAppUpdateInfoBufferL" );
         return err;
+        }
     
     TPtr8 ptr = buffer->Ptr(0);
     const TInt returnValue=SendReceiveWithReconnect(EAppListServUpdateAppList,TIpcArgs(&ptr));
     delete buffer;
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP2_RAPALSSESSION_UPDATEAPPLISTL, "RApaLsSession::UpdateAppListL will return with error from SendReceiveWithReconnect : returnValue=%d", returnValue );
     return returnValue;
     }
 
@@ -1980,17 +2113,24 @@
 {
     //If there are no applications to update, just return.
     if(aForceRegAppsInfo.Count()==0)
+        {
+        OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_FORCEREGISTRATION, "RApaLsSession::ForceRegistration will return if there are no applications to update" );
         return(KErrNone);
+        }
     
     //Create a buffer with the application uid and corresponding action information.
     CBufFlat* buffer = 0;
     TRAPD(err, buffer = CreateForceRegAppInfoBufferL(aForceRegAppsInfo));
     if (err)
+        {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_FORCEREGISTRATION, "RApaLsSession::ForceRegistration will return with error returned from CreateForceRegAppInfoBufferL : err=%d", err );
         return err;
+        }
     
     TPtr8 ptr = buffer->Ptr(0);
     const TInt returnValue=SendReceiveWithReconnect(EAppListServForceRegistration,TIpcArgs(&ptr));
     delete buffer;
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP2_RAPALSSESSION_FORCEREGISTRATION, "RApaLsSession::ForceRegistration will return with the return value of SendReceiveWithReconnect : returnValue=%d", returnValue );
     return returnValue;
 }
 
@@ -2129,6 +2269,7 @@
         }
     
     CleanupStack::PopAndDestroy(buffer);
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_UPDATEDAPPSINFOL, "RApaLsSession::UpdatedAppsInfoL will return with returnValue=%d", returnValue );
     return returnValue;
     }

--- a/appfw/apparchitecture/apgrfx/apgstart.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/apgrfx/apgstart.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -23,6 +23,10 @@
 #include "APGCLI.H"
 #include "APACMDLN.H"
 #include "APGSTD.H"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "apgstartTraces.h"
+#endif
 
 #if defined(USE_IH_RAISE_EVENT)		
 // For performance system test 
@@ -97,13 +101,15 @@
 */
 EXPORT_C TInt RApaLsSession::StartApp(const CApaCommandLine& aCommandLine,TThreadId& aThreadId,TRequestStatus* aRequestStatusForRendezvous )
 	{
-	return DoStartApp(aCommandLine, &aThreadId,aRequestStatusForRendezvous);
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_STARTAPP, "RApaLsSession::StartApp will return value of DoStartApp" );
+    return DoStartApp(aCommandLine, &aThreadId,aRequestStatusForRendezvous);
 	}
 
 
 TInt RApaLsSession::DoStartApp(const CApaCommandLine& aCommandLine, TThreadId* aThreadId,TRequestStatus* aRequestStatusForRendezvous)
 	{
 	TRAPD(error, DoStartAppL(aCommandLine, aThreadId, aRequestStatusForRendezvous));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, RAPALSSESSION_DOSTARTAPP, "RApaLsSession::DoStartApp will return with error returned from DoStartAppL : error=%d", error );
 	return error;
 	}
 
@@ -134,6 +140,7 @@
 		// requesting from rule-based plug-ins if we can run an application 
 		// if server fails while requested rule-based plug-ins it returns a negative value - proceed with launching the application in this case
 		const TBool okayToRun = SendReceiveWithReconnect(EAppListServRuleBasedLaunching, TIpcArgs(&logicalExecutableName));
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, RAPALSSESSION_DOSTARTAPPL, "RApaLsSession::DoStartAppL will leave with error returned by SebdReceiveWithReconnect okayToRun=%d", okayToRun );
 		User::LeaveIfError(!okayToRun ? KErrCancel : okayToRun);	// May leave with KErrNotFound if exe not found
 		}
 
@@ -147,6 +154,7 @@
 	if (Handle()!=KNullHandle)
 		{
 		const TInt lengthOfOpaqueData=User::LeaveIfError(SendReceiveWithReconnect(EAppListServGetNativeExecutableNameIfNonNative, TIpcArgs(&nativeExecutableNameOfNonNativeApplication, &logicalExecutableName)));
+		OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, DUP1_RAPALSSESSION_DOSTARTAPPL, "RApaLsSession::DoStartAppL will leave with error returned by GetNewOpaueData" );
 		User::LeaveIfError(GetNewOpaqueData(opaqueData, lengthOfOpaqueData));
 		}
 
@@ -154,13 +162,18 @@
 	// assumes "logicalExecutableName" is itself a native executable
 	TUidType uidType(KNullUid, KNullUid, KNullUid);
 	TInt err = process.CreateWithStackOverride(logicalExecutableName, KNullDesC, uidType, MinApplicationStackSize(), EOwnerProcess);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR_INTERNAL, DUP2_RAPALSSESSION_DOSTARTAPPL, "process.CreateWithStackOverride returned with err=%d", err );
+	
 	 
 	// If we haven't been able to create the process using the native executable name from the command line
 	// object, instead try to create it using the native executable name of the non-native application.
 	// Can only do this if apparc is connected and thus this name has been retrieved above and 
 	// nativeExecutableNameOfNonNativeApplication populated.
 	if (err && nativeExecutableNameOfNonNativeApplication.Length() > 0)
+	    {
 		err = process.CreateWithStackOverride(nativeExecutableNameOfNonNativeApplication, KNullDesC, uidType, MinApplicationStackSize(), EOwnerProcess);
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR_INTERNAL, DUP3_RAPALSSESSION_DOSTARTAPPL, "RApaLsSession::DoStartAppL err=%d", err );
+	    }
 
 	// if we managed to create the process via either of the two methods attempted above (with the native 
 	// name or the native name of the non-native app), finish setting it up and "resume" it
@@ -195,6 +208,8 @@
 		}
 
 	CleanupStack::PopAndDestroy(&opaqueData);
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, DUP4_RAPALSSESSION_DOSTARTAPPL, "RApaLsSession::DoStartAppL will leave with err=%d", err );
 	User::LeaveIfError(err);
 	} //lint !e1762 Suppress member function could be made const
 	
@@ -234,14 +249,20 @@
 */
 TInt RApaLsSession::GetExecutableNameAndNewOpaqueData(TDes& aNativeExecutableName, TDes& aLogicalExecutableName, HBufC8*& aOpaqueData, TIpcArgs& aIpcArgs, TInt aOpcode) const
 	{
+    OstTraceDefExt4( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, DUP1_RAPALSSESSION_GETEXECUTABLENAMEANDNEWOPAQUEDATA, "RApaLsSession::GetExecutableNameAndNewOpaqueData;aNativeExecutableName=%S;aLogicalExecutableName=%S;aOpaqueData=%s;aOpcode=%d", aNativeExecutableName, aLogicalExecutableName, *aOpaqueData, aOpcode );
+    
 	aNativeExecutableName.SetLength(0); // if this comes out zero-length from EAppListServExecutableNameForXxx below then use the logicalExecutableName in RProcess::Create (in this case it's a native C++ application)
 	aIpcArgs.Set(0, &aNativeExecutableName);
 	aIpcArgs.Set(1, &aLogicalExecutableName);
 	
 	const TInt lengthOfOpaqueData = SendReceiveWithReconnect(aOpcode, aIpcArgs);
 	if (lengthOfOpaqueData < 0)
-		return lengthOfOpaqueData; // it's an error code
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, RAPALSSESSION_GETEXECUTABLENAMEANDNEWOPAQUEDATA, "RApaLsSession::GetExecutableNameAndNewOpaqueData will return with error returned by SendReceiveWithConnect : lengthOfOpaqueData=%d", lengthOfOpaqueData );
+        return lengthOfOpaqueData; // it's an error code
+	    }
 
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, DUP3_RAPALSSESSION_GETEXECUTABLENAMEANDNEWOPAQUEDATA, "RApaLsSession::GetExecutableNameAndNewOpaqueData will return with value returned by GetNewOpaqueData" );
 	return GetNewOpaqueData(aOpaqueData, lengthOfOpaqueData);
 	}
 
@@ -251,9 +272,14 @@
 */
 TInt RApaLsSession::GetNewOpaqueData(HBufC8*& aOpaqueData, TInt aLengthOfOpaqueData) const
 	{
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_GETNEWOPAQUEDATA_ENTRY, "RApaLsSession::GetNewOpaqueData;aOpaqueData=%s;aLengthOfOpaqueData=%d", *aOpaqueData, aLengthOfOpaqueData );
+    
 	aOpaqueData = NULL;
 	if(!aLengthOfOpaqueData)
-		return KErrNone;	// Nothing to get
+	    {
+        OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, RAPALSSESSION_GETNEWOPAQUEDATA, "RApaLsSession::GetNewOpaqueData will return with KErrNone");
+        return KErrNone;	// Nothing to get
+	    }
 	
 	// Make sure it's not a negative error code
 	ASSERT(aLengthOfOpaqueData > 0);
@@ -271,6 +297,7 @@
 	else
 		aOpaqueData = opaqueData;
 	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, DUP1_RAPALSSESSION_GETNEWOPAQUEDATA, "RApaLsSession::GetNewOpaqueData will return with error returned from SendReceiveWithReconnect error=%d", error );
 	return error;
 	}
 
@@ -289,7 +316,8 @@
 
 					DoStartApplicationL(aNativeExecutableName, *commandLine, aThreadId, aRequestStatusForRendezvous);
 					CleanupStack::PopAndDestroy(commandLine));
-					
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, DUP1_RAPALSSESSION_STARTAPPLICATIONPASSINGFILEHANDLE, "RApaLsSession::StartApplicationPassingFileHandle will return with error=%d", error );
 	return error;
 	}
 	
@@ -305,7 +333,8 @@
 
 					DoStartApplicationL(aNativeExecutableName, *commandLine, aThreadId, aRequestStatusForRendezvous);
 					CleanupStack::PopAndDestroy(commandLine));
-
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW_INTERNAL, RAPALSSESSION_STARTAPPLICATIONPASSINGDOCUMENTNAME, "RApaLsSession::StartApplicationPassingDocumentName will return with error =%d", error );
 	return error;
 	}
 
@@ -321,6 +350,8 @@
 	if(Handle() != KNullHandle)	// Connected to AppArc server?
 		{
 		const TBool okayToRun = SendReceiveWithReconnect(EAppListServRuleBasedLaunching, TIpcArgs(&actualNativeExecutableName));
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, RAPALSSESSION_DOSTARTAPPLICATIONL, "SendReceiveWithReconnect with okayToRun=%d", okayToRun );
+		
 		// If server fails while requested rule-based plug-ins it returns a negative value. 
 		// We shall proceed with launching an application in this case.
 		User::LeaveIfError(!okayToRun ? KErrCancel : okayToRun);	// May leave with KErrNotFound if exe is not found or KErrNotSupported if embeddable only
@@ -363,10 +394,16 @@
 */
 EXPORT_C TInt RApaLsSession::StartDocument(const TDesC& aDocFileName, TThreadId& aThreadId, TLaunchType /*aLaunchType*/)
 	{
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_STARTDOCUMENT_ENTRY, "RApaLsSession::StartDocument :aDocFileName=%S;aThreadId=%x", aDocFileName, ( TUint )&( aThreadId ) );
+    
+    
 	HBufC8* buffer = NULL;
 	TInt error = GetNewBufferFromFile(buffer, aDocFileName);
 	if (error)
-		return error;
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP2_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error returned by GetNewBufferFromFile : error=%d", error );
+        return error;
+	    }
 
 	TFileName nativeExecutableName; // the name of the EXE that we pass to RProcess::Create
 	TFileName logicalExecutableName; // the name of the MIDlet, Python script, etc
@@ -375,16 +412,22 @@
 	ipcArgs.Set(2, &aDocFileName);
 	ipcArgs.Set(3, buffer);
 	error = GetExecutableNameAndNewOpaqueData(nativeExecutableName, logicalExecutableName, opaqueData, ipcArgs, EAppListServGetExecutableNameGivenDocument);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP3_RAPALSSESSION_STARTDOCUMENT, "GetExecutableNameAndNewOpaqueData returned with error=%d", error );
+	
 	if (error)
 		{
 		delete buffer;
+		OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP4_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error returned by GetExecutableNameAndNewOpaqueData" );
 		return error;
 		}
 		
 	error = StartApplicationPassingDocumentName(nativeExecutableName, logicalExecutableName, opaqueData, aDocFileName, aThreadId, EApaCommandOpen, NULL);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP5_RAPALSSESSION_STARTDOCUMENT, "StartApplicationPassingDocumentName returned with error=%d", error );
+	
 	delete opaqueData;
 
 	delete buffer;
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP6_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error=%d", error );
 	return error;
 	}
 
@@ -407,14 +450,22 @@
 	HBufC8* opaqueData = NULL;
 	TIpcArgs ipcArgs;
 	TInt error = aDocFile.TransferToServer(ipcArgs, 2, 3);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, RAPALSSESSION_STARTDOCUMENT, "aDocFile.TransferToServer returned with error =%d", error );
+	
 	if (!error)
 		error = GetExecutableNameAndNewOpaqueData(nativeExecutableName, logicalExecutableName, opaqueData, ipcArgs, EAppListServGetExecutableNameGivenDocumentPassedByFileHandle);
 	
 	if (error)
-		return error;
-
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error =%d", error );
+        return error;
+	    }
+	
+	OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_ERROR, DUP7_RAPALSSESSION_STARTDOCUMENT, "Logical Executable name : [%S]; Native executable name : [%S]", logicalExecutableName, nativeExecutableName );
 	error = StartApplicationPassingFileHandle(nativeExecutableName, logicalExecutableName, opaqueData, aDocFile, aThreadId, aRequestStatusForRendezvous);
 	delete opaqueData;
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP8_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error =%d", error );
 	return error;
 	} //lint !e1764 Suppress reference parameter could be declared const ref
 
@@ -441,11 +492,15 @@
 	ipcArgs.Set(2, &dataType);
 	TInt error=GetExecutableNameAndNewOpaqueData(nativeExecutableName, logicalExecutableName, opaqueData, ipcArgs, EAppListServGetExecutableNameGivenDataType);
 	if (error)
-		return error;
-
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP9_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error returned GetExecutablleNameAndNewOpaqueData;error=%d", error );
+        return error;
+	    }
+	
 	error = StartApplicationPassingDocumentName(nativeExecutableName, logicalExecutableName, opaqueData, aDocFileName, aThreadId,EApaCommandOpen,NULL);
 	delete opaqueData;
 
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP10_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error StartApplicationPassingDocumentName : error=%d", error );
 	return error;
 	}
 
@@ -469,11 +524,17 @@
 	TIpcArgs ipcArgs;
 	ipcArgs.Set(2, &dataType);
 	TInt error = GetExecutableNameAndNewOpaqueData(nativeExecutableName, logicalExecutableName, opaqueData, ipcArgs, EAppListServGetExecutableNameGivenDataType);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP11_RAPALSSESSION_STARTDOCUMENT, "GetExecutabkeNameAndNewOpaqueData returned with error =%d", error );
+	
 	if (error)
-		return error;
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP12_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error returned by GetExecutableNameAndNewOpaqueData : error=%d", error );
+        return error;
+	    }
 
 	error = StartApplicationPassingFileHandle(nativeExecutableName, logicalExecutableName, opaqueData, aDocFile, aThreadId, aRequestStatusForRendezvous);
 	delete opaqueData;
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP13_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error returned by StartApplicationPassingFileHandle : error=%d", error );
 	return error;
 	} //lint !e1764 Suppress reference parameter could be declared const ref
 
@@ -491,6 +552,8 @@
 be found; otherwise one of the other system-wide error codes. */
 EXPORT_C TInt RApaLsSession::StartDocument(const TDesC& aDocFileName, TUid aAppUid, TThreadId& aThreadId, TLaunchType /*aLaunchType*/)
 	{
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP17_RAPALSSESSION_STARTDOCUMENT_ENTRY, "RApaLsSession::StartDocument;aDocFileName=%S;aAppUid.iUid=%d", aDocFileName, aAppUid.iUid );
+    
 	// Get the executable file name and "opaque" app meta-data from AppArc server
 	
 	TFileName nativeExecutableName; // the name of the EXE that we pass to RProcess::Create
@@ -501,14 +564,20 @@
 	ipcArgs.Set(2, aAppUid.iUid);
 	
 	TInt error = GetExecutableNameAndNewOpaqueData(nativeExecutableName, logicalExecutableName, opaqueData, ipcArgs, EAppListServGetExecutableNameGivenAppUid);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP14_RAPALSSESSION_STARTDOCUMENT, "GetExecutableNameAndNewOpaquedata returned with error =%d", error );
+	
 	if (error)
-		return error;
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP15_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error returned by GetExecutableNameAndNewOpaqueData : error=%d", error );
+        return error;
+	    }
 	
 	// Start the application, passing it the document file name
 
 	error = StartApplicationPassingDocumentName(nativeExecutableName, logicalExecutableName, opaqueData, aDocFileName, aThreadId, EApaCommandOpen, NULL);
 	delete opaqueData;
 	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP16_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with error returned by StartApplicationPassingDocumentName : error=%d", error );
 	return error;
 	}
 
@@ -531,10 +600,14 @@
 	ipcArgs.Set(2, aAppUid.iUid);
 	TInt error = GetExecutableNameAndNewOpaqueData(nativeExecutableName, logicalExecutableName, opaqueData, ipcArgs, EAppListServGetExecutableNameGivenAppUid);
 	if (error)
-		return error;
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP17_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with the return value of GetExecutableNameAndNewOpaqueData : error=%d", error );
+        return error;
+	    }
 
 	error = StartApplicationPassingFileHandle(nativeExecutableName, logicalExecutableName, opaqueData, aDocFile, aThreadId, aRequestStatusForRendezvous);
 	delete opaqueData;
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP18_RAPALSSESSION_STARTDOCUMENT, "RApaLsSession::StartDocument will return with the return value of StartApplicationPassingFileHandle : error=%d", error );
 	return error;
 	} //lint !e1764 Suppress reference parameter could be declared const ref
 
@@ -567,11 +640,14 @@
 	ipcArgs.Set(2, aAppUid.iUid);
 	TInt error = GetExecutableNameAndNewOpaqueData(nativeExecutableName, logicalExecutableName, opaqueData, ipcArgs, EAppListServGetExecutableNameGivenAppUid);
 	if (error)
-		return error;
-
+	    {
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, RAPALSSESSION_CREATEDOCUMENT, "RApaLsSession::CreateDocument will return with error returned from GetExecutableNameAndNewOpaqueData=%d", error );
+        return error;
+	    }
 	error = StartApplicationPassingDocumentName(nativeExecutableName, logicalExecutableName, opaqueData, aDocFileName, aThreadId,EApaCommandCreate,NULL);
 	delete opaqueData;
-
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, DUP1_RAPALSSESSION_CREATEDOCUMENT, "RApaLsSession::CreateDocument will return with return value of StartApplicationPassingDocumentName =%d", error );
 	return error;
 	}

--- a/appfw/apparchitecture/aplist/aplapplist.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplapplist.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -28,6 +28,10 @@
 #ifdef SYMBIAN_BAFL_SYSUTIL
 #include <bafl/sysutil.h>
 #endif
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "aplapplistTraces.h"
+#endif
 
 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 #include<usif/scr/scr.h>
@@ -590,6 +594,8 @@
 // Stop scanning applications if installation or uninstallation has started	
 EXPORT_C void CApaAppList::StopScan(TBool aNNAInstall)
 	{
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, CAPAAPPLIST_STOPSCAN, "CApaAppList::StopScan;aNNAInstall=%d", aNNAInstall );
+    
 	if (aNNAInstall)
 		{
 		iNNAInstallation = ETrue;
@@ -611,7 +617,8 @@
 
 EXPORT_C TBool CApaAppList::AppListUpdatePending()
 	{
-	return iNNAInstallation;
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, CAPAAPPLIST_APPLISTUPDATEPENDING, "CApaAppList::AppListUpdatePending;iNNAInstallation=%d", iNNAInstallation );
+    return iNNAInstallation;
 	}
 #endif
 
@@ -1300,11 +1307,14 @@
 	TBool more=EFalse;
 	TApaAppEntry currentApp = TApaAppEntry();
 	TRAPD(err, more = iAppRegFinder->NextL(currentApp, *iForcedRegistrations));
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, CAPAAPPLIST_IDLEUPDATEL, "iAppRegFinder-> NextL returned with ;more=%d", more );
+	
 	if (err!=KErrNone)
 		{
 		if (iFlags & ENotifyUpdateOnFirstScanComplete)
 			User::Leave(err);
-
+		
+		OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, DUP1_CAPAAPPLIST_IDLEUPDATEL, "CApaAppList::IdleUpdateL will return with more value returned by iAppRegFinder->NextL" );
 		return more;
 		}
 	TBool hasChanged=EFalse;
@@ -1316,7 +1326,8 @@
 			SetNotFound(iAppData,hasChanged);
 			if (iFlags & ENotifyUpdateOnFirstScanComplete)
 				User::Leave(err);
-
+			
+			OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, DUP2_CAPAAPPLIST_IDLEUPDATEL, "UpdayeNextAppL returned with error, so set more to EFalse" );
 			more=EFalse; // abandon ship
 			}
 		}
@@ -1696,8 +1707,10 @@
 	{
 	TInt err = iForcedRegistrations->InsertIsqL(aRegistrationFile, ECmpFolded);
 	if (err != KErrAlreadyExists) // We silently ignore attempts to insert duplicates
-		User::LeaveIfError(err);
-	
+	    {
+        OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, CAPAAPPLIST_ADDFORCEDREGISTRATIONL, "Ignore attempts to insert duplicated in iForcedRegistration array. Leave with any other error" );
+        User::LeaveIfError(err);
+	    }
 	} //lint !e818 Suppress pointer parameter 'aRegistrationFile' could be declared as pointing to const
 	
 EXPORT_C void CApaAppList::ResetForcedRegistrations()

--- a/appfw/apparchitecture/aplist/aplapplistitem.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplapplistitem.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -25,6 +25,11 @@
 #include "aplappinforeader.h"
 #include <e32uid.h>
 
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "aplapplistitemTraces.h"
+#endif
+
 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 #include <usif/scr/appregentries.h>
 #endif
@@ -152,16 +157,20 @@
 	HBufC* fileName = aFileName.AllocL();
 	delete iIconFileName; // after the AllocL succeeds
 	iIconFileName = fileName;
+	OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_DETAILED, CAPAAPPVIEWDATA_SETICONFILENAMEL, "The icon file name is iIconFileName=%S", *iIconFileName );
 	}
 
 void CApaAppViewData::SetNumOfViewIcons(TInt aNumOfViewIcons)
 	{
 	iNumOfViewIcons = aNumOfViewIcons;
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_DETAILED, CAPAAPPVIEWDATA_SETNUMOFVIEWICONS, "Number of view icons iNumOfViewIcons=%d", iNumOfViewIcons );
 	}
 
 void CApaAppViewData::SetNonMbmIconFile(TBool aNonMbmIconFile)
 	{
 	iNonMbmIconFile = aNonMbmIconFile;
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_DETAILED, CAPAAPPVIEWDATA_SETNONMBMICONFILE, "Non Mbm icon file is iNonMbmIconFile=%d", iNonMbmIconFile );
+	
 	}
 
 EXPORT_C TUid CApaAppViewData::Uid() const
@@ -312,8 +321,14 @@
         delete iIconFileName;
         iIconFileName = appInfoReader->IconFileName();
         iNonMbmIconFile = appInfoReader->NonMbmIconFile();
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, DUP11_CAPAAPPDATA_READAPPLICATIONINFORMATIONFROMSCRL, "Is Icon file Non Mbm :  iNonMbmIconFile=%d", iNonMbmIconFile );
+        
         iNumOfAppIcons = appInfoReader->NumOfAppIcons();
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, DUP5_CAPAAPPDATA_READAPPLICATIONINFORMATIONFROMSCRL, "Number of icons : iNumOfAppIcons=%d", iNumOfAppIcons );
+        
         iApplicationLanguage = appInfoReader->AppLanguage();
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, DUP6_CAPAAPPDATA_READAPPLICATIONINFORMATIONFROMSCRL, "Application language is : iApplicationLanguage=%d", iApplicationLanguage );
+        
                 
         // views
         iViewDataArray->ResetAndDestroy();
@@ -623,6 +638,7 @@
     {
     if (iRegistrationFile)
         {
+        OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, CAPAAPPDATA_REGISTRATIONFILENAME, "Registration File Name is iRegistrationFile=%S", iRegistrationFile );
         return *iRegistrationFile;
         }
     else
@@ -641,6 +657,7 @@
     {
     if (iLocalisableResourceFileName)
         {
+        OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, CAPAAPPDATA_LOCALISABLERESOURCEFILENAME, "Localisable Resource filename is iLocalisableResourceFileName=%S", iLocalisableResourceFileName );
         return *iLocalisableResourceFileName;
         }
     else
@@ -987,6 +1004,7 @@
 	{
 	aIconCount = iIcons->Count();
 	aDefaultIconsUsed = iIcons->DefaultIconsUsed();
+	OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, CAPAAPPDATA_GETICONINFO, "aIconCount=%d and aDefaultIconsUsed=%d", aIconCount, aDefaultIconsUsed );
 	}
 
 /** Gets the default screen number used by the application.
@@ -1117,6 +1135,8 @@
 
 EXPORT_C void CApaAppData::SetShortCaptionL(const TDesC& aShortCaption)
 	{
+    OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, CAPAAPPDATA_SETSHORTCAPTIONL_ENTRY, "CApaAppData::SetShortCaptionL : aShortCaption=%S", aShortCaption );
+    
 	if(iShortCaption->Compare(aShortCaption) != 0)
 		{
 		HBufC* newShortCaption=aShortCaption.AllocL();
@@ -1129,6 +1149,8 @@
 			delete iShortCaption;
 			}
 		iShortCaption = newShortCaption;
+		OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, CAPAAPPDATA_SETSHORTCAPTIONL, "Short caption set is iShortCaption=%S", *iShortCaption );
+		
 		}
 	}
 
@@ -1137,6 +1159,8 @@
 */
 EXPORT_C void CApaAppData::SetCaptionL(const TDesC& aCaption)
 	{
+    OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, CAPAAPPDATA_SETCAPTIONL_ENTRY, "CApaAppData::SetCaptionL : aCaption=%S", aCaption );
+    
 	if(iCaption->Compare(aCaption) != 0)
 		{
 		HBufC* newCaption=aCaption.AllocL();
@@ -1149,6 +1173,7 @@
 			delete iCaption;
 			}
 		iCaption = newCaption;
+		OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_NORMAL, CAPAAPPDATA_SETCAPTIONL, "Caption is set iCaption=%S", *iCaption );
 		}
 	}

--- a/appfw/apparchitecture/aplist/aplappregfinder.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplappregfinder.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -21,7 +21,12 @@
 #include "../apgrfx/apprivate.h"
 #include <apsidchecker.h>
 #include "aplapplistitem.h"					// class TApaAppEntry
-#include "aplappinforeader.h"				// class ApaUtils
+#include "aplappinforeader.h"			// class ApaUtils
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "aplappregfinderTraces.h"
+#endif
+	
 
 
 GLDEF_C void Panic(TApfPanic aPanic)
@@ -71,6 +76,8 @@
 // Build a list of currently available drives
 void CApaAppRegFinder::RebuildDriveListL(TScanScope aScopeOfScan)
 	{
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, CAPAAPPREGFINDER_REBUILDDRIVELISTL_ENTRY, "CApaAppRegFinder::RebuildDriveListL : aScopeOfScan=%d", aScopeOfScan);
+    
 	iListOfDrives.Reset();
 	TDriveList driveList;
 	User::LeaveIfError(iFs.DriveList(driveList));
@@ -129,6 +136,8 @@
 
 EXPORT_C void CApaAppRegFinder::FindAllAppsL(TScanScope aScopeOfScan)
 	{
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_FLOW, CAPAAPPREGFINDER_FINDALLAPPSL, "TScanScope passed to this API : aScopeOfScan=%d", aScopeOfScan );
+    
 	delete iFileList;
 	iFileList = NULL;
 	RebuildDriveListL(aScopeOfScan);

--- a/appfw/apparchitecture/aplist/apsiconcaptionoverride.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/aplist/apsiconcaptionoverride.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -17,6 +17,11 @@
 #include "apsiconcaptionoverride.h"
 #include <centralrepository.h>
 #include <apadef.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "apsiconcaptionoverrideTraces.h"
+#endif
+
 
 //constants defined
 const TUid KUidIconCaptionRepository = { 0x1028583d }; // Central Repository UID
@@ -185,6 +190,8 @@
 	{
 	TUint32 key = aFullKey & ~KAppBits;
 	TUint32 fieldId = (key & KFieldBits) >> 16;
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, APPARC_TRACE_DETAILED, TAPAICONCAPTIONOVERRIDEWRITER_LOADFIELDFROMCENREPL, "fieldId for field to be overridden with value from the cenrep = %d", fieldId );
+	
 	switch (fieldId)
 		{
 		case EOverrideFieldShortCaption:

--- a/appfw/apparchitecture/bwins/APFILEU.DEF	Tue Oct 12 17:17:12 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-EXPORTS
-	??0CApaScanningFileRecognizer@@IAE@AAVRFs@@PAVMApaAppStarter@@@Z @ 1 NONAME ABSENT 
-	??1CApaAppLocatorProxy@@UAE@XZ @ 2 NONAME ABSENT
-	??1CApaScanningAppFinder@@UAE@XZ @ 3 NONAME ABSENT
-	??1CApaScanningFileRecognizer@@UAE@XZ @ 4 NONAME ABSENT 
-	?ConstructL@CApaScanningFileRecognizer@@IAEXXZ @ 5 NONAME ABSENT 
-	?DefaultAppInfoFileName@CApaScanningAppFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 6 NONAME ABSENT
-	?FindAllAppsL@CApaScanningAppFinder@@UAEXXZ @ 7 NONAME ABSENT
-	?FindAppL@CApaScanningAppFinder@@UAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 8 NONAME ABSENT
-	?GetAppCapabilityByUid@CApaAppLocatorProxy@@UAEHAAVTDes8@@VTUid@@@Z @ 9 NONAME ABSENT
-	?GetAppEntryByUid@CApaAppLocatorProxy@@UAEHAAVTApaAppEntry@@VTUid@@@Z @ 10 NONAME ABSENT
-	?NewL@CApaAppLocatorProxy@@SAPAV1@AAVRFs@@@Z @ 11 NONAME ABSENT
-	?NewL@CApaScanningAppFinder@@SAPAV1@ABVRFs@@@Z @ 12 NONAME ABSENT
-	?NewL@CApaScanningFileRecognizer@@SAPAV1@AAVRFs@@PAVMApaAppStarter@@@Z @ 13 NONAME ABSENT 
-	?NewLC@CApaScanningAppFinder@@SAPAV1@ABVRFs@@@Z @ 14 NONAME ABSENT
-	?NextL@CApaScanningAppFinder@@UAEHAAVTApaAppEntry@@@Z @ 15 NONAME ABSENT
-	?RecognizerCount@CApaScanningFileRecognizer@@QAEHXZ @ 16 NONAME ABSENT 
-	?RecognizerListLC@CApaScanningFileRecognizer@@QBEPAV?$CArrayFixFlat@VRRecognizer@CApaScanningFileRecognizer@@@@XZ @ 17 NONAME ABSENT 
-	?ScanForRecognizersL@CApaScanningFileRecognizer@@QAEXXZ @ 18 NONAME ABSENT 
-	?SetRecognizersFromListL@CApaScanningFileRecognizer@@QAEXABV?$CArrayFixFlat@VTRecognizer@CApaScanningFileRecognizer@@@@@Z @ 19 NONAME ABSENT
-	?TempPath@CApaScanningAppFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 20 NONAME ABSENT
-	?TempPath@Apfile@@SA?AVTPtrC16@@XZ @ 21 NONAME ABSENT
-	??ACApaScanningFileRecognizer@@QBEABVRRecognizer@0@H@Z @ 22 NONAME ABSENT ; class CApaScanningFileRecognizer::RRecognizer const & CApaScanningFileRecognizer::operator[](int) const
-	?SetRecognizerL@CApaScanningFileRecognizer@@QAEXABVTRecognizer@1@@Z @ 23 NONAME ABSENT
-	?UpdateCounter@CApaScanningFileRecognizer@@QBEHXZ @ 24 NONAME ABSENT 
-	??1CApaScanningControlFinder@@UAE@XZ @ 25 NONAME ABSENT
-	?DefaultAppInfoFileName@CApaScanningControlFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 26 NONAME ABSENT
-	?FindAllAppsL@CApaScanningControlFinder@@UAEXXZ @ 27 NONAME ABSENT
-	?FindAppL@CApaScanningControlFinder@@UAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 28 NONAME ABSENT
-	?NewL@CApaScanningControlFinder@@SAPAV1@ABVRFs@@@Z @ 29 NONAME ABSENT
-	?NewLC@CApaScanningControlFinder@@SAPAV1@ABVRFs@@@Z @ 30 NONAME ABSENT
-	?NextL@CApaScanningControlFinder@@UAEHAAVTApaAppEntry@@@Z @ 31 NONAME ABSENT
-	?TempPath@CApaScanningControlFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 32 NONAME ABSENT
-	?SetEcomRecognizerL@CApaScanningFileRecognizer@@QAEXABVRRecognizer@1@@Z @ 33 NONAME ABSENT 
-	?SetEcomRecognizersFromListL@CApaScanningFileRecognizer@@QAEXABV?$CArrayFixFlat@VRRecognizer@CApaScanningFileRecognizer@@@@@Z @ 34 NONAME ABSENT 
-	?FindAllAppsL@CApaAppRegFinder@@QAEXXZ @ 35 NONAME ABSENT ; void CApaAppRegFinder::FindAllAppsL(void)
-	?FindAppL@CApaAppRegFinder@@QAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 36 NONAME ABSENT ; class TBuf<256> CApaAppRegFinder::FindAppL(class TDesC16 const &, class TUid)
-	?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 37 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &)
-	?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &)
-	?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABV?$RPointerArray@VHBufC16@@@@@Z @ 39 NONAME ABSENT ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class RPointerArray<class HBufC16> const &)
-	?TempPath@CApaAppRegFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 40 NONAME ABSENT ; class TBuf<256> CApaAppRegFinder::TempPath(void) const
-	??1CAppLaunchChecker@@UAE@XZ @ 41 NONAME ; CAppLaunchChecker::~CAppLaunchChecker(void)
-	??ACApaScanningRuleBasedPlugIns@@QBEPAVCAppLaunchChecker@@H@Z @ 42 NONAME ; class CAppLaunchChecker * CApaScanningRuleBasedPlugIns::operator[](int) const
-	??1CApaScanningRuleBasedPlugIns@@UAE@XZ @ 43 NONAME ; CApaScanningRuleBasedPlugIns::~CApaScanningRuleBasedPlugIns(void)
-	?NewL@CApaScanningRuleBasedPlugIns@@SAPAV1@XZ @ 44 NONAME ; class CApaScanningRuleBasedPlugIns * CApaScanningRuleBasedPlugIns::NewL(void)
-	?ScanForRuleBasedPlugInsL@CApaScanningRuleBasedPlugIns@@QAEXXZ @ 45 NONAME ; void CApaScanningRuleBasedPlugIns::ScanForRuleBasedPlugInsL(void)
-	?ImplementationCount@CApaScanningRuleBasedPlugIns@@QBEHXZ @ 46 NONAME ; int CApaScanningRuleBasedPlugIns::ImplementationCount(void) const
-	?Reserved_1@CAppLaunchChecker@@EAEXXZ @ 47 NONAME ; void CAppLaunchChecker::Reserved_1(void)
-	?Reserved_2@CAppLaunchChecker@@EAEXXZ @ 48 NONAME ; void CAppLaunchChecker::Reserved_2(void)
-	?Reserved_3@CAppLaunchChecker@@EAEXXZ @ 49 NONAME ; void CAppLaunchChecker::Reserved_3(void)
-	??1CAppSidChecker@@UAE@XZ @ 50 NONAME ABSENT ; CAppSidChecker::~CAppSidChecker(void)
-	?SetRescanCallBackL@CAppSidChecker@@UAEXABVTCallBack@@@Z @ 51 NONAME ABSENT ; void CAppSidChecker::SetRescanCallBackL(class TCallBack const &)
-	?reserved1@CAppSidChecker@@EAEXXZ @ 52 NONAME ABSENT ; void CAppSidChecker::reserved1(void)
-	?reserved2@CAppSidChecker@@EAEXXZ @ 53 NONAME ABSENT ; void CAppSidChecker::reserved2(void)
-	?reserved3@CAppSidChecker@@EAEXXZ @ 54 NONAME ABSENT ; void CAppSidChecker::reserved3(void)
-	?DriveList@CApaAppRegFinder@@QBEABV?$RArray@VTDriveUnitInfo@@@@XZ @ 55 NONAME ABSENT ; class RArray<class TDriveUnitInfo> const & CApaAppRegFinder::DriveList(void) const
-	?FindAllRemovableMediaAppsL@CApaAppRegFinder@@QAEXXZ @ 56 NONAME ABSENT ; void CApaAppRegFinder::FindAllRemovableMediaAppsL(void)
-	??1CApaAppInstallationMonitor@@UAE@XZ @ 57 NONAME ABSENT; CApaAppInstallationMonitor::~CApaAppInstallationMonitor(void)
-	?NewL@CApaAppInstallationMonitor@@SAPAV1@PAVCApaAppArcServer@@@Z @ 58  NONAME ABSENT; class CApaAppInstallationMonitor * CApaAppInstallationMonitor::NewL(class CApaAppArcServer *)
-	?Start@CApaAppInstallationMonitor@@QAEXXZ @ 59 NONAME ABSENT; void CApaAppInstallationMonitor::Start(void)
-	??1CApfMimeContentPolicy@@UAE@XZ @ 60 NONAME ; CApfMimeContentPolicy::~CApfMimeContentPolicy(void)
-	?IsClosedExtension@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 61 NONAME ; int CApfMimeContentPolicy::IsClosedExtension(class TDesC16 const &)
-	?IsClosedFileL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 62 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class RFile &)
-	?IsClosedFileL@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 63 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class TDesC16 const &)
-	?IsClosedType@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 64 NONAME ; int CApfMimeContentPolicy::IsClosedType(class TDesC16 const &)
-	?IsDRMEnvelopeL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 65 NONAME ; int CApfMimeContentPolicy::IsDRMEnvelopeL(class RFile &)
-	?IsDRMEnvelopeL@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 66 NONAME ; int CApfMimeContentPolicy::IsDRMEnvelopeL(class TDesC16 const &)
-	?NewL@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 67 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(class RFs &)
-	?NewL@CApfMimeContentPolicy@@SAPAV1@XZ @ 68 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(void)
-	?NewLC@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 69 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(class RFs &)
-	?NewLC@CApfMimeContentPolicy@@SAPAV1@XZ @ 70 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(void)
-

--- a/appfw/apparchitecture/bwins/APSERVU.DEF	Tue Oct 12 17:17:12 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-EXPORTS
-	??1CApaAppArcServer@@UAE@XZ @ 1 NONAME ; public: virtual __thiscall CApaAppArcServer::~CApaAppArcServer(void)
-	?NewL@CApaAppArcServer@@SAPAV1@PAVCApaAppList@@PAVCApaFileRecognizer@@@Z @ 2 NONAME ABSENT ; public: static class CApaAppArcServer * __cdecl CApaAppArcServer::NewL(class CApaAppList *,class CApaFileRecognizer *)
-	??1CApaFsMonitor@@UAE@XZ @ 3 NONAME ; public: virtual __thiscall CApaFsMonitor::~CApaFsMonitor(void)
-	?NameApaServServerThread@@YA?AVTPtrC16@@XZ @ 4 NONAME ; class TPtrC16  __cdecl NameApaServServerThread(void)
-	?NameApaServStartSemaphore@@YA?AVTPtrC16@@XZ @ 5 NONAME ; class TPtrC16  __cdecl NameApaServStartSemaphore(void)
-	?NewL@CApaAppArcServer@@SAPAV1@XZ @ 6  NONAME ; class CApaAppArcServer * CApaAppArcServer::NewL(void)
-	?NewL@CApaFsMonitor@@SAPAV1@AAVRFs@@ABVTDesC16@@VTCallBack@@@Z @ 7 NONAME ; public: static class CApaFsMonitor * __cdecl CApaFsMonitor::NewL(class RFs &,class TDesC16 const &,class TCallBack)
-	?NotifyType@CApaFsMonitor@@QBE?AW4TNotifyType@@XZ @ 8 NONAME ; public: enum TNotifyType  __thiscall CApaFsMonitor::NotifyType(void)const 
-	?SetBlocked@CApaFsMonitor@@QAEXH@Z @ 9 NONAME ; public: void __thiscall CApaFsMonitor::SetBlocked(int)
-	?Start@CApaFsMonitor@@QAEXW4TNotifyType@@@Z @ 10 NONAME ; public: void __thiscall CApaFsMonitor::Start(enum TNotifyType)
-	?Self@CApaAppArcServer@@SAPAV1@XZ @ 11 NONAME ; class CApaAppArcServer * CApaAppArcServer::Self(void)
-	?AddLocationL@CApaFsMonitor@@QAEXABVTDesC16@@@Z @ 12 NONAME ; void CApaFsMonitor::AddLocationL(class TDesC16 const &)
-	?Cancel@CApaFsMonitor@@QAEXXZ @ 13 NONAME ; void CApaFsMonitor::Cancel(void)
-	?ApaServThreadStart@@YAHPAX@Z @ 14 NONAME ; int ApaServThreadStart(void *)
-	??1CUpdatedAppsList@@UAE@XZ @ 15 NONAME ABSENT ; CUpdatedAppsList::~CUpdatedAppsList(void)
-	?CloseAndDeletePermanentStore@CUpdatedAppsList@@QAEXXZ @ 16 NONAME ABSENT ; void CUpdatedAppsList::CloseAndDeletePermanentStore(void)
-	?IsInList@CUpdatedAppsList@@QBEHABVTDesC16@@@Z @ 17 NONAME ABSENT ; int CUpdatedAppsList::IsInList(class TDesC16 const &) const
-	?RescanCallBack@CApaAppArcServer@@QAE?AVTCallBack@@XZ @ 18 NONAME ABSENT; class TCallBack CApaAppArcServer::RescanCallBack(void)
-	?KApaLoadDataRecognizersOnDemand@@3HB @ 19 NONAME DATA 4 ; int const KApaLoadDataRecognizersOnDemand
-	?KApaUnloadRecognizersTimeout@@3HB @ 20 NONAME DATA 4 ; int const KApaUnloadRecognizersTimeout
-	?HandleInstallationEndEventL@CApaAppArcServer@@QAEXXZ @ 21 NONAME ABSENT; void CApaAppArcServer::HandleEndUninstallEventL(void)
-	?HandleInstallationStartEvent@CApaAppArcServer@@QAEXXZ @ 22 NONAME ABSENT; void CApaAppArcServer::HandleStartUninstallEvent(void)
-	?KApaDrivesToMonitor@@3HB @ 23 NONAME ; int const KApaDrivesToMonitor
-	?KApaLoadMbmIconsOnDemand@@3HB @ 24 NONAME ; int const KApaLoadMbmIconsOnDemand
-
-

--- a/appfw/apparchitecture/group/APFILE.MMP	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/group/APFILE.MMP	Wed Oct 20 17:03:03 2010 +0300
@@ -34,6 +34,8 @@
 SOURCEPATH	../apfile
 
 userinclude   ../inc
+userinclude ../traces
+
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER

--- a/appfw/apparchitecture/group/APGRFX.MMP	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/group/APGRFX.MMP	Wed Oct 20 17:03:03 2010 +0300
@@ -35,6 +35,7 @@
 SOURCEPATH	../apgrfx
 
 userinclude		../inc
+userinclude		../traces
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 source			APGCTL.CPP APGDOOR.CPP APGICNFL.CPP APGSTD.CPP APGTASK.CPP

--- a/appfw/apparchitecture/group/APLIST.MMP	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/group/APLIST.MMP	Wed Oct 20 17:03:03 2010 +0300
@@ -36,6 +36,7 @@
 SOURCEPATH	../aplist
 
 userinclude	../inc
+userinclude ../traces
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 source		aplapplist.cpp	aplapplistitem.cpp aplappinforeader.cpp apsidchecker.cpp

--- a/appfw/apparchitecture/group/APPARC.MMP	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/group/APPARC.MMP	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
@@ -33,6 +33,7 @@
 
 SOURCEPATH	../apparc
 userinclude		../inc
+userinclude		../traces
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 source          APACMDLN.CPP APAFLREC.CPP APAID.CPP APADBASE.CPP APAMDR.CPP

--- a/appfw/apparchitecture/group/APSERV.MMP	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/group/APSERV.MMP	Wed Oct 20 17:03:03 2010 +0300
@@ -35,6 +35,7 @@
 
 userinclude		../inc ../apparc
 userinclude		../apgrfx
+userinclude		../traces
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN

--- a/appfw/apparchitecture/group/APSEXE.MMP	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/group/APSEXE.MMP	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
@@ -33,6 +33,7 @@
 SOURCEPATH	../apsexe
 
 userinclude		../inc
+userinclude 	../traces
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 source			APSMAIN.CPP

--- a/appfw/apparchitecture/tef/tssaac/tssaac_emulator_ssma.rss	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/tef/tssaac/tssaac_emulator_ssma.rss	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -17,8 +17,6 @@
 
 #include <ssm/ssmcmd.rh>
 #include <ssm/ssmsubstates.hrh>
-#include <ssm/cmdpersistreboots.rh>
-#include <ssm/cmdpersistreboots.hrh>
 
 UID2 KUidSsmCommandListResourceFile
 
@@ -61,8 +59,7 @@
    	{
 	commands =
 		{
-		r_increment_boot_count
-		, r_command_publish_system_state
+		r_command_publish_system_state
 		, r_command_ssmutilsrv
 		, r_command_sysmon
 		, r_command_sysagt2svr
@@ -295,17 +292,4 @@
 	severity = ECmdCriticalSeverity;
 	}
 
-RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count
-	{
-	severity = ECmdCriticalSeverity;
-	execution_behaviour = ESsmWaitForSignal;
-	dllname = "cmncustomcmds.dll";
-	ordinal = 1; // Persist reboots custom command is at ordinal 1
-	dll_data = r_increment;
-	}
 
-RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment
-	{
-	val = EIncrementBootCount;
-	}
-

--- a/appfw/apparchitecture/tef/tssaac/tssaac_tapp_emulator_ssma.rss	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/apparchitecture/tef/tssaac/tssaac_tapp_emulator_ssma.rss	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -21,8 +21,6 @@
 
 #include <ssm/ssmcmd.rh>
 #include <ssm/ssmsubstates.hrh>
-#include <ssm/cmdpersistreboots.rh>
-#include <ssm/cmdpersistreboots.hrh>
 
 UID2 KUidSsmCommandListResourceFile
 
@@ -65,8 +63,7 @@
    	{
 	commands =
 		{
-		r_increment_boot_count
-		, r_command_publish_system_state
+		r_command_publish_system_state
 		, r_command_ssmutilsrv
 		, r_command_sysmon
 		, r_command_sysagt2svr
@@ -300,17 +297,4 @@
 	severity = ECmdCriticalSeverity;
 	}
 
-RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count
-	{
-	severity = ECmdCriticalSeverity;
-	execution_behaviour = ESsmWaitForSignal;
-	dllname = "cmncustomcmds.dll";
-	ordinal = 1; // Persist reboots custom command is at ordinal 1
-	dll_data = r_increment;
-	}
 
-RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment
-	{
-	val = EIncrementBootCount;
-	}
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/traces/OstTraceDefinitions.h	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* This is Default Licence added by TraceCompiler
+* Copyright (c) 2010 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 __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+//#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/traces/fixed_id.definitions	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,139 @@
+##
+# This is Default Licence added by TraceCompiler
+# Copyright (c) 2010 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: 
+#
+##
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]APPARC_TRACE_ERROR=0xde
+[GROUP]APPARC_TRACE_ERROR_INTERNAL=0xe3
+[GROUP]APPARC_TRACE_FLOW=0xdf
+[GROUP]APPARC_TRACE_FLOW_INTERNAL=0xe2
+[GROUP]APPARC_TRACE_INTERNAL=0xe1
+[GROUP]APPARC_TRACE_NORMAL=0xe0
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP12_RAPALSSESSION_GETAPPICON=0x11
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP1_RAPALSSESSION_GETAPPICON=0x6
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP1_RAPALSSESSION_GETAPPVIEWICON=0xe
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP1_RAPALSSESSION_GETNEXTAPP=0x4
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP2_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE=0x13
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP2_RAPALSSESSION_GETAPPICON=0x7
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP2_RAPALSSESSION_GETAPPVIEWICON=0xf
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP3_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE=0x14
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP3_RAPALSSESSION_GETAPPVIEWICON=0x10
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP3_RAPALSSESSION_GETNEWBUFFERFROMFILE=0x17
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP3_RAPALSSESSION_STARTDOCUMENT=0x1a
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP4_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE=0x15
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP4_RAPALSSESSION_GETAPPICON=0xb
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP4_RAPALSSESSION_GETAPPVIEWICON=0x12
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP5_RAPALSSESSION_GETAPPICON=0x8
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP5_RAPALSSESSION_GETNEWBUFFERFROMFILE=0x18
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP5_RAPALSSESSION_STARTDOCUMENT=0x1b
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP6_RAPALSSESSION_GETAPPICON=0x9
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP7_RAPALSSESSION_GETAPPICON=0xa
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP7_RAPALSSESSION_STARTDOCUMENT=0x1d
+[TRACE]APPARC_TRACE_ERROR[0xDE]_DUP9_RAPALSSESSION_GETAPPICON=0xc
+[TRACE]APPARC_TRACE_ERROR[0xDE]_RAPALSSESSION_CONNECT=0x1
+[TRACE]APPARC_TRACE_ERROR[0xDE]_RAPALSSESSION_DOAPPCOUNT=0x2
+[TRACE]APPARC_TRACE_ERROR[0xDE]_RAPALSSESSION_GETAPPICON=0x5
+[TRACE]APPARC_TRACE_ERROR[0xDE]_RAPALSSESSION_GETAPPVIEWICON=0xd
+[TRACE]APPARC_TRACE_ERROR[0xDE]_RAPALSSESSION_GETNEWBUFFERFROMFILE=0x16
+[TRACE]APPARC_TRACE_ERROR[0xDE]_RAPALSSESSION_GETNEXTAPP=0x3
+[TRACE]APPARC_TRACE_ERROR[0xDE]_RAPALSSESSION_STARTDOCUMENT=0x1c
+[TRACE]APPARC_TRACE_ERROR[0xDE]_RAPALSSESSION_UPDATEAPPLISTL=0x19
+[TRACE]APPARC_TRACE_ERROR_INTERNAL[0xE3]_DUP2_RAPALSSESSION_DOSTARTAPPL=0x1
+[TRACE]APPARC_TRACE_ERROR_INTERNAL[0xE3]_DUP3_RAPALSSESSION_DOSTARTAPPL=0x2
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP10_RAPALSSESSION_GETAPPICON=0x7
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP10_RAPALSSESSION_STARTDOCUMENT=0x3a
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP11_RAPALSSESSION_GETAPPICON=0x14
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP11_RAPALSSESSION_STARTDOCUMENT=0x3b
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP12_RAPALSSESSION_STARTDOCUMENT=0x3c
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP13_RAPALSSESSION_GETAPPICON=0x15
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP13_RAPALSSESSION_STARTDOCUMENT=0x3d
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP14_RAPALSSESSION_GETAPPICON=0x16
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP14_RAPALSSESSION_STARTDOCUMENT=0x3f
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP15_RAPALSSESSION_STARTDOCUMENT=0x40
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP16_RAPALSSESSION_STARTDOCUMENT=0x41
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP17_RAPALSSESSION_STARTDOCUMENT=0x42
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP17_RAPALSSESSION_STARTDOCUMENT_ENTRY=0x3e
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP18_RAPALSSESSION_STARTDOCUMENT=0x43
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_APPFORDOCUMENT=0x9
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_APPLICATIONLANGUAGE=0x1d
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_CREATEDOCUMENT=0x45
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_DOAPPCOUNT=0x2
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE=0x1f
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_FORCEREGISTRATION=0x2e
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_GETDEFAULTSCREENNUMBER=0x3
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_GETMAXDATABUFSIZE=0xe
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_GETNEWBUFFERFROMFILE=0x22
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_GETPREFERREDBUFSIZE=0xc
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_NUMBEROFOWNDEFINEDICONS=0x12
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_SENDRECEIVEWITHRECONNECT=0x2a
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_STARTDOCUMENT=0x37
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP1_RAPALSSESSION_UPDATEAPPLISTL=0x2b
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP2_RAPALSSESSION_FORCEREGISTRATION=0x2f
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP2_RAPALSSESSION_GETNEWBUFFERFROMFILE=0x23
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP2_RAPALSSESSION_STARTDOCUMENT=0x34
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP2_RAPALSSESSION_UPDATEAPPLISTL=0x2c
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP3_RAPALSSESSION_GETAPPICON=0x5
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP4_RAPALSSESSION_GETNEWBUFFERFROMFILE=0x24
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP4_RAPALSSESSION_STARTDOCUMENT=0x35
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP5_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE=0x20
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP5_RAPALSSESSION_GETAPPVIEWICON=0x18
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP6_RAPALSSESSION_DOAPPFORDOCUMENTOPTIONALLYSPECIFYINGSERVICE=0x21
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP6_RAPALSSESSION_GETAPPVIEWICON=0x17
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP6_RAPALSSESSION_GETNEWBUFFERFROMFILE=0x25
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP6_RAPALSSESSION_STARTDOCUMENT=0x36
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP7_RAPALSSESSION_GETAPPVIEWICON=0x19
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP7_RAPALSSESSION_GETNEWBUFFERFROMFILE=0x26
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP8_RAPALSSESSION_GETAPPICON=0x6
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP8_RAPALSSESSION_STARTDOCUMENT=0x38
+[TRACE]APPARC_TRACE_FLOW[0xDF]_DUP9_RAPALSSESSION_STARTDOCUMENT=0x39
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_APPFORDOCUMENT=0x8
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_APPLICATIONLANGUAGE=0x1c
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_CREATEDOCUMENT=0x44
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_DEREGISTERNONNATIVEAPPLICATIONL=0x27
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_EMBEDDABLEAPPCOUNT=0x1
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_FORCEREGISTRATION=0x2d
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETAPPBYDATATYPE=0x1b
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETAPPICONSIZES=0x4
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETAPPOWNEDFILES=0x11
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETAPPSERVICEOPAQUEDATALC=0x1e
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETAPPTYPE=0x28
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETAPPVIEWS=0x10
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETMAXDATABUFSIZE=0xd
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETNEWOPAQUEDATA_ENTRY=0x32
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_GETPREFERREDBUFSIZE=0xb
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_INSERTDATAMAPPINGIFHIGHER=0x1a
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_ISPROGRAM=0xa
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_NUMBEROFOWNDEFINEDICONS=0x13
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_SENDRECEIVEWITHRECONNECT=0x29
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_SETMAXDATABUFSIZE=0xf
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_STARTAPP=0x31
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_STARTDOCUMENT_ENTRY=0x33
+[TRACE]APPARC_TRACE_FLOW[0xDF]_RAPALSSESSION_UPDATEDAPPSINFOL=0x30
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_DUP1_RAPALSSESSION_DOSTARTAPPL=0x3
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_DUP1_RAPALSSESSION_GETEXECUTABLENAMEANDNEWOPAQUEDATA=0x5
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_DUP1_RAPALSSESSION_GETNEWOPAQUEDATA=0x9
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_DUP1_RAPALSSESSION_STARTAPPLICATIONPASSINGFILEHANDLE=0xa
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_DUP3_RAPALSSESSION_GETEXECUTABLENAMEANDNEWOPAQUEDATA=0x7
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_DUP4_RAPALSSESSION_DOSTARTAPPL=0x4
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_RAPALSSESSION_DOSTARTAPP=0x1
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_RAPALSSESSION_DOSTARTAPPL=0x2
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_RAPALSSESSION_GETEXECUTABLENAMEANDNEWOPAQUEDATA=0x6
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_RAPALSSESSION_GETNEWOPAQUEDATA=0x8
+[TRACE]APPARC_TRACE_FLOW_INTERNAL[0xE2]_RAPALSSESSION_STARTAPPLICATIONPASSINGDOCUMENTNAME=0xb
+[TRACE]APPARC_TRACE_INTERNAL[0xE1]_DUP2_RAPALSSESSION_APPLICATIONLANGUAGE=0x2
+[TRACE]APPARC_TRACE_INTERNAL[0xE1]_RAPALSSESSION_FETCHARRAYL=0x1
+[TRACE]APPARC_TRACE_NORMAL[0xE0]_RAPALSSESSION_DOSTARTAPPLICATIONL=0x2
+[TRACE]APPARC_TRACE_NORMAL[0xE0]_RAPALSSESSION_GETDEFAULTSCREENNUMBER=0x1

--- a/appfw/uiftestfw/resource/hardware/gsastartupcmdlist7_target.rss	Tue Oct 12 17:17:12 2010 +0300
+++ b/appfw/uiftestfw/resource/hardware/gsastartupcmdlist7_target.rss	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -20,8 +20,6 @@
 
 #include <ssm/ssmcmd.rh>
 #include <ssm/ssmsubstates.hrh>
-#include <ssm/cmdpersistreboots.rh>
-#include <ssm/cmdpersistreboots.hrh>
 #ifdef SYMBIAN_SSM_GRACEFUL_SHUTDOWN
 #include <ssm/ssmcmdconditions.rh>
 #endif
@@ -67,8 +65,7 @@
    	{
 	commands =
 		{
-		r_increment_boot_count
-		, r_command_publish_system_state
+		r_command_publish_system_state
 		, r_command_ssmutilsrv
 		, r_command_sysmon
 		, r_command_sysagt2svr
@@ -78,10 +75,6 @@
 		, r_command_start_splash
 		, r_command_eiksrvs
 		, r_command_tzserver
-#ifdef SYMBIAN_SSM_GRACEFUL_SHUTDOWN 
-		, r_shutdown_event_observer
-#endif
-
 		};
 	}
 
@@ -193,22 +186,6 @@
 	execution_behaviour = ESsmWaitForSignal;
 	}
 
-#ifdef SYMBIAN_SSM_GRACEFUL_SHUTDOWN
-RESOURCE SSM_CHK_ROMPATCHCONST_GRACEFUL_SHUTDOWN r_cnd_rompatchableconstant
-	{
-	 //Condition data is empty as startup policy already has the condition information for graceful shutdown. 
-	 //Empty condition is given to force SSM to evaluate condition at runtime.
-	}
-
-RESOURCE SSM_START_SSM_UTILITY_PLUGIN r_shutdown_event_observer
-	{
-	conditional_information = r_cnd_rompatchableconstant;
-	severity = ECmdCriticalSeverity;
-	filename = "lafshutdowneventobserveradaptor.dll";
-	ordinal = 1;
-	}
-#endif
-
 RESOURCE SSM_START_PROCESS_INFO r_command_initialise_locale
 	{
 	name = "initialiselocale.exe";
@@ -307,20 +284,6 @@
 	severity = ECmdCriticalSeverity;
 	}
 
-RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count
-	{
-	severity = ECmdCriticalSeverity;
-	execution_behaviour = ESsmWaitForSignal;
-	dllname = "cmncustomcmds.dll";
-	ordinal = 1; // Persist reboots custom command is at ordinal 1
-	dll_data = r_increment;
-	}
-
-RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment
-	{
-	val = EIncrementBootCount;
-	}
-	
 RESOURCE SSM_START_APP_INFO r_command_eshell
 	{
 	severity = ECmdCriticalSeverity;

--- a/applaunchservices/aftermarketappstarter/test/tamastarter/resource/emulator/tamastarter_amaadder_ssma.rss	Tue Oct 12 17:17:12 2010 +0300
+++ b/applaunchservices/aftermarketappstarter/test/tamastarter/resource/emulator/tamastarter_amaadder_ssma.rss	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -17,8 +17,6 @@
 
 #include <ssm/ssmcmd.rh>
 #include <ssm/ssmsubstates.hrh>
-#include <ssm/cmdpersistreboots.rh>
-#include <ssm/cmdpersistreboots.hrh>
 
 UID2 KUidSsmCommandListResourceFile
 
@@ -61,8 +59,7 @@
    	{
 	commands =
 		{
-		r_increment_boot_count
-		, r_command_publish_system_state
+		r_command_publish_system_state
 		, r_command_ssmutilsrv
 		, r_command_sysmon
 		, r_command_sysagt2svr
@@ -298,20 +295,7 @@
 	severity = ECmdCriticalSeverity;
 	}
 
-RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count
-	{
-	severity = ECmdCriticalSeverity;
-	execution_behaviour = ESsmWaitForSignal;
-	dllname = "cmncustomcmds.dll";
-	ordinal = 1; // Persist reboots custom command is at ordinal 1
-	dll_data = r_increment;
-	}
 
-RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment
-	{
-	val = EIncrementBootCount;
-	}
-	
 RESOURCE SSM_START_PROCESS_INFO r_command_tamastarter_amaadder
 	{
 	name = "tamastarter_amaadder.exe";

--- a/applaunchservices/aftermarketappstarter/test/tamastarter/resource/hardware/tamastarter_amaadder_ssma.rss	Tue Oct 12 17:17:12 2010 +0300
+++ b/applaunchservices/aftermarketappstarter/test/tamastarter/resource/hardware/tamastarter_amaadder_ssma.rss	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -17,8 +17,6 @@
 
 #include <ssm/ssmcmd.rh>
 #include <ssm/ssmsubstates.hrh>
-#include <ssm/cmdpersistreboots.rh>
-#include <ssm/cmdpersistreboots.hrh>
 
 UID2 KUidSsmCommandListResourceFile
 
@@ -61,8 +59,7 @@
    	{
 	commands =
 		{
-		r_increment_boot_count
-		, r_command_publish_system_state
+		r_command_publish_system_state
 		, r_command_ssmutilsrv
 		, r_command_sysmon
 		, r_command_sysagt2svr
@@ -298,20 +295,7 @@
 	severity = ECmdCriticalSeverity;
 	}
 
-RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count
-	{
-	severity = ECmdCriticalSeverity;
-	execution_behaviour = ESsmWaitForSignal;
-	dllname = "cmncustomcmds.dll";
-	ordinal = 1; // Persist reboots custom command is at ordinal 1
-	dll_data = r_increment;
-	}
 
-RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment
-	{
-	val = EIncrementBootCount;
-	}
-	
 RESOURCE SSM_START_PROCESS_INFO r_command_tamastarter_amaadder
 	{
 	name = "tamastarter_amaadder.exe";

--- a/appsupport_plat/restore_factory_settings_api/inc/rfsHandler.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/appsupport_plat/restore_factory_settings_api/inc/rfsHandler.h	Wed Oct 20 17:03:03 2010 +0300
@@ -41,7 +41,7 @@
 
 // FORWARD DECLARATIONS
 
-class CEikonEnv;
+
 class CSecurityHandler;
 class CRfsSecurityHandler;
 class CRfsPdpObserver;
@@ -108,13 +108,7 @@
 
     private:    // new functions
 
-        /**
-        * Loads the resources needed for the confirmation query.
-        *
-        * @return resource file offset
-        */
-        void LoadResourceL();
-
+       
         /**
         * Sets the default language code in HAL.
         * This must be done before rebooting the phone for deep level RFS.
@@ -124,13 +118,12 @@
         /**
         * Shows the RFS confirmation query.
         * 
-        * @param aThisDestroyed  ETrue, if the RFS handler object was destroyed, otherwise EFalse.          
         * @param aType           Represents RFS reason Normal or Deep.              
         * @return                ETrue, if user selected 'YES' as an option at the confirmation query dialog
         *                        otherwise EFalse.
         * @leave                 leaves with one of the system wide error.
         */
-        TBool AskConfirmationL( const TBool& aThisDestroyed, TRfsType aType );
+        TBool AskConfirmationL( TRfsType aType );
 
         /**
         * Cleans up the mess, by calling Cancel().
@@ -153,12 +146,6 @@
 
     private:    // Data
 
-        // resource file
-        TInt iResourceFileOffset;
-
-        // UIKON environment
-        CEikonEnv* iEnv;
-
         // flags
         TInt iFlags;

--- a/contenthandling/webrecognisers/Test/t_recweb/crecwebrecogtest.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/contenthandling/webrecognisers/Test/t_recweb/crecwebrecogtest.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 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"
@@ -22,6 +22,7 @@
 const TInt KTestCaseCount = 8;
 const TInt KTestDataSize = 2048;
 _LIT8(KHtmlMimeType,"text/html");
+_LIT8(KHtmlMimeType2,"application/xhtml+xml");	// added as part of platsim
 _LIT8(KXmlMimeType,"text/xml");
 
 CRecWebRecogTest* CRecWebRecogTest::NewL(TAny* aConstructionsParams)
@@ -224,7 +225,7 @@
 	{
 	_LIT(KTxtTestFile6Path, "z:\\recogtestdata\\sample3");
 	
-	RunTestL(KTxtTestFile6Path(), KHtmlMimeType());
+	RunTestL(KTxtTestFile6Path(), KHtmlMimeType2());
 	}
 	
 void CRecWebRecogTest::RunTestCase7L()

--- a/contextframework/cfw/tsrc/public/basic/group/mt_cfsisupgrade.mmp	Tue Oct 12 17:17:12 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/mt_cfsisupgrade.mmp	Wed Oct 20 17:03:03 2010 +0300
@@ -54,7 +54,8 @@
 LIBRARY                 euser.lib
 LIBRARY			bafl.lib
 LIBRARY			efsrv.lib
-LIBRARY			SWInstCli.lib
+// SwinstClin.lib has removed from MCL.. As this test code is still not operational .. we are commenting it for now.
+//LIBRARY			SWInstCli.lib
 LIBRARY			ecom.lib
 LIBRARY			cfclient.lib
 LIBRARY			cfservices.lib

--- a/coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -17,9 +17,9 @@
  */
 
 // INCLUDE FILES
-#include "GSLogger.h"
+#include "GsLogger.h"
 #include "GSServerEngine.h"
-#include <AccessoriesCRKeys.h>
+#include <accessoriescrkeys.h>
 
 #include <e32svr.h>
 #include <centralrepository.h>

--- a/coreapplicationuis/Rfs/group/bld.inf	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/group/bld.inf	Wed Oct 20 17:03:03 2010 +0300
@@ -22,9 +22,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-../loc/rfs.loc                              MW_LAYER_LOC_EXPORT_PATH(rfs.loc)
 ../rom/rfs.iby                              CORE_MW_LAYER_IBY_EXPORT_PATH(rfs.iby)
-../rom/rfsResources.iby                     LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(rfsResources.iby)
 ../rom/rfs_variant.iby                      CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(rfs_variant.iby)
 ../inc/sipsystemstatemonitorpskeys.h 	    SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(sipsystemstatemonitorpskeys.h)

--- a/coreapplicationuis/Rfs/group/rfs.mmp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/group/rfs.mmp	Wed Oct 20 17:03:03 2010 +0300
@@ -31,9 +31,10 @@
 
 
 SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
-
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbcore
 
 LIBRARY		HbWidgets.lib
+LIBRARY     hbcore.lib
 
 
 
@@ -51,11 +52,6 @@
 SOURCE rfsConnectionObserver.cpp
 SOURCE rfscontimer.cpp
 
-START RESOURCE  ../src/rfs.rss
-TARGETPATH      RESOURCE_FILES_DIR
-HEADER
-LANGUAGE_IDS
-END  // RESOURCE
 
 LIBRARY euser.lib
 LIBRARY efsrv.lib

--- a/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h	Wed Oct 20 17:03:03 2010 +0300
@@ -26,7 +26,7 @@
 #include <pdpcontextmanagerpskeys.h>
 #include <sipsystemstatemonitorpskeys.h>
 
-#include "rfscontimer.h"
+#include "rfsConTimer.h"
 
 class CRfsConTimer;

--- a/coreapplicationuis/Rfs/loc/rfs.loc	Tue Oct 12 17:17:12 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2007-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: 
-*     This file contains the localised strings for rfs.
-*
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// d: Note if user tries to activate RFS when there are
-// d: ongoing calls or connections.
-// l: popup_note_window
-//
-#define qtn_rfs_note_active_calls "Ongoing calls and connections must be terminated before."
-
-
-// d: Wait note for closing connections
-// l: popup_note_wait_window
-//
-#define qtn_rfs_note_closing_connections "Closing connections"
-
-
-// d: Confirmation for restore factory settings operation.
-// l: popup_note_window
-//
-#define qtn_rfs_restore_query "Phone will return to original factory settings.During restore phone cannot be used, even for emergencies."
-
-
-// d: Confirmation for Erase all data operation.
-// l: popup_note_window
-//
-#define qtn_rfs_reset_phone_settings "Erase all data and settings? Memory card will not be erased. During restore phone cannot be used, even for emergencies."
-
-
-// d: Note for the users telling him that the device will restart
-// l: popup_note_window
-//
-#define qtn_rfs_note_device_restart  "Device will restart" 
-
-
-//End of File

--- a/coreapplicationuis/Rfs/src/rfs.rss	Tue Oct 12 17:17:12 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2002-2010 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: 
-*     This file contains all the resources for the module.
-*
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-
-NAME    RFS        // 4 letter ID
-
-//  INCLUDES
-
-#include "rfs.loc"
-#include <eikon.rsg>
-#include <eikon.rh>
-
-
-// RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE {}
-
-RESOURCE TBUF { buf=""; }
-
-RESOURCE TBUF r_active_calls { buf = qtn_rfs_note_active_calls; }
-
-RESOURCE TBUF r_device_restart { buf = qtn_rfs_note_device_restart; }
-
-
-RESOURCE TBUF r_confirm_rfs { buf = qtn_rfs_restore_query; }
-
-RESOURCE TBUF r_confirm_deep_rfs { buf = qtn_rfs_reset_phone_settings; }
-
-RESOURCE TBUF r_closing_connections { buf = qtn_rfs_note_closing_connections; }
-
-
-// End of File

--- a/coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -18,13 +18,14 @@
 */
 
 // SYSTEM INCLUDES
-#include <rfs.rsg>                      
+                 
 #include <PSVariables.h>
 #include <featmgr.h>
 #include <eikenv.h>  
 #include <centralrepository.h>
 #include <pdpcontextmanagerinternalcrkeys.h>
 #include <StringLoader.h> 
+#include <hbtextresolversymbian.h>
 
 
 
@@ -224,8 +225,13 @@
     // Start displaying the dialog which will then be closed form the RunL()
     // Here the code execution blocks and we will proceed further only when 
     // this dialog is canceled
+    
+    _LIT(Klocalisationfile, "control_panel_");
+    _LIT(KtsfilePath, "z:/resource/qt/translations/");
 
-    HBufC* prompt = StringLoader::LoadLC( R_CLOSING_CONNECTIONS ); 
+    TBool result = HbTextResolverSymbian::Init(Klocalisationfile,KtsfilePath);
+    _LIT(Kclosingconnections,"txt_cp_info_closing_connections");
+    HBufC* prompt = HbTextResolverSymbian::LoadL(Kclosingconnections);
     
     iDialog->SetTextL(*prompt);
              
@@ -239,8 +245,7 @@
     iWait->Start();
     delete iWait;
     iWait=NULL;
-    CleanupStack::PopAndDestroy( prompt );
-              
+                  
     return iAllConnectionClosed;
      }

--- a/coreapplicationuis/Rfs/src/rfsHandler.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfsHandler.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -22,7 +22,6 @@
 #include <e32std.h>
 #include <bautils.h>                // BaflUtils
 #include <eikenv.h>                 // CEikonEnv
-#include <rfs.rsg>                  // rfs resource file
 #include <etelmm.h>
 #include <mmtsy_names.h>
 
@@ -54,11 +53,13 @@
 #include "rfsClient.h"
 #include "RfsTraces.h"
 #include <hbdevicemessageboxsymbian.h>
+#include <hbtextresolversymbian.h>
 
 
-_LIT( KRfsResourceFileName, "Z:rfs.rsc");
-_LIT(KYes,"yes");
-_LIT(KNo,"No");
+_LIT(Kcommonerrors,"common_errors_");
+_LIT(Kcontrolpanel,"control_panel_");
+_LIT(KtsfilePath,"z:/resource/qt/translations/");
+
 
 // CONSTANTS
 const TInt KPhoneIndex = 0;
@@ -96,12 +97,7 @@
         return;
         }
 
-    // load the resource file
-    if ( !iResourceFileOffset )
-        {
-        LoadResourceL();
-        }
-	
+    
     // Create a generic connection observer for closing all the active connections
     // if they exist. Currently there are only 2 types i.e. SIP and PDP
     CRfsConnectionObserver* connectionObserver = CRfsConnectionObserver::NewLC();
@@ -145,12 +141,7 @@
     iFlags |= ( KRfsHandlerActivated | KRfsHandlerInitDone );
     TBool proceed( ETrue );
 
-    // Setup information of whether the CRfsHandler instance has been
-    // destroyed while one of the queries was on the screen.
-    TBool thisDestroyed( EFalse );
-    iDestroyedPtr = &thisDestroyed;
-    CleanupResetPointerPushL( iDestroyedPtr );
-
+    
     // Ask first query.
     if ( aAskSecurityCodeFirst )
         {
@@ -158,7 +149,7 @@
         }
     else
         {
-        proceed = AskConfirmationL( thisDestroyed, aType );
+        proceed = AskConfirmationL( aType );
         }
 
     // If OK, ask second query.
@@ -166,7 +157,7 @@
         {
         if ( aAskSecurityCodeFirst )
             {
-            proceed = AskConfirmationL( thisDestroyed, aType );
+            proceed = AskConfirmationL( aType );
             }
         else
             {
@@ -186,15 +177,17 @@
         if( startersession.Connect() == KErrNone )
             {
 			// Displays information note to the user telling that the device will restart
-            HBufC* prompt = StringLoader::LoadLC( R_DEVICE_RESTART );
+            TBool result = HbTextResolverSymbian::Init(Kcommonerrors, KtsfilePath);
+            _LIT(Krestarting,"txt_error_info_restarting");
+            HBufC* prompt =HbTextResolverSymbian::LoadL(Krestarting);
                  
-          CHbDeviceMessageBoxSymbian* note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+            CHbDeviceMessageBoxSymbian* note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
                 CleanupStack::PushL(note);
                 note->SetTextL(*prompt);
                 //could have used show() but it is aynchronous and execution proceeds before note is seen so have used synchronous API exec()
                 note->ExecL();
                 CleanupStack::PopAndDestroy(note);
-                CleanupStack::PopAndDestroy( prompt );
+                
                 	
                 	              
                
@@ -224,18 +217,9 @@
         {
         connectionObserver->ReportRfsCompletionToSip();
         }
-    
-    if ( thisDestroyed ) // this object has already been destroyed
-        {
-        // remove cleanup items
-        CleanupStack::Pop( 2 ); // this, iDestroyedPtr
-        }
-    else
-        {
-        // NULLs iDestroyedPtr and calls DoCleanup()
-        CleanupStack::PopAndDestroy( 2 ); // this, iDestroyedPtr
-        }
-    
+       
+    CleanupStack::PopAndDestroy( this ); // this
+     
     CleanupStack::PopAndDestroy(connectionObserver);
     }
 
@@ -272,36 +256,10 @@
 
     iTelServer.Close();
 
-    // close the resource file
-    if ( iResourceFileOffset )
-        {
-        iEnv->DeleteResourceFile( iResourceFileOffset );
-        iResourceFileOffset = 0;
-        }
-
     // finally, reset the flags
     iFlags = 0;
     }
 
-// -----------------------------------------------------------------------------
-// CRfsHandler::LoadResourceL()
-// -----------------------------------------------------------------------------
-void CRfsHandler::LoadResourceL()
-    {
-    TRACES("CRfsHandler::LoadResourceL()");
-    iEnv = CEikonEnv::Static();
-
-    // eikon environment is needed
-    __ASSERT_DEBUG( iEnv, User::Invariant() );
-
-    TParse* fp = new(ELeave) TParse(); 
-    fp->Set(KRfsResourceFileName, &KDC_RESOURCE_FILES_DIR, NULL);
-    TFileName fileName( fp->FullName() );
-    delete fp;
-
-    BaflUtils::NearestLanguageFile( iEnv->FsSession(), fileName );
-    iResourceFileOffset = iEnv->AddResourceFileL( fileName );
-    }
 
 // -----------------------------------------------------------------------------
 // CRfsHandler::SetDefaultLanguage()
@@ -327,17 +285,30 @@
 // -----------------------------------------------------------------------------
 // CRfsHandler::AskConfirmationL()
 // -----------------------------------------------------------------------------
-TBool CRfsHandler::AskConfirmationL( const TBool& aThisDestroyed, TRfsType aType )
+TBool CRfsHandler::AskConfirmationL( TRfsType aType )
     {
     TRACES("CRfsHandler::AskConfirmationL()");
-     
    
-    TInt resourceId = ( aType == ERfsNormal ) ? R_CONFIRM_RFS : R_CONFIRM_DEEP_RFS;
-    HBufC* query = iEnv->AllocReadResourceLC( resourceId );
-         
-   // Show the confirmation query.
-          
-   CHbDeviceMessageBoxSymbian::TButtonId selection = CHbDeviceMessageBoxSymbian::QuestionL(*query, KYes, KNo);
+     TBool result = HbTextResolverSymbian::Init(Kcontrolpanel, KtsfilePath);
+     _LIT(Knormalrfs,"txt_cp_info_restore_original_settings_no_data_wil");
+     _LIT(KDeeprfs,"txt_cp_info_delete_all_data_and_restore_original_s");
+    
+        
+     HBufC* query = NULL;
+    if( aType == ERfsNormal ) 
+      query = HbTextResolverSymbian::LoadL(Knormalrfs);
+    else
+      query = HbTextResolverSymbian::LoadL(KDeeprfs); 
+   
+    _LIT(Kcommonlocalisationfile, "common_");
+    TBool result1 = HbTextResolverSymbian::Init(Kcommonlocalisationfile, KtsfilePath);
+    _LIT(Kyes,"txt_common_button_ok");
+    _LIT(Kno,"txt_common_button_cancel");
+   
+    HBufC* yes = HbTextResolverSymbian::LoadL(Kyes);
+    HBufC* no = HbTextResolverSymbian::LoadL(Kno);
+    // Show the confirmation query.   
+   CHbDeviceMessageBoxSymbian::TButtonId selection = CHbDeviceMessageBoxSymbian::QuestionL(*query,*yes,*no);
     TBool ret;    
     if (selection == CHbDeviceMessageBoxSymbian::EAcceptButton) // user pressed yes
         {
@@ -347,7 +318,6 @@
         {
         ret=EFalse;
         }  
-    CleanupStack::PopAndDestroy(query);
     return ret;  
     
     }
@@ -437,15 +407,17 @@
         ( wlanState == EPSWlanIndicatorActive || wlanState == EPSWlanIndicatorActiveSecure ))
 #endif //__WINS__
         {
-        HBufC* prompt = iEnv->AllocReadResourceLC( R_ACTIVE_CALLS );
+        TRACES("CRfsHandler::checkconnectionsL():show active connections note ");
+        TBool result = HbTextResolverSymbian::Init(Kcontrolpanel, KtsfilePath);
+        _LIT(Kactivecalls,"txt_cp_info_active_calls_and_connections_must_be_d");
+        HBufC* prompt = HbTextResolverSymbian::LoadL(Kactivecalls);
 
-           CHbDeviceMessageBoxSymbian* note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
-                CleanupStack::PushL(note);
-                        note->SetTextL(*prompt);
-                        note->ShowL();
-                         CleanupStack::PopAndDestroy( note );
-                        CleanupStack::PopAndDestroy( prompt );
-               
+        CHbDeviceMessageBoxSymbian* note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+        CleanupStack::PushL(note);
+        note->SetTextL(*prompt);
+        note->ShowL();
+        CleanupStack::PopAndDestroy( note );
+                      
         return ETrue;
         }

--- a/coreapplicationuis/Rfs/src/rfscontimer.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfscontimer.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <e32debug.h>
 
-#include "rfscontimer.h"
+#include "rfsConTimer.h"
 #include "RfsTraces.h"
 
 const TInt KRfsConnectionTimeOut = 60000000;

Binary file coreapplicationuis/Rfs/tsrc/RfsTestModule/data/rfs_testscript0.txt has changed

--- a/coreapplicationuis/Rfs/tsrc/RfsTestModule/group/RfsTestModule.mmp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/tsrc/RfsTestModule/group/RfsTestModule.mmp	Wed Oct 20 17:03:03 2010 +0300
@@ -26,6 +26,7 @@
 UID             0x1000008D 0x101FB3E3
 
 CAPABILITY      ALL -TCB
+CAPABILITY		DiskAdmin
 /* Remove comments and replace 0x00000000 with correct vendor id */
 // VENDORID     0x00000000
 /* Remove comments and replace 0x00000000 with correct secure id */

--- a/coreapplicationuis/Rfs/tsrc/RfsTestModule/group/bld.inf	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/tsrc/RfsTestModule/group/bld.inf	Wed Oct 20 17:03:03 2010 +0300
@@ -24,6 +24,16 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../init/TestFramework.ini /epoc32/winscw/c/TestFramework/TestFramework.ini
+../init/TestFramework.ini /epoc32/data/z/system/data/TestFramework.ini
+
+../conf/ui_RfsTestModule.cfg /epoc32/winscw/c/TestFramework/ui_RfsTestModule.cfg
+../conf/ui_RfsTestModule.cfg /epoc32/data/z/system/data/ui_RfsTestModule.cfg
+
+../data/rfs_testscript0.txt     /epoc32/release/winscw/udeb/z/data/coreappuistestdata/rfs_testscript0.txt
+../data/rfs_testscript0.txt     /epoc32/data/z/system/data/rfs_testscript0.txt
+
+
 ../rom/RfsTestModule.iby                              CORE_MW_LAYER_IBY_EXPORT_PATH(RfsTestModule.iby)
 
 PRJ_EXPORTS

--- a/coreapplicationuis/Rfs/tsrc/RfsTestModule/init/TestFramework.ini	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/tsrc/RfsTestModule/init/TestFramework.ini	Wed Oct 20 17:03:03 2010 +0300
@@ -70,7 +70,7 @@
 
 [New_Module]
 ModuleName= testscripter 
-TestCaseFile= c:\testframework\ui_RfsTestModule.cfg 
+TestCaseFile= Z:\testframework\ui_RfsTestModule.cfg 
 [End_Module]

--- a/coreapplicationuis/Rfs/tsrc/RfsTestModule/rom/RfsTestModule.iby	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/Rfs/tsrc/RfsTestModule/rom/RfsTestModule.iby	Wed Oct 20 17:03:03 2010 +0300
@@ -1,12 +1,30 @@
+/*
+* Copyright (c) 2010 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 __RFSTESTMODULE_IBY__
 #define __RFSTESTMODULE_IBY__
 
 file=ABI_DIR\BUILD_DIR\RfsTestModule.dll                      SHARED_LIB_DIR\RfsTestModule.dll
 
-data=\epoc32\data\z\system\data\TestFramework.ini             \testframework\RFS_TestFramework.ini
+//data=\epoc32\data\z\system\data\TestFramework.ini             \testframework\RFS_TestFramework.ini
 
 data=\epoc32\data\z\system\data\ui_RfsTestModule.cfg                      \testframework\ui_RfsTestModule.cfg
 
+data=\epoc32\data\z\system\data\rfs_testscript0.txt       \data\coreappuistestdata\rfs_testscript0.txt
 
 
 #endif

--- a/coreapplicationuis/SysAp/Inc/SysAp.hrh	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysAp.hrh	Wed Oct 20 17:03:03 2010 +0300
@@ -37,7 +37,7 @@
 
 const TInt KMinimumLightsTimeout( 5 );  //  5 seconds 
 const TInt KDefaultLightsTimeout( 15 ); // 15 seconds 
-const TInt KMaximumLightsTimeout( 60 ); // 60 seconds 
+const TInt KMaximumLightsTimeout( 110 ); // 110 seconds (120-10) dimmed duration should be 10 secs so
 
 const TInt KMaximumAnimationTime( 3000 ); // 3 seconds

--- a/coreapplicationuis/SysAp/Inc/SysApAccessoryObserver.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApAccessoryObserver.h	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 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"
@@ -122,7 +122,9 @@
         TAccMode iPreviousMode;
         RAccessoryConnection iAccessoryConnection;
         TInt iPhysicalConnectionType;
-        
+#ifdef FCC_UNIT_TEST
+        friend class Cutsysapgeneraltest;
+#endif        
     };
 
 #endif      // SYSAPACCESSORYOBSERVER_H

--- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Wed Oct 20 17:03:03 2010 +0300
@@ -21,7 +21,7 @@
 #include <aknappui.h>
 #include "SysAp.hrh"
 #include <f32file.h> 
-#include <W32STD.H>
+#include <w32std.h>
 #include <coedef.h>
 #include <e32property.h>
 #include <sysapcallback.h>
@@ -99,7 +99,12 @@
 *  @since 1.0
 */
 
+
+#ifdef  FCC_UNIT_TEST
+class CSysApAppUi : public CBase,
+#else
 class CSysApAppUi : public CAknAppUi,
+#endif                    
                     public MSysApMemoryCardObserver,
                     public MSysApTimerResponder,
                     public MSysapCallback,
@@ -302,6 +307,8 @@
         void SetHacIndicatorL();
         void DoNotActivateBt();
         void SetIhfIndicatorL();
+        void SetPosIndicatorL(TInt aValue);
+        void HandlePsmAndChargingIndicatorL(TBool aValue,const TDesC& aLiteral);
 		void HandleLongPowerKeyPressedL();
         void IgnoreZeroNetworkBarNotifications(TBool aIgnore);
         void InitCloseSimApplicationsL();
@@ -512,23 +519,20 @@
           
           CSysApAudioRoutingObserver* iSysApAudioRoutingObserver;
           CSysApPsmController* iSysApPsmController;
-		  		CHbSymbianVariant* iVariantAccState ;
-          CSystemLock*                    iSysApSystemLock;
+		  CSystemLock*                    iSysApSystemLock;
           CSysApCenRepCallForwardingObserver* iSysApCenRepCallForwardingObserver;
           CSysApBatteryInfoController* iSysApBatteryInfoController;
           MSysApBtSapController*          iSysApBtSapController;
           CPeriodic*                      iSapTimer;
           MSysApBtController*             iSysApBtController;
           CSysApCenRepLogsObserver*                iSysApCenRepLogsObserver;
-		  		MSysApUsbIndicator*             iSysApUsbIndicatorController;
-		  		CKeyguardAccessApi*             iKeyguardController;
-		  		CHbDevicePowerMenuSymbian*            iPowerMenuDialog;
-	      	CSysApKeyManagement*            iSysApKeyManagement;
-	      	CSysApMMCObserver*              iSysApMMCObserver;
-	      	CSysApEtelConnector*            iSysApEtelConnector;
+		  MSysApUsbIndicator*             iSysApUsbIndicatorController;
+		  CKeyguardAccessApi*             iKeyguardController;
+		  CHbDevicePowerMenuSymbian*            iPowerMenuDialog;
+	      CSysApKeyManagement*            iSysApKeyManagement;
+	      CSysApMMCObserver*              iSysApMMCObserver;
+	      CSysApEtelConnector*            iSysApEtelConnector;
 		  
-	public:		  
-		  CHbIndicatorSymbian* 			  iHbIndicatorSymbian;
 		  
 
      private:

--- a/coreapplicationuis/SysAp/Inc/SysApEtelNetworkStatusNspsObserver.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApEtelNetworkStatusNspsObserver.h	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -23,6 +23,12 @@
 #include <e32base.h>
 #include <rmmcustomapi.h>
 
+#ifdef FCC_UNIT_TEST
+
+class CutSysApEtelNetworkStatusNspsObserver;
+
+#endif
+
 // FORWARD DECLARATIONS
 class CSysApAppUi;
 
@@ -36,6 +42,9 @@
 
 class CSysApEtelNetworkStatusNspsObserver : public CActive
     {
+#ifdef FCC_UNIT_TEST
+    friend class CutSysApEtelNetworkStatusNspsObserver;
+#endif    
     public: // Constructors and destructor
         /**
         * Constructor

--- a/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2003-2010 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"
@@ -356,6 +356,10 @@
     */
     TBool iTouchUnlockStrokeSupported;
     
+#ifdef FCC_UNIT_TEST
+    friend class Cutsysapgeneraltest;
+#endif     
+    
     /**
     * FM TX RDS Text support status.
     */

--- a/coreapplicationuis/SysAp/Inc/SysApLightsController.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApLightsController.h	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 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"
@@ -451,7 +451,10 @@
 #ifdef RD_LIGHT_CONTROL_CHANGE
         CSysApLightPluginHandler* iLightPluginHandler;
         TBool iKeyEventsObserved;
-#endif // RD_LIGHT_CONTROL_CHANGE        
+#endif // RD_LIGHT_CONTROL_CHANGE       
+#ifdef FCC_UNIT_TEST
+        friend class Cutsysaplightscontroller;
+#endif // FCC_UNIT_TEST 
     };
 
 #endif      // SYSAPSLIGHTSCONTROLLER_H

--- a/coreapplicationuis/SysAp/Inc/hbdevicepowermenusymbian.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/hbdevicepowermenusymbian.h	Wed Oct 20 17:03:03 2010 +0300
@@ -62,6 +62,9 @@
     //Used to handle ShutDown
     CSysApAppUi& 				iSysApServer;
     CHbDevicePowerMenuPrivate* 	iPowerMenuPrivate;
+#ifdef FCC_UNIT_TEST
+        friend class Cutsysapgeneraltest;
+#endif 
 };
 
 #endif // defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)

--- a/coreapplicationuis/SysAp/Inc/sysapbatteryinfocontroller.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapbatteryinfocontroller.h	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 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"
@@ -21,6 +21,10 @@
 
 #include <e32base.h>
 
+#ifdef FCC_UNIT_TEST
+class Tut_sysap_batteryinfocontroller;
+#endif
+
 class CBSUtil;
 // class CBatteryPopupControl;
 
@@ -32,7 +36,9 @@
  */
 class CSysApBatteryInfoController : public CBase
     {
-
+#ifdef FCC_UNIT_TEST
+    friend class Tut_sysap_batteryinfocontroller;
+#endif
     /**
     * States for battery information.
     */

--- a/coreapplicationuis/SysAp/Inc/sysapkeymanagement.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapkeymanagement.h	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -211,6 +211,9 @@
         * Key handler plugins managed by SysAp.
         */ 
         RSysApPluginsArray iSysApPlugins;
+#ifdef FCC_UNIT_TEST
+        friend class Cutsysapkeymanagement;
+#endif
     };
 
 #endif //SYSAPKEYMANAGEMENT_H

--- a/coreapplicationuis/SysAp/Src/SysApAccessoryObserver.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAccessoryObserver.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -20,8 +20,8 @@
 #include "SysApAccessoryObserver.h"
 #include "SysAp.hrh"
 #include "SysApAppUi.h"
-#include <Accpolgenericidarray.h>
-#include <Accpolgenericid.h>
+#include <AccPolGenericIDArray.h>
+#include <AccPolGenericID.h>
 
 #include <e32svr.h>      // RDebug

--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -17,9 +17,9 @@
 // INCLUDES
 
 #include <startupdomainpskeys.h>
-#include "sysapappui.h"
+#include "SysApAppUi.h"
 #include "coreapplicationuisprivatepskeys.h"
-#include <HbDeviceMessageBoxSymbian.h>
+#include <hbdevicemessageboxsymbian.h>
 //#include <hbdevicepowermenusymbian.h>
 #include <sacls.h>
 #include <featmgr.h>
@@ -29,7 +29,7 @@
 #include <apgtask.h>
 #include <hwrmpowerstatesdkpskeys.h>
 #include <wlaninternalpskeys.h> 
-#include <HbDeviceNotificationDialogSymbian.h>
+#include <hbdevicenotificationdialogsymbian.h>
 #include <hbsymbianvariant.h>
 #include <hbtextresolversymbian.h>
 #include <UikonInternalPSKeys.h>
@@ -111,8 +111,8 @@
 _LIT(KCharging,"Charging");
 _LIT(KPsmlocalisationfile, "powermanagement_");
 _LIT(KtsfilePath, "z:/resource/qt/translations/");
-_LIT(KlowbatteryIcon,"qtg_small_bt_low_battery.svg");
-_LIT(KbatteryFullIcon,"qtg_status_battery.svg");
+_LIT(KlowbatteryIcon,"qtg_small_bt_low_battery");
+_LIT(KbatteryFullIcon,"qtg_status_battery");	
 
 
 
@@ -323,9 +323,8 @@
     RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogUninitialized );
     
 	TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CHbIndicatorSymbian::NewL()") ) );
-    iHbIndicatorSymbian = CHbIndicatorSymbian::NewL();
-	
-	  TBool result = HbTextResolverSymbian::Init(KPsmlocalisationfile, KtsfilePath);
+   
+	TBool result = HbTextResolverSymbian::Init(KPsmlocalisationfile, KtsfilePath);
 	
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: END") ) );    
     }
@@ -339,8 +338,6 @@
     TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources") ) );
     delete iSysApBatteryInfoController;
     delete iSysApPsmController;
-    delete iVariantAccState; 
-
     delete iSysApAudioRoutingObserver;
 
     delete iChargingAnimation;
@@ -390,7 +387,6 @@
     
     delete iSysApUsbIndicatorController;
     delete iKeyguardController;
-    delete iHbIndicatorSymbian; 
     delete iSysApKeyManagement;
     iSysApKeyManagement = NULL;
     
@@ -528,12 +524,7 @@
        if ( iSysApPsmController->FullPsmEnabled() )
            {
            // activate psm indicator 
-            iVariantAccState = CHbSymbianVariant::NewL(&KPsm, CHbSymbianVariant::EDes);
-            if (!iHbIndicatorSymbian->Activate(KPsmPlugin,iVariantAccState)) 
-               {
-               int error = iHbIndicatorSymbian->Error();
-               //use the errorcode...
-               }
+           HandlePsmAndChargingIndicatorL(ETrue,KPsm);                
            }
      
        }
@@ -697,13 +688,13 @@
 void CSysApAppUi::ShowNoteL( const TDesC& noteText )const
     {          
  	TRACES( RDebug::Print( _L("CSysApAppUi::ShowNoteL:: constructing CHbDeviceMessageBoxSymbian:BeGIN") ) );    
-    CHbDeviceMessageBoxSymbian *note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+  CHbDeviceMessageBoxSymbian *note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
  	CleanupStack::PushL(note);
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowNoteL:: construction of CHbDeviceMessageBoxSymbian:END") ) ); 
-    note->SetTextL(noteText);
-	note->SetTimeout(3000);
+  TRACES( RDebug::Print( _L("CSysApAppUi::ShowNoteL:: construction of CHbDeviceMessageBoxSymbian:END") ) ); 
+  note->SetTextL(noteText);
+	note->SetTimeout(0);
  	TRACES( RDebug::Print( _L("CSysApAppUi:: Display of  CHbDeviceMessageBoxSymbian::Begin") ) );    
-    note->ShowL();
+  note->ShowL();
 	TRACES( RDebug::Print( _L("CSysApAppUi:: Display of  CHbDeviceMessageBoxSymbian::End") ) );
 	CleanupStack::PopAndDestroy(note);
     }
@@ -1357,7 +1348,11 @@
     if ( accessoryState == EAccModeHandPortable )
         {
         TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL:Before Deactivating accessory Plugin")));
-        iHbIndicatorSymbian->Deactivate(KAccesoryPlugin);
+        CHbIndicatorSymbian* HbIndicatorSymbian = CHbIndicatorSymbian::NewL();
+        CleanupStack::PushL(HbIndicatorSymbian);
+        HbIndicatorSymbian->Deactivate(KAccesoryPlugin);
+        User::LeaveIfError(HbIndicatorSymbian->Error());
+        CleanupStack::PopAndDestroy(HbIndicatorSymbian); // indicator
         TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL:After  Deactivating accessory Plugin")));
         iSysApLightsController->AccessoryConnectedL( EFalse );
         iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 0 );
@@ -1393,18 +1388,20 @@
     {
     TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL( aAccessoryState: %d )(aPhysicalConnectionType: %d "), aAccessoryState, aPhysicalConnectionType ) );
 
-    CHbSymbianVariantMap* iAccVariantMap = CHbSymbianVariantMap::NewL();
-    CleanupStack::PushL(iAccVariantMap);
+    CHbSymbianVariantMap* AccVariantMap = CHbSymbianVariantMap::NewL();
+    CleanupStack::PushL(AccVariantMap);
     CHbSymbianVariant* variantAccState = CHbSymbianVariant::NewL(&aAccessoryState, CHbSymbianVariant::EInt);
-    iAccVariantMap->Add(KAccMode,variantAccState);
+    AccVariantMap->Add(KAccMode,variantAccState);
     CHbSymbianVariant* variantAccType = CHbSymbianVariant::NewL(&aPhysicalConnectionType, CHbSymbianVariant::EInt);
-    iAccVariantMap->Add(KAccPhyConType,variantAccType);
+    AccVariantMap->Add(KAccPhyConType,variantAccType);
     
     
-    CHbSymbianVariant* iAccVariant = CHbSymbianVariant::NewL(iAccVariantMap, CHbSymbianVariant::EVariantMap ); 
-    CleanupStack::PushL(iAccVariant);
-    iHbIndicatorSymbian->Activate(KAccesoryPlugin, iAccVariant);
-
+    CHbSymbianVariant* AccVariant = CHbSymbianVariant::NewL(AccVariantMap, CHbSymbianVariant::EVariantMap ); 
+    CleanupStack::PushL(AccVariant);
+    CHbIndicatorSymbian* HbIndicatorSymbian = CHbIndicatorSymbian::NewL();
+    CleanupStack::PushL(HbIndicatorSymbian);
+    HbIndicatorSymbian->Activate(KAccesoryPlugin, AccVariant);
+    User::LeaveIfError(HbIndicatorSymbian->Error());
 
     TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
     TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL: swState: %d"), swState ) );
@@ -1440,10 +1437,32 @@
         }
     SetIhfIndicatorL();
     SetHacIndicatorL();
-    CleanupStack::PopAndDestroy(2);
+    CleanupStack::PopAndDestroy(3);
     }
 
 
+void CSysApAppUi::SetPosIndicatorL(TInt aValue)
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::SetPosIndicatorL begin") ) );
+    _LIT(KGpsIndicatorPlugin, "com.nokia.positioning.indicatorplugin/1.0");
+    CHbIndicatorSymbian* HbIndicatorSymbian = CHbIndicatorSymbian::NewL();
+    CleanupStack::PushL(HbIndicatorSymbian);
+    if(aValue)
+        {
+        TRACES( RDebug::Print( _L("CSysApAppUi::SetPosIndicatorL activate") ) );
+        HbIndicatorSymbian->Activate(KGpsIndicatorPlugin);
+        User::LeaveIfError(HbIndicatorSymbian->Error());
+       
+        }
+    else
+        {
+        TRACES( RDebug::Print( _L("CSysApAppUi::SetPosIndicatorL deactivate") ) );
+        HbIndicatorSymbian->Deactivate(KGpsIndicatorPlugin);
+        User::LeaveIfError(HbIndicatorSymbian->Error());
+        }
+    CleanupStack::PopAndDestroy(HbIndicatorSymbian); 
+    }
+
 // ----------------------------------------------------------------------------
 // CSysApAppUi::SetHacIndicatorL()
 // ----------------------------------------------------------------------------
@@ -1784,22 +1803,16 @@
     switch ( aStatus )
         {
         case MSysApPsmControllerNotifyCallback::EPsmActivationComplete:
+             TRACES( RDebug::Print( _L("CSysApAppUi::NotifyPowerSaveModeL case MSysApPsmControllerNotifyCallback::EPsmActivationComplete: indicator activation ") ) );
              UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-             iVariantAccState = CHbSymbianVariant::NewL(&KPsm, CHbSymbianVariant::EDes);
-             if (!iHbIndicatorSymbian->Activate(KPsmPlugin,iVariantAccState)) 
-                {
-                int error = iHbIndicatorSymbian->Error();
-                //use the errorcode...
-                }
+             HandlePsmAndChargingIndicatorL(ETrue,KPsm);
              break;
         
         case MSysApPsmControllerNotifyCallback::EPsmDeactivationComplete:
-             UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-             if (!iHbIndicatorSymbian->Deactivate(KPsmPlugin)) 
-                {
-                int error = iHbIndicatorSymbian->Error();
-                 //use the errorcode...
-                }
+            TRACES( RDebug::Print( _L("CSysApAppUi::NotifyPowerSaveModeL case MSysApPsmControllerNotifyCallback::EPsmDeactivationComplete: indicator deactivation") ) );
+            UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+            HandlePsmAndChargingIndicatorL(EFalse,KPsm);  
+              
             break;
             
         case MSysApPsmControllerNotifyCallback::EPsmActivationFailed:
@@ -1816,6 +1829,30 @@
     }
 
 
+
+void CSysApAppUi::HandlePsmAndChargingIndicatorL(TBool aValue,const TDesC& aLiteral )
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandlePsmAndChargingIndicatorL aValue:%d"), aValue ) );
+    CHbIndicatorSymbian* HbIndicatorSymbian = CHbIndicatorSymbian::NewL();
+    CleanupStack::PushL(HbIndicatorSymbian);
+   if(aValue)
+       {
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandlePsmAndChargingIndicatorL activate") ) );
+    CHbSymbianVariant* VariantAccState = CHbSymbianVariant::NewL(&aLiteral, CHbSymbianVariant::EDes);
+    CleanupStack::PushL(VariantAccState);
+    HbIndicatorSymbian->Activate(KPsmPlugin,VariantAccState);
+    User::LeaveIfError(HbIndicatorSymbian->Error()); 
+    CleanupStack::PopAndDestroy(VariantAccState);
+       }
+   else
+       {
+       TRACES( RDebug::Print( _L("CSysApAppUi::HandlePsmAndChargingIndicatorL deactivate") ) );
+       HbIndicatorSymbian->Deactivate(KPsmPlugin);
+       User::LeaveIfError(HbIndicatorSymbian->Error());
+       
+       }
+   CleanupStack::PopAndDestroy(HbIndicatorSymbian);
+    }
 // ----------------------------------------------------------------------------
 // CSysApAppUi::ShowAlarmIndicatorL()
 // ----------------------------------------------------------------------------
@@ -2110,9 +2147,9 @@
                 break;
             case ERechargeBatteryNote:
                 {
-                iSysApLightsController->BatteryEmptyL( ETrue );
                 _LIT(KRechargeBattery,"Battery empty. Recharge");
                 ShowNoteL( KRechargeBattery() );
+                iSysApLightsController->BatteryEmptyL( ETrue );
                 }
                 break;
             case ENotChargingNote:
@@ -2123,7 +2160,6 @@
                 break;
             case EBatteryFullUnplugChargerNote:
                 {
-                iSysApLightsController->BatteryEmptyL( ETrue );
                  _LIT(KunplugCharger,"txt_power_dpopinfo_unplug_charger_to_save_energy");                 
                  HBufC* unplugCharger = HbTextResolverSymbian::LoadL(KunplugCharger);
                  _LIT(KbatteryFull,"txt_power_management_dpophead_100_full");
@@ -2133,8 +2169,9 @@
                 break;
             case EUnplugChargerNote:
                 {
-                _LIT(KUnplugCharger,"Unplug charger from power supply to save energy");
-                ShowNoteL( KUnplugCharger() );
+                _LIT(KunplugCharger,"txt_power_dpopinfo_unplug_charger_to_save_energy"); 
+                HBufC* unplugcharger = HbTextResolverSymbian::LoadL(KunplugCharger);
+                ShowNoteL(*unplugcharger);
                 }
                 break;
             case ESysApRestartPhone:
@@ -2185,41 +2222,28 @@
 void CSysApAppUi::HandleChargingStatusL( const TInt aValue )
     {
     TRACES( RDebug::Print( _L("CSysApAppUi::HandleChargingStatusL aValue: %d"), aValue ) );
-    
-    TBool showNote( ETrue );
-    
+           
     UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
 
-    if ( iSysApPsmController && UiReady() ) 
-        {             
-        if ( iCharging && !iSysApPsmController->ChargerConnected() ) // first time after charger connection
+    if ( UiReady() ) 
+        { 
+        if ( iCharging ) // first time after charger connection
             {
+            TRACES( RDebug::Print( _L("CSysApAppUi::HandleChargingStatusL charging ") ) );
             iSysApPsmController->ConnectCharger( ETrue );
-            iSysApPsmController->DoEnableFullPsm(EFalse);             
-            iVariantAccState = CHbSymbianVariant::NewL(&KCharging, CHbSymbianVariant::EDes);
-               
-            if (!iHbIndicatorSymbian->Activate(KPsmPlugin,iVariantAccState)) 
-               {
-               int error = iHbIndicatorSymbian->Error();
-               //use the errorcode...
-               }
-              
-                           
+            iSysApPsmController->DoEnableFullPsm(EFalse);
+            HandlePsmAndChargingIndicatorL(ETrue,KCharging); 
             }
         else if ( aValue == EChargingStatusNotConnected )
             {
+            TRACES( RDebug::Print( _L("CSysApAppUi::HandleChargingStatusL not charging ") ) );
             iSysApPsmController->ConnectCharger( EFalse );
-            if (!iHbIndicatorSymbian->Deactivate(KPsmPlugin)) 
-               {
-               int error = iHbIndicatorSymbian->Error();
-               //use the errorcode...
-               }
-            }            
-        }
-    if( showNote )
-        {
-        HandleChargerNotesL( aValue );    
-        }
+            HandlePsmAndChargingIndicatorL(EFalse,KCharging);  
+            }  
+       }
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandleChargingStatusL end ") ) );
+    HandleChargerNotesL( aValue );    
+       
     }

--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -52,7 +52,6 @@
 const TUint KCoreAppUIsMmcRemovedWithoutEjectCmdMask = 0xFFFF;
 const TUint KCoreAppUIsMmcRemovedWithoutEjectValShift = 16;
 
-_LIT(KGpsIndicatorPlugin, "com.nokia.positioning.indicatorplugin/1.0");
 const TUid KPSUidSecurityUIs = { 0x100059b5 };
 const TUint32 KSecurityUIsLights  = 0x00000308;
 
@@ -928,12 +927,12 @@
         case KPosIntGpsHwStatus:
             if ( aValue == EPosIntGpsHwOff )
                 {
-                iSysApAppUi.iHbIndicatorSymbian->Deactivate(KGpsIndicatorPlugin);
+                iSysApAppUi.SetPosIndicatorL(aValue);
  //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOff );
                 }
             else if ( aValue == EPosIntGpsHwOn )    
                 {
-                iSysApAppUi.iHbIndicatorSymbian->Activate(KGpsIndicatorPlugin);
+                iSysApAppUi.SetPosIndicatorL(aValue);
  //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOn );
                 }
             else if ( aValue == EPosIntGpsHwIntermediate )

--- a/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -22,7 +22,7 @@
 #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
 
 //#include <aknappui.h>
-#include <sysapappui.h>
+#include <SysApAppUi.h>
 #include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
 #include <startupdomaincrkeys.h>

--- a/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -27,7 +27,7 @@
 #include "SysApShutdownImage.h"
 #include "SysAp.hrh"
 #include <data_caging_path_literals.hrh>
-#include <HbDeviceMessageBoxSymbian.h>
+#include <hbdevicemessageboxsymbian.h>
 #include <SVGEngineInterfaceImpl.h>
 
 //_LIT(KDC_APP_BITMAP_DIR,"\\resource\\apps\\");

--- a/coreapplicationuis/SysAp/Src/Usb/SysApUsbIndicatorImpl.h	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/Usb/SysApUsbIndicatorImpl.h	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2003-2010 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"
@@ -90,7 +90,9 @@
     RUsb                 iUsbMan;
     TUsbDeviceState      iDeviceState;     // current state of USB
     TBool                iIndicatorOn;  // current state of indicator
-    
+#ifdef FCC_UNIT_TEST
+    friend class Cutsysapgeneraltest;
+#endif 
 };
 
 #endif // SYSAPUSBINDICATORIMPL_H

--- a/coreapplicationuis/SysAp/Src/hbdevicepowermenusymbian.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/hbdevicepowermenusymbian.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -74,6 +74,10 @@
     TBool       iVibrationEnable;       //Master Vibarate enabled/Disabled
     TBool       iOfflineEnable;         //Oflline Mode enabled or Disabled
     TBool       iCypherOff;             //Encryption/Decryption ON/OFF
+    
+#ifdef FCC_UNIT_TEST
+        friend class Cutsysapgeneraltest;
+#endif  
 };
 
 /**

--- a/coreapplicationuis/SysAp/Src/powersavemode/sysappsmcontroller.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/powersavemode/sysappsmcontroller.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -182,7 +182,7 @@
     {
     TRACES( RDebug::Print( _L("CSysApPsmController::BatteryLow: aBatteryIsLow=%d"), aBatteryIsLow ) );
 
-    if ( aBatteryIsLow )
+    if ( aBatteryIsLow && !iChargerConnected )
     	{
     	iForcedPartialPsm = ETrue; 	// when battery is low, at least partial PSM must be active
 		}

--- a/coreapplicationuis/advancedtspcontroller/data/keyevent.rul	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/data/keyevent.rul	Wed Oct 20 17:03:03 2010 +0300
@@ -70,6 +70,8 @@
             ruleForeground='01'
             ruleActiveAudio='00'
             ruleLastPlayedAudio='03'
+            ruleDefaultApp='02'
+            defaultApplicationPhone='100058B3'            
             />
             
             <Tsp

--- a/coreapplicationuis/kefmapper/src/kefmapimpl.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/kefmapper/src/kefmapimpl.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -24,7 +24,7 @@
 #include <barsread.h>
 #include <bautils.h>
 #include "kefresource.h"
-#include <AknKeyEventMap.rsg>
+#include <aknkeyeventmap.rsg>
 #include "keflogger.h"
 #include "kefprovider.h"

--- a/coreapplicationuis/powersaveutilities/bsutil/group/bld.inf	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/powersaveutilities/bsutil/group/bld.inf	Wed Oct 20 17:03:03 2010 +0300
@@ -23,6 +23,9 @@
 
 PRJ_EXPORTS
 
+../../conf/powersaveutilities.confml           MW_LAYER_CONFML(powersaveutilities.confml)
+../../conf/powersaveutilities_2000B5E3.crml    MW_LAYER_CRML(powersaveutilities_2000B5E3.crml)
+
 ../inc/bsutil.h          |../../../inc/bsutil.h
 ../rom/powersaveutilities.iby   CORE_MW_LAYER_IBY_EXPORT_PATH(powersaveutilities.iby)

--- a/coreapplicationuis/powersaveutilities/bsutil/src/bsutil.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/powersaveutilities/bsutil/src/bsutil.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 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"
@@ -106,7 +106,7 @@
         
         const TUint8 defaultLevels[KBatteryLevelCount] =
             {
-            0, 10, 20, 30, 40, 50, 70, 100
+            0, 10, 20, 35, 50, 65, 80, 100
             };
         
         for( TInt i = 0; i < KBatteryLevelCount; i++ )

Binary file coreapplicationuis/powersaveutilities/conf/powersaveutilities.confml has changed

Binary file coreapplicationuis/powersaveutilities/conf/powersaveutilities_2000B5E3.crml has changed

--- a/coreapplicationuis/powersaveutilities/psmindicatorplugin/src/psmindicator.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/coreapplicationuis/powersaveutilities/psmindicatorplugin/src/psmindicator.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -238,4 +238,4 @@
         delete mRequest;
         mRequest = NULL;
     }
-}
\ No newline at end of file
+}

Binary file filehandling/fileconverterfw/TSRC/W7ALLCHR.DOC.1 has changed

--- a/filehandling/fileconverterfw/group/ConarcTest.iby	Tue Oct 12 17:17:12 2010 +0300
+++ b/filehandling/fileconverterfw/group/ConarcTest.iby	Wed Oct 20 17:03:03 2010 +0300
@@ -25,7 +25,7 @@
 REM Test code for the Conarc component
 
 define CONARCTESTPATH Resource\test\conarc
-data=ZRESOURCE\test\conarc\w7allchr.doc				CONARCTESTPATH\w7allchr.doc
+data=ZRESOURCE\test\conarc\w7allchr.doc.1				CONARCTESTPATH\w7allchr.doc
 data=ZRESOURCE\test\conarc\w7allchr.doc.b64			CONARCTESTPATH\w7allchr.doc.b64
 data=ZRESOURCE\test\conarc\w7allchr.doc.qp			CONARCTESTPATH\w7allchr.doc.qp
 data=ZRESOURCE\test\conarc\w7allchrwosplchr.doc.qp		CONARCTESTPATH\w7allchrwosplchr.doc.qp

--- a/filehandling/fileconverterfw/group/bld.inf	Tue Oct 12 17:17:12 2010 +0300
+++ b/filehandling/fileconverterfw/group/bld.inf	Wed Oct 20 17:03:03 2010 +0300
@@ -80,7 +80,7 @@
 ../TSRC/w7allchr.doc.qp		/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc.qp
 ../TSRC/w7allchrwosplchr.doc.qp	/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchrwosplchr.doc.qp
  
-../TSRC/W7ALLCHR.DOC 		/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc
+../TSRC/W7ALLCHR.DOC.1 		/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc
 ../TSRC/RELEASE.TXT 		/epoc32/release/winscw/udeb/z/resource/test/conarc/release.txt
 ../TSRC/release.txt.etext	/epoc32/release/winscw/udeb/z/resource/test/conarc/release.txt.etext
  
@@ -88,7 +88,7 @@
 ../TSRC/w7allchr.doc.b64	/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc.b64
 ../TSRC/w7allchr.doc.qp		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc.qp
 ../TSRC/w7allchrwosplchr.doc.qp		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchrwosplchr.doc.qp
-../TSRC/W7ALLCHR.DOC 		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc
+../TSRC/W7ALLCHR.DOC.1 		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc
 ../TSRC/RELEASE.TXT 		/epoc32/release/winscw/urel/z/resource/test/conarc/release.txt
 ../TSRC/release.txt.etext	/epoc32/release/winscw/urel/z/resource/test/conarc/release.txt.etext
 
@@ -96,6 +96,6 @@
 ../TSRC/w7allchr.doc.b64	/epoc32/data/z/resource/test/conarc/w7allchr.doc.b64
 ../TSRC/w7allchr.doc.qp		/epoc32/data/z/resource/test/conarc/w7allchr.doc.qp
 ../TSRC/w7allchrwosplchr.doc.qp		/epoc32/data/z/resource/test/conarc/w7allchrwosplchr.doc.qp
-../TSRC/W7ALLCHR.DOC 		/epoc32/data/z/resource/test/conarc/w7allchr.doc
+../TSRC/W7ALLCHR.DOC.1 		/epoc32/data/z/resource/test/conarc/w7allchr.doc
 ../TSRC/RELEASE.TXT 		/epoc32/data/z/resource/test/conarc/release.txt
 ../TSRC/release.txt.etext	/epoc32/data/z/resource/test/conarc/release.txt.etext

--- a/filehandling/htmltorichtextconverter/test/group/bld.inf	Tue Oct 12 17:17:12 2010 +0300
+++ b/filehandling/htmltorichtextconverter/test/group/bld.inf	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -132,3 +132,60 @@
 ../../tdata/testHtml/outlook06.txt		/epoc32/winscw/c/testhtml/outlook06.txt
 ../../tdata/testHtml/outlook07.txt		/epoc32/winscw/c/testhtml/outlook07.txt
 ../../tdata/testHtml/test1.txt		/epoc32/winscw/c/testhtml/test1.txt
+
+// export the test files for armv5 in platsim
+../../tdata/profiling/test001.txt		/epoc32/data/Z/profiling/test001.txt
+../../tdata/profiling/test002.txt		/epoc32/data/Z/profiling/test002.txt
+../../tdata/profiling/test003.txt		/epoc32/data/Z/profiling/test003.txt
+../../tdata/profiling/test004.txt		/epoc32/data/Z/profiling/test004.txt
+../../tdata/profiling/test005.txt		/epoc32/data/Z/profiling/test005.txt
+../../tdata/profiling/test006.txt		/epoc32/data/Z/profiling/test006.txt
+../../tdata/profiling/test007.txt		/epoc32/data/Z/profiling/test007.txt
+../../tdata/profiling/test008.txt		/epoc32/data/Z/profiling/test008.txt
+../../tdata/profiling/test009.txt		/epoc32/data/Z/profiling/test009.txt
+../../tdata/profiling/test010.txt		/epoc32/data/Z/profiling/test010.txt
+../../tdata/profiling/test011.txt		/epoc32/data/Z/profiling/test011.txt
+../../tdata/profiling/test012.txt		/epoc32/data/Z/profiling/test012.txt
+../../tdata/profiling/test013.txt		/epoc32/data/Z/profiling/test013.txt
+../../tdata/profiling/test014.txt		/epoc32/data/Z/profiling/test014.txt
+../../tdata/profiling/test015.txt		/epoc32/data/Z/profiling/test015.txt
+../../tdata/profiling/test016.txt		/epoc32/data/Z/profiling/test016.txt
+../../tdata/profiling/test017.txt		/epoc32/data/Z/profiling/test017.txt
+../../tdata/profiling/test018.txt		/epoc32/data/Z/profiling/test018.txt
+../../tdata/profiling/test019.txt		/epoc32/data/Z/profiling/test019.txt
+../../tdata/profiling/test020.txt		/epoc32/data/Z/profiling/test020.txt
+../../tdata/profiling/test030.txt		/epoc32/data/Z/profiling/test030.txt
+../../tdata/profiling/test040.txt		/epoc32/data/Z/profiling/test040.txt
+../../tdata/profiling/test050.txt		/epoc32/data/Z/profiling/test050.txt
+../../tdata/profiling/test060.txt		/epoc32/data/Z/profiling/test060.txt
+../../tdata/profiling/test070.txt		/epoc32/data/Z/profiling/test070.txt
+../../tdata/profiling/test080.txt		/epoc32/data/Z/profiling/test080.txt
+../../tdata/profiling/test090.txt		/epoc32/data/Z/profiling/test090.txt
+../../tdata/profiling/test100.txt		/epoc32/data/Z/profiling/test100.txt
+../../tdata/profiling/test110.txt		/epoc32/data/Z/profiling/test110.txt
+../../tdata/profiling/test120.txt		/epoc32/data/Z/profiling/test120.txt
+../../tdata/profiling/test130.txt		/epoc32/data/Z/profiling/test130.txt
+../../tdata/profiling/test140.txt		/epoc32/data/Z/profiling/test140.txt
+../../tdata/profiling/test150.txt		/epoc32/data/Z/profiling/test150.txt
+../../tdata/profiling/test160.txt		/epoc32/data/Z/profiling/test160.txt
+../../tdata/profiling/test170.txt		/epoc32/data/Z/profiling/test170.txt
+../../tdata/profiling/test180.txt		/epoc32/data/Z/profiling/test180.txt
+../../tdata/profiling/test190.txt		/epoc32/data/Z/profiling/test190.txt
+../../tdata/profiling/test200.txt		/epoc32/data/Z/profiling/test200.txt
+
+../../tdata/testHtml/eudora01.txt		/epoc32/data/Z/testhtml/eudora01.txt
+../../tdata/testHtml/LoadConverterTest.txt	/epoc32/data/Z/testhtml/loadconvertertest.txt
+../../tdata/testHtml/malformed01.txt	/epoc32/data/Z/testhtml/malformed01.txt
+../../tdata/testHtml/malformed02.txt	/epoc32/data/Z/testhtml/malformed02.txt
+../../tdata/testHtml/malformed03.txt	/epoc32/data/Z/testhtml/malformed03.txt
+../../tdata/testHtml/other01.txt		/epoc32/data/Z/testhtml/other01.txt
+../../tdata/testHtml/outlook01.txt		/epoc32/data/Z/testhtml/outlook01.txt
+../../tdata/testHtml/outlook02.txt		/epoc32/data/Z/testhtml/outlook02.txt
+../../tdata/testHtml/outlook03.txt		/epoc32/data/Z/testhtml/outlook03.txt
+../../tdata/testHtml/outlook04.txt		/epoc32/data/Z/testhtml/outlook04.txt
+../../tdata/testHtml/outlook05.txt		/epoc32/data/Z/testhtml/outlook05.txt
+../../tdata/testHtml/outlook06.txt		/epoc32/data/Z/testhtml/outlook06.txt
+../../tdata/testHtml/outlook07.txt		/epoc32/data/Z/testhtml/outlook07.txt
+../../tdata/testHtml/test1.txt			/epoc32/data/Z/testhtml/test1.txt
+
+

--- a/filehandling/htmltorichtextconverter/test/group/chtmltocrtconvertertest.iby	Tue Oct 12 17:17:12 2010 +0300
+++ b/filehandling/htmltorichtextconverter/test/group/chtmltocrtconvertertest.iby	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
@@ -79,4 +79,63 @@
 data=\epoc32\wins\c\testHtml\outlook07.txt				testHtml\outlook07.txt
 data=\epoc32\wins\c\testHtml\test1.txt					testHtml\test1.txt
 
+// export the test files for armv5 in platsim
+ECOM_PLUGIN(CHtmlToCrtConverter.DLL, 10203591.RSC)
+data=EPOCROOT##epoc32\data\z\resource\convert\1000a90e.RSC		Resource\Convert\1000a90e.RSC
+data=EPOCROOT##epoc32\data\z\resource\convert\CHTMLTOCRTCONVERTER.RSC	Resource\Convert\CHTMLTOCRTCONVERTER.RSC
+						
+data=EPOCROOT##epoc32\data\Z\profiling\test001.txt				profiling\test001.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test002.txt				profiling\test002.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test003.txt				profiling\test003.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test004.txt				profiling\test004.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test005.txt				profiling\test005.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test006.txt				profiling\test006.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test007.txt				profiling\test007.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test008.txt				profiling\test008.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test009.txt				profiling\test009.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test010.txt				profiling\test010.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test011.txt				profiling\test011.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test012.txt				profiling\test012.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test013.txt				profiling\test013.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test014.txt				profiling\test014.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test015.txt				profiling\test015.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test016.txt				profiling\test016.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test017.txt				profiling\test017.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test018.txt				profiling\test018.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test019.txt				profiling\test019.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test020.txt				profiling\test020.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test030.txt				profiling\test030.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test040.txt				profiling\test040.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test050.txt				profiling\test050.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test060.txt				profiling\test060.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test070.txt				profiling\test070.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test080.txt				profiling\test080.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test090.txt				profiling\test090.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test100.txt				profiling\test100.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test110.txt				profiling\test110.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test120.txt				profiling\test120.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test130.txt				profiling\test130.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test140.txt				profiling\test140.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test150.txt				profiling\test150.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test160.txt				profiling\test160.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test170.txt				profiling\test170.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test180.txt				profiling\test180.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test190.txt				profiling\test190.txt
+data=EPOCROOT##epoc32\data\Z\profiling\test200.txt				profiling\test200.txt
+
+data=EPOCROOT##epoc32\data\Z\testHtml\eudora01.txt				testHtml\eudora01.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\LoadConverterTest.txt			testHtml\LoadConverterTest.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\malformed01.txt				testHtml\malformed01.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\malformed02.txt				testHtml\malformed02.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\malformed03.txt				testHtml\malformed03.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\other01.txt				testHtml\other01.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\outlook01.txt				testHtml\outlook01.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\outlook02.txt				testHtml\outlook02.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\outlook03.txt				testHtml\outlook03.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\outlook04.txt				testHtml\outlook04.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\outlook05.txt				testHtml\outlook05.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\outlook06.txt				testHtml\outlook06.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\outlook07.txt				testHtml\outlook07.txt
+data=EPOCROOT##epoc32\data\Z\testHtml\test1.txt					testHtml\test1.txt
+
 #endif

--- a/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp	Tue Oct 12 17:17:12 2010 +0300
+++ b/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp	Wed Oct 20 17:03:03 2010 +0300
@@ -46,5 +46,6 @@
 LIBRARY         featmgr.lib
 LIBRARY         mediatorclient.lib
 LIBRARY         sanimengine.lib
+LIBRARY         ProfileEng.lib
 
 SMPSAFE

--- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -26,6 +26,9 @@
 #include <ProfileEngineSDKCRKeys.h>
 #include "sanimengine.h"
 #include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <MProfileEngineExtended2.h>
+
+
 
 #include "sanimstartupctrl.h"
 #include "trace.h"
@@ -440,9 +443,12 @@
 
     if ( volume > 0 )
         {
-        TBool isSilent = ETrue;
-        TRAPD_ERR( errorCode, isSilent = IsSilentL() );
-        ERROR( errorCode, "Failed to silent info" );
+		// Replacement of silent profile => Silence Mode
+		MProfileEngineExtended2 *profileEngine = ::CreateProfileEngineExtended2L();
+		//CleanupReleasePushL(profileEngine);
+		// 0: On 1: Off
+		TBool isSilent = profileEngine->SilenceModeL();
+		profileEngine->Release();
         if ( isSilent )
             {
             volume = 0;

--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdisknotifyobserver.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdisknotifyobserver.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -183,6 +183,7 @@
         case EDiskRemoved:
             TRACES("COutOfDiskNotifyObserver::HandleNotifyDisk: EDiskRemoved");
             iDiskNotifyHandler->CancelNotifyDiskSpace(aEvent.iDrive);
+            iOutOfDiskMonitor->SaveDriveStatus(aEvent.iDrive, DISK_SPACE_OK, ETrue);
             break;
         case EDiskStatusChanged:
             TRACES("COutOfDiskNotifyObserver::HandleNotifyDisk: EDiskStatusChanged");

--- a/sysresmonitoring/oommonitor/inc/oomconfig.inl	Tue Oct 12 17:17:12 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomconfig.inl	Wed Oct 20 17:03:03 2010 +0300
@@ -36,7 +36,9 @@
 
 void COomConfig::SetSwapUsageMonitored(TBool aMonitored)
     {
+#ifndef __WINSCW__
     iGlobalConfig.iSwapUsageMonitored = aMonitored;
+#endif    
     }
 
 void COomConfig::SetDefaultLowSwapThreshold(TInt aLowSwapThreshold)

--- a/sysresmonitoring/oommonitor/src/oommemorymonitor.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitor.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -214,7 +214,7 @@
     User::CompressAllHeaps();
     TInt currentFreeRam = 0;
     HAL::Get( HALData::EMemoryRAMFree, currentFreeRam );
-	TInt currentFreeSwap = 0;
+	TUint64 currentFreeSwap = 0;
 	if (iConfig->GlobalConfig().iSwapUsageMonitored)
 		{
         SVMSwapInfo swapInfo;

--- a/systemsettings/accindicatorplugin/accindicatorsettings/accindicatorsettings.pro	Tue Oct 12 17:17:12 2010 +0300
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/accindicatorsettings.pro	Wed Oct 20 17:03:03 2010 +0300
@@ -21,7 +21,7 @@
 symbian { 
 TARGET.UID3 = 0x2002EA56
 SYMBIAN_PLATFORMS = WINSCW ARMV5
-
+TARGET.CAPABILITY = ReadDeviceData WriteDeviceData ReadUserData
 incBlock = \
      "$${LITERAL_HASH}if ( defined (__WINS__) || defined (WINSCW) )" \
      "LIBRARY gsserverenginestub.lib " \

--- a/systemsettings/accindicatorplugin/accindicatorsettings/resources/headset.docml	Tue Oct 12 17:17:12 2010 +0300
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/headset.docml	Wed Oct 20 17:03:03 2010 +0300
@@ -1,66 +1,62 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<hbdocument version="0.4">
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.0">
     <widget name="view" type="HbView">
         <widget name="content_1" role="HbView:widget" type="HbWidget">
             <widget name="container" type="HbWidget">
                 <widget name="container_1" type="HbWidget">
                     <widget name="image" type="HbLabel">
                         <icon iconName=":/images/flower2.png" name="icon"/>
-                        <sizehint height="5.223880745727788un" type="PREFERRED" width="7.014925572834458un"/>
+                        <sizehint height="5.22388un" type="PREFERRED" width="7.01493un"/>
                     </widget>
                     <widget name="label" type="HbLabel">
-                        <sizehint height="4.4776120677666755un" type="PREFERRED" width="14.925373559222251un"/>
-                        <string name="text" value="Headset"/>
-                        <zvalue value="1.0"/>
+                        <real name="z" value="1"/>
+                        <sizehint height="4.47761un" type="PREFERRED" width="14.92537un"/>
+                        <string name="plainText" value="Headset"/>
                     </widget>
+                    <real name="z" value="0"/>
                     <sizehint height="23.8806un" type="PREFERRED" width="23.8806un"/>
-                    <zvalue value="0.0"/>
-                    <layout type="anchor" widget="container_1">
-                        <anchoritem dst="image" dstEdge="LEFT" spacing="0.7462713220388874un" src="" srcEdge="LEFT"/>
-                        <anchoritem dst="image" dstEdge="BOTTOM" spacing="-6.368150860990008un" src="" srcEdge="BOTTOM"/>
-                        <anchoritem dst="label" dstEdge="LEFT" spacing="9.701492813494463un" src="" srcEdge="LEFT"/>
-                        <anchoritem dst="label" dstEdge="TOP" spacing="3.283582183028895un" src="" srcEdge="TOP"/>
+                    <layout type="anchor">
+                        <anchoritem dst="image" dstEdge="LEFT" spacing="0.74627un" src="" srcEdge="LEFT"/>
+                        <anchoritem dst="image" dstEdge="BOTTOM" spacing="-6.36815un" src="" srcEdge="BOTTOM"/>
+                        <anchoritem dst="label" dstEdge="LEFT" spacing="9.70149un" src="" srcEdge="LEFT"/>
+                        <anchoritem dst="label" dstEdge="TOP" spacing="3.28358un" src="" srcEdge="TOP"/>
                     </layout>
                 </widget>
                 <widget name="container_2" type="HbWidget">
                     <widget name="label_2" type="HbLabel">
-                        <sizehint height="4.4776120677666755un" type="PREFERRED" width="14.925373559222251un"/>
-                        <string name="text" value="Accesory type"/>
-                        <zvalue value="1.0"/>
-                    </widget>
-                    <widget name="label_3" type="HbLabel">
-                        <sizehint height="4.4776120677666755un" type="PREFERRED" width="14.925373559222251un"/>
-                        <zvalue value="2.0"/>
+                        <real name="z" value="1"/>
+                        <sizehint height="4.47761un" type="PREFERRED" width="20.29851un"/>
+                        <string name="plainText" value="Accesory type"/>
                     </widget>
                     <widget name="combobox" type="HbComboBox">
-                        <sizehint height="4.4776120677666755un" type="PREFERRED" width="27.1641798777845un"/>
-                        <zvalue value="3.0"/>
+                        <real name="z" value="3"/>
+                        <sizehint height="4.47761un" type="PREFERRED" width="27.16418un"/>
                     </widget>
+                    <real name="z" value="0"/>
                     <sizehint height="23.8806un" type="PREFERRED" width="23.8806un"/>
-                    <zvalue value="0.0"/>
-                    <layout type="anchor" widget="container_2">
-                        <anchoritem dst="label_2" dstEdge="LEFT" spacing="1.3432836203300027un" src="" srcEdge="LEFT"/>
-                        <anchoritem dst="label_2" dstEdge="TOP" spacing="-0.44776120677666753un" src="" srcEdge="TOP"/>
-                        <anchoritem dst="label_3" dstEdge="LEFT" spacing="1.19402988473778un" src="" srcEdge="LEFT"/>
-                        <anchoritem dst="label_3" dstEdge="BOTTOM" spacing="-0.6467661875662969un" src="" srcEdge="BOTTOM"/>
-                        <anchoritem dst="combobox" dstEdge="RIGHT" spacing="-21.194030454095596un" src="" srcEdge="RIGHT"/>
-                        <anchoritem dst="combobox" dstEdge="BOTTOM" spacing="-5.373134481320008un" src="" srcEdge="BOTTOM"/>
+                    <layout type="anchor">
+                        <anchoritem dst="label_2" dstEdge="LEFT" spacing="1.49254un" src="" srcEdge="LEFT"/>
+                        <anchoritem dst="label_2" dstEdge="TOP" spacing="0.89552un" src="" srcEdge="TOP"/>
+                        <anchoritem dst="combobox" dstEdge="RIGHT" spacing="-21.19403un" src="" srcEdge="RIGHT"/>
+                        <anchoritem dst="combobox" dstEdge="BOTTOM" spacing="-3.8806un" src="" srcEdge="BOTTOM"/>
                     </layout>
                 </widget>
-                <sizehint height="32.68656809469673un" type="PREFERRED" width="52.23880745727788un"/>
-                <zvalue value="0.0"/>
+                <real name="z" value="0"/>
+                <sizehint height="34.77612un" type="PREFERRED" width="52.23881un"/>
                 <layout orientation="Vertical" type="linear">
                     <linearitem itemname="container_1"/>
                     <linearitem itemname="container_2"/>
                 </layout>
             </widget>
-            <zvalue value="0.0"/>
-            <layout type="anchor" widget="content_1">
+            <real name="z" value="0"/>
+            <layout type="anchor">
                 <anchoritem dst="container" dstEdge="LEFT" spacing="0.59701un" src="" srcEdge="LEFT"/>
-                <anchoritem dst="container" dstEdge="TOP" spacing="0.0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="container" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
             </layout>
         </widget>
         <string name="title" value="Accessory"/>
     </widget>
-    <metadata display="QHD portrait" unit="un"/>
+    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
 </hbdocument>

--- a/tzservices/tzdatabase/data/timezone_upgrade.pkg	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzdatabase/data/timezone_upgrade.pkg	Wed Oct 20 17:03:03 2010 +0300
@@ -27,7 +27,7 @@
 
 ; Local files and the target location to be updated (eclipsed).
 "tzdb.dbz"-"$:\private\1020383E\tzdb.dbz"
-"tz.r01 "-"$:\resource\timezonelocalization\timezones.r01"
+"tz.r01"-"$:\resource\timezonelocalization\timezones.r01"
 "tzg.r01"-"$:\resource\timezonelocalization\timezonegroups.r01"
-"tz.r02 "-"$:\resource\timezonelocalization\timezones.r02"
+"tz.r02"-"$:\resource\timezonelocalization\timezones.r02"
 "tzg.r02"-"$:\resource\timezonelocalization\timezonegroups.r02"

--- a/tzservices/tzloc/group/TimeZoneLocalization.mmp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzloc/group/TimeZoneLocalization.mmp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 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"
@@ -26,6 +26,7 @@
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 USERINCLUDE 	../inc
+USERINCLUDE 	../traces
 SOURCEPATH	../src
 SOURCE		TimeZoneLocalization.cpp
 SOURCE		TzLocalizer.cpp

--- a/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -15,6 +15,11 @@
 
 #include "TzLocalizationDbAccessor.h"
 #include "TzLocalizationDataTypes.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TzLocalizationDbAccessorTraces.h"
+#endif
+
 
 //==================================================================
 // Database location and access policy
@@ -91,6 +96,8 @@
 
 void CTzLocalizationDbAccessor::OpenDbL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDBACCESSOR_OPENDBL_ENTRY, "CTzLocalizationDbAccessor::OpenDbL Entry" );
+    
 	if (iZoneMutex.OpenGlobal(KTzMutexName) != KErrNone)
 		{
 		User::LeaveIfError(iZoneMutex.CreateGlobal(KTzMutexName)) ;
@@ -115,6 +122,8 @@
  			User::LeaveIfError(CreateUserCityTableL()); 
  			} 
   		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDBACCESSOR_OPENDBL_EXIT, "CTzLocalizationDbAccessor::OpenDbL Exit" );
+	
 	}
 
 	
@@ -180,6 +189,7 @@
 */
 TInt CTzLocalizationDbAccessor::CreateFrequentlyUsedZoneTableL()
 	{
+    
 	// Create the columns for the cached zones table
 	RArray<TDbCol> cachedTableCols;
 	CleanupClosePushL(cachedTableCols);
@@ -248,6 +258,7 @@
 */
 TInt CTzLocalizationDbAccessor::CreateUserCityTableL()
 	{
+    
 	//Create the columns for the user aded cities table
 	RArray<TDbCol> cityTableCols;
 	CleanupClosePushL(cityTableCols);

--- a/tzservices/tzloc/src/TzLocalizationResourceReader.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzloc/src/TzLocalizationResourceReader.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -17,7 +17,12 @@
 #include "TzLocalizationDataTypes.h"		//CTzLocalizedCity etc
 #include "TzLocalizer.h"					//TTzLocalizerPanics
 
-#include <bautils.h>						//BaflUtils::NearestLanguageFile
+#include <bautils.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TzLocalizationResourceReaderTraces.h"
+#endif
+						//BaflUtils::NearestLanguageFile
 
 // Resource File locations
 _LIT(KTzLocalizationTimeZoneResourceFileName,"\\Resource\\TimeZoneLocalization\\timezones.rSC");
@@ -58,6 +63,8 @@
 */
 void CTzLocalizationResourceReader::ConstructL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_CONSTRUCTL_ENTRY, "CTzLocalizationResourceReader::ConstructL Entry" );
+    
 	User::LeaveIfError(iFs.Connect());
 
 	// Assign Panic category, in case it's needed
@@ -115,6 +122,8 @@
 	TRAPD(timeZoneResErr,iTimeZoneResourceFile.OpenL(iFs,*timeZoneResourceFileName));
 	if(timeZoneResErr == KErrNotFound || timeZoneResErr == KErrPathNotFound)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FATAL, CTZLOCALIZATIONRESOURCEREADER_CONSTRUCTL, "CTzLocalizationResourceReader::ConstructL:Panic : ETzLocalizerPanicResourceFileNotFound" );
+	    
 		User::Panic(KTzLocalizationCategory,CTzLocalizer::ETzLocalizerPanicResourceFileNotFound);
 		}
 	User::LeaveIfError(timeZoneResErr);		
@@ -131,6 +140,8 @@
 		iGroupResourceFileExists = ETrue;
 		}
 	CleanupStack::PopAndDestroy(3, dirList); // groupResourceFileName, timeZoneResourceFileName, dirList
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_CONSTRUCTL_EXIT, "CTzLocalizationResourceReader::ConstructL Exit" );
+	
 	}
 
 /**
@@ -157,6 +168,8 @@
 */
 TInt CTzLocalizationResourceReader::FindTimeZoneResourceIdL(const TInt aTimeZoneId)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_ENTRY, "CTzLocalizationResourceReader::FindTimeZoneResourceIdL Entry;aTimeZoneId=%d", aTimeZoneId );
+    
 	TInt initialOffset = FirstTimeZoneResourceIdL();
 
 	TInt idToCheck;
@@ -178,13 +191,19 @@
 		if(idToCheck == aTimeZoneId)
 			{
 			// return the current resource ID
+		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_EXIT, "CTzLocalizationResourceReader::FindTimeZoneResourceIdL Exit" );
+		    
 			return initialOffset + i;
 			}
 		++i;
 		}
 
 	// If it's got to here the aId hasn't been found, so leave
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL, "CTzLocalizationResourceReader::FindTimeZoneResourceIdL:Error: Time zone id = %d not found" ,aTimeZoneId);
+	
 	User::Leave(KErrNotFound);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_EXIT2, "CTzLocalizationResourceReader::FindTimeZoneResourceIdL Exit;KErrNotFound=%d", KErrNotFound );
+	
 
 	return KErrNotFound;	// To satisfy compiler
 	}
@@ -206,6 +225,8 @@
 
 	if(!aResourceFile.OwnsResourceIdL(resourceIdToReturn))
 		{
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONRESOURCEREADER_LOCALIZEDRESOURCEIDL, "CTzLocalizationResourceReader::LocalizedResourceIdL:Error : Resource id = %d not found",resourceIdToReturn );
+	    
 		User::Leave(KErrNotFound);
 		}
 
@@ -260,6 +281,8 @@
 	{
 	if(!aResourceFile.OwnsResourceIdL(aResourceId))
 		{
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONRESOURCEREADER_BUFFERRESOURCEL, "CTzLocalizationResourceReader::BufferResourceL:Error; resource id=%d not found", aResourceId );
+	    
 		User::Leave(KErrNotFound);
 		}
 
@@ -334,6 +357,8 @@
 */
 void CTzLocalizationResourceReader::ReadAllTimeZonesL(CTzLocalizedTimeZoneArray& aTimeZones)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_READALLTIMEZONESL_ENTRY, "CTzLocalizationResourceReader::ReadAllTimeZonesL Entry" );
+    
 	TInt initialOffset = FirstTimeZoneResourceIdL();
 
 	// Variables for us in loop
@@ -358,8 +383,12 @@
 	// If no owned resources were found - Leave
 	if(i == 0)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONRESOURCEREADER_READALLTIMEZONESL, "CTzLocalizationResourceReader::ReadAllTimeZonesL;Error : No owned resources found" );
+	    
 		User::Leave(KErrNotFound);
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_READALLTIMEZONESL_EXIT, "CTzLocalizationResourceReader::ReadAllTimeZonesL Exit" );
+	
 	}
 
 /**
@@ -516,6 +545,8 @@
 */
 void CTzLocalizationResourceReader::AddCityArrayFromResourceL(CTzLocalizedCityArray& aCities, const TInt aResourceId)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_ADDCITYARRAYFROMRESOURCEL_ENTRY, "CTzLocalizationResourceReader::AddCityArrayFromResourceL Entry;aResourceId=%d", aResourceId );
+    
 	// Eat up the localised time zone info from the resource
 	CTzLocalizedTimeZone* timeZone = CreateTimeZoneFromResourceL(aResourceId);
 
@@ -532,6 +563,8 @@
 	// Leave if no cities are found
 	if(numCities < 1)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONRESOURCEREADER_ADDCITYARRAYFROMRESOURCEL, "CTzLocalizationResourceReader::AddCityArrayFromResourceL:No cities found" );
+	    
 		User::Leave(KErrNotFound);
 		}
 
@@ -554,6 +587,8 @@
 		CleanupStack::Pop(city);
 		city = NULL;
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP1_CTZLOCALIZATIONRESOURCEREADER_ADDCITYARRAYFROMRESOURCEL_EXIT, "CTzLocalizationResourceReader::AddCityArrayFromResourceL Exit" );
+	
 	}
 
 /**
@@ -567,6 +602,8 @@
 */
 void CTzLocalizationResourceReader::ReadCitiesInGroupL(CTzLocalizedCityArray& aCities, const TUint8 aGroupId)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_READCITIESINGROUPL_ENTRY, "CTzLocalizationResourceReader::ReadCitiesInGroupL Entry" );
+    
 	if(iGroupResourceFileExists)
 	// Only do this if a groups resource file exists - otherwise no groups have been specified
 		{
@@ -613,6 +650,8 @@
 		CleanupStack::PopAndDestroy(citiesInTimeZone);
 		citiesInTimeZone = NULL;
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_READCITIESINGROUPL_EXIT, "CTzLocalizationResourceReader::ReadCitiesInGroupL Exit" );
+	
 	}
 
 /**
@@ -659,6 +698,8 @@
 	{
 	if(aGroupId < 1)
 		{
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONRESOURCEREADER_READGROUPL, "CTzLocalizationResourceReader::ReadGroupL:Error;Invalid groud id = %d",aGroupId );
+	    
 		User::Leave(KErrArgument);
 		}
 
@@ -680,6 +721,8 @@
 	// resource file exists or not, because this function already leaves
 	// with KErrNotFound if the specified Group ID is not found.
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, DUP1_CTZLOCALIZATIONRESOURCEREADER_READGROUPL, "CTzLocalizationResourceReader::ReadGroupL:Error;Group resource file not found" );
+	    
 		User::Leave(KErrNotFound);
 		}
 
@@ -780,6 +823,8 @@
 */
 CTzLocalizedTimeZone* CTzLocalizationResourceReader::ReadFrequentlyUsedZoneL(const CTzLocalizedTimeZone::TTzFrequentlyUsedZone aFrequentlyUsedZone)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_READFREQUENTLYUSEDZONEL_ENTRY, "CTzLocalizationResourceReader::ReadFrequentlyUsedZoneL Entry;aFrequentlyUsedZone=%u", aFrequentlyUsedZone );
+    
 	// You cannot pass ECachedTimeZones in as the argument, because it is only
 	// used to keep count of how many cached zones there are.
 	__ASSERT_ALWAYS(aFrequentlyUsedZone != CTzLocalizedTimeZone::ECachedTimeZones, User::Leave(KErrArgument));
@@ -813,8 +858,12 @@
 		break;
 		case CTzLocalizedTimeZone::ECurrentZone:	// FALL THROUGH to default - current zone not supported
 		default:
+		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONRESOURCEREADER_READFREQUENTLYUSEDZONEL, "CTzLocalizationResourceReader::ReadFrequentlyUsedZoneL:Error:Invalid zone " );
+		    
 			User::Leave(KErrArgument);
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_READFREQUENTLYUSEDZONEL_EXIT, "CTzLocalizationResourceReader::ReadFrequentlyUsedZoneL Exit" );
+	
 
 	return cachedTimeZone;
 	}
@@ -828,6 +877,8 @@
 */
 CTzLocalizedCity* CTzLocalizationResourceReader::ReadCachedTimeZoneCityL(const CTzLocalizedTimeZone::TTzFrequentlyUsedZone aFrequentlyUsedZone)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_READCACHEDTIMEZONECITYL_ENTRY, "CTzLocalizationResourceReader::ReadCachedTimeZoneCityL Entry;aFrequentlyUsedZone=%u", aFrequentlyUsedZone );
+    
 	// You cannot pass ECachedTimeZones in as the argument, because it is only
 	// used to keep count of how many cached zones there are.
 	__ASSERT_ALWAYS(aFrequentlyUsedZone != CTzLocalizedTimeZone::ECachedTimeZones, User::Leave(KErrArgument));
@@ -861,8 +912,12 @@
 		break;
 		case CTzLocalizedTimeZone::ECurrentZone:	// FALL THROUGH to default - current zone not supported
 		default:
+		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONRESOURCEREADER_READCACHEDTIMEZONECITYL, "CTzLocalizationResourceReader::ReadCachedTimeZoneCityL:Invalid zone" );
+		    
 			User::Leave(KErrArgument);
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONRESOURCEREADER_READCACHEDTIMEZONECITYL_EXIT, "CTzLocalizationResourceReader::ReadCachedTimeZoneCityL Exit" );
+	
 
 	return cachedCity;
 	}

--- a/tzservices/tzloc/src/TzLocalizer.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzloc/src/TzLocalizer.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -24,6 +24,11 @@
 #include "tzlocalizationuserdatareader.h"
 #include <tzlocalizedtimezonerecord.h>
 #include <tzlocalizedcityrecord.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TzLocalizerTraces.h"
+#endif
+
 /**
 Allocates and constructs a new CTzLocalizer object.
 @return The newly created CTzLocalizer object.
@@ -63,6 +68,8 @@
 
 void CTzLocalizer::ConstructL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_CONSTRUCTL_ENTRY, "CTzLocalizer::ConstructL Entry" );
+    
 	User::LeaveIfError(iTzSession.Connect());
 
 	iStaticDataReader = CTzLocalizationResourceReader::NewL();
@@ -83,6 +90,8 @@
 		UpdateFrequentlyUsedZonesL();
 		}
 	SetDataSource(ETzDataSourceSystem);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_CONSTRUCTL_EXIT, "CTzLocalizer::ConstructL Exit" );
+	
 	}
 
 // Check if the DB needs upgrading
@@ -178,6 +187,8 @@
 */
 TBool CTzLocalizer::PrepareFrequentlyUsedZonesL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_PREPAREFREQUENTLYUSEDZONESL_ENTRY, "CTzLocalizer::PrepareFrequentlyUsedZonesL Entry" );
+    
 	CTzLocalizedTimeZoneArray* frequentlyUsedZones = CTzLocalizedTimeZoneArray::NewLC();
 	CTzLocalizedCityArray* cachedCities = CTzLocalizedCityArray::NewLC();
 	TBool frequentlyUsedZonesNeedUpdating = EFalse;
@@ -237,6 +248,8 @@
 
 	CleanupStack::PopAndDestroy(cachedCities);
 	CleanupStack::PopAndDestroy(frequentlyUsedZones);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_PREPAREFREQUENTLYUSEDZONESL_EXIT, "CTzLocalizer::PrepareFrequentlyUsedZonesL Exit;frequentlyUsedZonesNeedUpdating=%u", frequentlyUsedZonesNeedUpdating );
+	
 
 	return frequentlyUsedZonesNeedUpdating;
 	}
@@ -247,6 +260,8 @@
 */
 void CTzLocalizer::UpdateFrequentlyUsedZonesL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_UPDATEFREQUENTLYUSEDZONESL_ENTRY, "CTzLocalizer::UpdateFrequentlyUsedZonesL Entry" );
+    
 	CTzLocalizedTimeZoneArray* frequentlyUsedZones = CTzLocalizedTimeZoneArray::NewLC();
 	CTzLocalizedCityArray* cachedCities = CTzLocalizedCityArray::NewLC();
 
@@ -320,6 +335,8 @@
 	WriteAllFrequentlyUsedZonesL(*frequentlyUsedZones,*cachedCities);
 	CleanupStack::PopAndDestroy(cachedCities);
 	CleanupStack::PopAndDestroy(frequentlyUsedZones);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_UPDATEFREQUENTLYUSEDZONESL_EXIT, "CTzLocalizer::UpdateFrequentlyUsedZonesL Exit" );
+	
 	}
 
 /**
@@ -335,6 +352,8 @@
 */
 CTzLocalizedTimeZone* CTzLocalizer::GetFrequentlyUsedDefaultZoneL(CTzLocalizedTimeZone::TTzFrequentlyUsedZone aFreqUsedZone)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETFREQUENTLYUSEDDEFAULTZONEL_ENTRY, "CTzLocalizer::GetFrequentlyUsedDefaultZoneL Entry;aFreqUsedZone=%u", aFreqUsedZone );
+    
 	// Assume that we will not find the key in the repository or that we do find
 	// the key but it has no value.  If either of these scenarios is true then
 	// we will use the time zone identifier recorded in the resource file for
@@ -369,6 +388,7 @@
 		{
 		defaultTimeZone = iStaticDataReader->ReadFrequentlyUsedZoneL(aFreqUsedZone);
 		}
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETFREQUENTLYUSEDDEFAULTZONEL_EXIT, "CTzLocalizer::GetFrequentlyUsedDefaultZoneL Exit" );
 
 	return defaultTimeZone;
 	}
@@ -465,6 +485,8 @@
 */
 EXPORT_C CTzLocalizedTimeZoneArray* CTzLocalizer::GetAllTimeZonesL(const TTzSortOrder aSortOrder)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETALLTIMEZONESL_ENTRY, "CTzLocalizer::GetAllTimeZonesL Entry;aSortOrder=%u", aSortOrder );
+    
 	CTzLocalizedTimeZoneArray* allTimeZones = CTzLocalizedTimeZoneArray::NewLC();
 	if(iDataSource&ETzDataSourceSystem)
 		{
@@ -488,6 +510,8 @@
 		}
 
 	CleanupStack::Pop(allTimeZones);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETALLTIMEZONESL_EXIT, "CTzLocalizer::GetAllTimeZonesL Exit" );
+	
 
 	return allTimeZones;
 	}
@@ -545,6 +569,8 @@
 */
 EXPORT_C CTzLocalizedCityArray* CTzLocalizer::GetCitiesL(const TTzSortOrder aSortOrder)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESL_ENTRY, "CTzLocalizer::GetCitiesL Entry;aSortOrder=%u", aSortOrder );
+    
 	//Create an empty city array and retrieve all cities
 	CTzLocalizedCityArray* cities = CTzLocalizedCityArray::NewLC();
 	if(iDataSource&ETzDataSourceSystem)
@@ -574,6 +600,8 @@
 		}
 
 	CleanupStack::Pop(cities);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESL_EXIT, "CTzLocalizer::GetCitiesL Exit" );
+	
 	return cities;
 	}
 
@@ -591,6 +619,8 @@
 */
 EXPORT_C CTzLocalizedCityArray* CTzLocalizer::GetCitiesL(TInt aTimeZoneId, const TTzSortOrder aSortOrder)
 	{
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESL_ENTRY_OVERLOADED, "CTzLocalizer::GetCitiesL Entry;aTimeZoneId=%d;aSortOrder=%u", aTimeZoneId, aSortOrder );
+    
 	CTzLocalizedCityArray* cities = CTzLocalizedCityArray::NewLC();
 	ReadCitiesL(*cities, aTimeZoneId, ETrue);
 
@@ -613,6 +643,8 @@
 		}
 
 	CleanupStack::Pop(cities);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESL_EXIT2, "CTzLocalizer::GetCitiesL Exit" );
+	
 
 	return cities;
 	}
@@ -662,6 +694,8 @@
 void CTzLocalizer::GetCitiesL(CTzLocalizedCityArray& aCities, const TTzLocalizedId& aLocalizedId,
 		TBool aUseDataSource, const TTzSortOrder aSortOrder)
 	{
+    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESL_ENTRY_OVERLOADED2, "CTzLocalizer::GetCitiesL Entry;aUseDataSource=%u;aSortOrder=%u", aUseDataSource, aSortOrder );
+    
 	ReadCitiesL(aCities, aLocalizedId.TimeZoneId(), aUseDataSource);
 
 	RPointerArray<CTzLocalizedCityRecord> cityRecords;
@@ -681,6 +715,8 @@
 		{
 		User::Leave(KErrArgument);
 		}
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESL_EXIT3, "CTzLocalizer::GetCitiesL Exit" );
+	
 	}
 
 /**
@@ -697,6 +733,8 @@
 */
 EXPORT_C CTzLocalizedCity* CTzLocalizer::AddCityL(TInt aTimeZoneId,const TDesC& aCityName, TInt aGroupId)
 	{
+    OstTraceDefExt3( OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_ADDCITYL_ENTRY, "CTzLocalizer::AddCityL Entry;aTimeZoneId=%d;aCityName=%S;aGroupId=%d", aTimeZoneId, aCityName, aGroupId );
+    
 	//Check that aGroupId is a valid TUint8 and leave if not.
 	//Group number > 255 is not supported
 	__ASSERT_ALWAYS(aGroupId >= 0 && aGroupId <256 , User::Leave(KErrArgument));
@@ -736,6 +774,8 @@
 	iTzSession.LocalizationWriteCityL(newCity->Name(), (TInt)newCity->TimeZoneId(), newCity->GroupId(),
 			newCity->TzLocalizedId().ResourceId());
 	CleanupStack::Pop(newCity);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZER_ADDCITYL_EXIT, "CTzLocalizer::AddCityL Exit" );
+	
 	return newCity;
 	}
 
@@ -754,6 +794,8 @@
 		}
 	else
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZER_REMOVECITYL, "CTzLocalizer::RemoveCityL:Error:Invalid city" );
+	    
 		User::Leave(KErrArgument);
 		}
 	}
@@ -830,6 +872,8 @@
 */
 EXPORT_C CTzLocalizedCityArray* CTzLocalizer::GetCitiesInGroupL(TInt aGroupId,const TTzSortOrder aSortOrder)
 	{
+    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESINGROUPL_ENTRY, "CTzLocalizer::GetCitiesInGroupL Entry;aGroupId=%d;aSortOrder=%u", aGroupId, aSortOrder );
+    
 	//Check that aGroupId is a valid TUint8 and leave if not.
 	//Group number > 255 is not supported
 	__ASSERT_ALWAYS(aGroupId >= 0 && aGroupId <256 , User::Leave(KErrArgument));
@@ -862,6 +906,8 @@
 		cities->Sort(sortOrder);
 		}
 	CleanupStack::Pop(cities);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESINGROUPL_EXIT, "CTzLocalizer::GetCitiesInGroupL Exit" );
+	
 	return cities;
 	}
 
@@ -907,6 +953,8 @@
 */
 EXPORT_C CTzLocalizedTimeZone* CTzLocalizer::GetFrequentlyUsedZoneL(const CTzLocalizedTimeZone::TTzFrequentlyUsedZone aFrequentlyUsedZone)
 	{
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZER_GETFREQUENTLYUSEDZONEL_ENTRY, "CTzLocalizer::GetFrequentlyUsedZoneL Entry;aFrequentlyUsedZone=%u", aFrequentlyUsedZone );
+    
 	CTzLocalizedTimeZone* timeZone;
 
 	if (aFrequentlyUsedZone == CTzLocalizedTimeZone::ECurrentZone)
@@ -951,6 +999,7 @@
 		timeZone = CreateTimeZoneL(*timeZoneRecord);
 		CleanupStack::PopAndDestroy(timeZoneRecord);
 		}
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETFREQUENTLYUSEDZONEL_EXIT, "CTzLocalizer::GetFrequentlyUsedZoneL Exit" );
 
 	return timeZone;
 	}
@@ -962,6 +1011,8 @@
 */
 TInt CTzLocalizer::GetTimeZoneIdFromTzServerL()
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZER_GETTIMEZONEIDFROMTZSERVERL_ENTRY, "CTzLocalizer::GetTimeZoneIdFromTzServerL Entry" );
+    
 	// Get current time zone using the current CTzId from the time zone server
 	CTzId* currentCTzId = iTzSession.GetTimeZoneIdL();
 	CleanupStack::PushL(currentCTzId);
@@ -982,6 +1033,7 @@
 		timeZoneIdInt = homeZone->TimeZoneId();
 		CleanupStack::PopAndDestroy(homeZone);
 		}
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETTIMEZONEIDFROMTZSERVERL_EXIT, "CTzLocalizer::GetTimeZoneIdFromTzServerL Exit;timeZoneIdInt=%u", timeZoneIdInt );
 
 	return timeZoneIdInt;
 	}
@@ -996,6 +1048,8 @@
 */
 EXPORT_C CTzLocalizedCity* CTzLocalizer::GetFrequentlyUsedZoneCityL(const CTzLocalizedTimeZone::TTzFrequentlyUsedZone aFrequentlyUsedZone)
 	{
+    OstTraceDef1(   OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETFREQUENTLYUSEDZONECITYL_ENTRY, "CTzLocalizer::GetFrequentlyUsedZoneCityL Entry;aFrequentlyUsedZone=%u", aFrequentlyUsedZone );
+    
 	CTzLocalizedCityRecord* cityRecord = iTzSession.LocalizationReadCachedTimeZoneCityL(aFrequentlyUsedZone);
 	CleanupStack::PushL(cityRecord);
 	CTzLocalizedCity* city = CreateCityL(*cityRecord);
@@ -1046,6 +1100,8 @@
 			}
 
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETFREQUENTLYUSEDZONECITYL_EXIT, "CTzLocalizer::GetFrequentlyUsedZoneCityL Exit" );
+	
 
 	return city;
 	}
@@ -1175,6 +1231,7 @@
 template <class T>
 void CTzLocalizer::PrepareForUTCSortL(T& aArray)
 	{
+    
 	//Prepare an array of timezone IDs to give to the time zone server
 	RArray<TInt> timeZoneIds;
 	CleanupClosePushL(timeZoneIds);
@@ -1225,6 +1282,8 @@
 */
 EXPORT_C CTzLocalizedCity* CTzLocalizer::FindCityByNameL(const TDesC& aCityName, const TInt aTimeZoneId)
 	{
+    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_FINDCITYBYNAMEL_ENTRY, "CTzLocalizer::FindCityByNameL Entry;aCityName=%S;aTimeZoneId=%d", aCityName, aTimeZoneId );
+    
 	CTzLocalizedCity* foundCity;
 	//Create a dummy city for the search
 	CTzLocalizedCity* aCity = CTzLocalizedCity::NewLC(aCityName,TTzLocalizedId((TUint16)aTimeZoneId,0),0);
@@ -1262,6 +1321,7 @@
 
 	delete citiesToSearch;
 	citiesToSearch = NULL;
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_FINDCITYBYNAMEL_EXIT, "CTzLocalizer::FindCityByNameL Exit" );
 
 	return foundCity;
 	}
@@ -1275,6 +1335,8 @@
 */
 EXPORT_C CTzLocalizedTimeZone* CTzLocalizer::FindTimeZoneByNameL(const TDesC& aTimeZoneName)
 	{
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_FINDTIMEZONEBYNAMEL_ENTRY, "CTzLocalizer::FindTimeZoneByNameL Entry;aTimeZoneName=%S", aTimeZoneName );
+    
 	CTzLocalizedTimeZone* foundTimeZone;
 	//Create a dummy time zone for the search
 	TTzLocalizedId id(0, 0);
@@ -1300,6 +1362,7 @@
 
 	delete allTimeZones;
 	allTimeZones = NULL;
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_FINDTIMEZONEBYNAMEL_EXIT, "CTzLocalizer::FindTimeZoneByNameL Exit" );
 
 	return foundTimeZone;
 	}
@@ -1313,6 +1376,8 @@
 */
 EXPORT_C CTzLocalizedCityGroup* CTzLocalizer::FindCityGroupByNameL(const TDesC& aCityGroupName)
 	{
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_FINDCITYGROUPBYNAMEL_ENTRY, "CTzLocalizer::FindCityGroupByNameL Entry;aCityGroupName=%S", aCityGroupName );
+    
 	CTzLocalizedCityGroup* foundCityGroup;
 	//Create a dummy city group for the search
 	CTzLocalizedCityGroup* aCityGroup = CTzLocalizedCityGroup::NewLC(aCityGroupName,0);
@@ -1337,6 +1402,7 @@
 
 	delete allCityGroups;
 	allCityGroups = NULL;
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_FINDCITYGROUPBYNAMEL_EXIT, "CTzLocalizer::FindCityGroupByNameL Exit" );
 
 	return foundCityGroup;
 	}
@@ -1379,6 +1445,8 @@
 */
 EXPORT_C CTzLocalizedCityArray* CTzLocalizer::GetCitiesWithUTCOffsetL(TInt aUTCOffsetInMinutes, const TTzSortOrder aSortOrder)
 	{
+    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESWITHUTCOFFSETL_ENTRY, "CTzLocalizer::GetCitiesWithUTCOffsetL Entry;aUTCOffsetInMinutes=%d;aSortOrder=%u", aUTCOffsetInMinutes, aSortOrder );
+    
 	//Fetch all the cities sorted by UTC offset
 	CTzLocalizedCityArray* allCities = GetCitiesL(ETzUTCAscending);
 	TInt count = allCities->Count();
@@ -1400,6 +1468,7 @@
 		TLinearOrder<CTzLocalizedCity> sortOrder(CitySortOrderL(aSortOrder));
 		allCities->Sort(sortOrder);
 		}
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETCITIESWITHUTCOFFSETL_EXIT, "CTzLocalizer::GetCitiesWithUTCOffsetL Exit" );
 
 	return allCities;
 	}
@@ -1415,6 +1484,8 @@
 */
 EXPORT_C CTzLocalizedTimeZoneArray* CTzLocalizer::GetTimeZonesWithUTCOffsetL(TInt aUTCOffsetInMinutes, const TTzSortOrder aSortOrder)
 	{
+    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETTIMEZONESWITHUTCOFFSETL_ENTRY, "CTzLocalizer::GetTimeZonesWithUTCOffsetL Entry;aUTCOffsetInMinutes=%d;aSortOrder=%u", aUTCOffsetInMinutes, aSortOrder );
+    
 	//Fetch all the time zones sorted by UTC offset
 	CTzLocalizedTimeZoneArray* allTimeZones = GetAllTimeZonesL(ETzUTCAscending);
 	TInt count = allTimeZones->Count();
@@ -1436,6 +1507,8 @@
 		TLinearOrder<CTzLocalizedTimeZone> sortOrder(TimeZoneSortOrderL(aSortOrder));
 		allTimeZones->Sort(sortOrder);
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_GETTIMEZONESWITHUTCOFFSETL_EXIT, "CTzLocalizer::GetTimeZonesWithUTCOffsetL Exit" );
+	
 	return allTimeZones;
 	}
 /**
@@ -1579,6 +1652,8 @@
  */
 TBool CTzLocalizer::FindCityAndSetCityIndexL(CTzLocalizedCity& aLocalizedCity, TTzLocalizerDataSource aDataSource)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_FINDCITYANDSETCITYINDEXL_ENTRY, "CTzLocalizer::FindCityAndSetCityIndexL Entry;aDataSource=%u", aDataSource );
+    
 	TBool hasFound = EFalse;
     CTzLocalizedCityArray* citiesInDb = CTzLocalizedCityArray::NewLC();
     if(aDataSource == ETzDataSourceSystem)
@@ -1601,6 +1676,8 @@
             }
         }
     CleanupStack::PopAndDestroy(citiesInDb);
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_FINDCITYANDSETCITYINDEXL_EXIT, "CTzLocalizer::FindCityAndSetCityIndexL Exit;hasFound=%u", hasFound );
+    
     return hasFound;
 	}
 
@@ -1650,6 +1727,8 @@
 */
 void CTzLocalizer::WriteAllFrequentlyUsedZonesL(const CTzLocalizedTimeZoneArray& aTimeZones, const CTzLocalizedCityArray& aCities)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_WRITEALLFREQUENTLYUSEDZONESL_ENTRY, "CTzLocalizer::WriteAllFrequentlyUsedZonesL Entry" );
+    
 	// Ensure that the numbers of items in the arrays are the expected amount
 	__ASSERT_ALWAYS(aTimeZones.Count() == CTzLocalizedTimeZone::ECachedTimeZones &&
 					aCities.Count() == CTzLocalizedTimeZone::ECachedTimeZones, User::Leave(KErrArgument));
@@ -1682,6 +1761,8 @@
 
 	CleanupStack::PopAndDestroy();	// cities
 	CleanupStack::PopAndDestroy();	// timeZones
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZER_WRITEALLFREQUENTLYUSEDZONESL_EXIT, "CTzLocalizer::WriteAllFrequentlyUsedZonesL Exit" );
+	
 	}
 
 void CTzLocalizer::SetFrequentlyUsedZoneL(const CTzLocalizedTimeZone& aTimeZone, const CTzLocalizedCity& aCity,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzloc/traces/OstTraceDefinitions.h	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* This is Default Licence added by TraceCompiler
+* Copyright (c) 2010 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 __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+
+#include <opensystemtrace.h>
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzloc/traces/fixed_id.definitions	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,153 @@
+#
+# This is Default Licence added by TraceCompiler
+# Copyright (c) 2010 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: 
+#
+#
+
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW_PARAM=0xde
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONRESOURCEREADER_ADDCITYARRAYFROMRESOURCEL=0x5
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONRESOURCEREADER_BUFFERRESOURCEL=0x3
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL=0x1
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONRESOURCEREADER_LOCALIZEDRESOURCEIDL=0x2
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONRESOURCEREADER_READALLTIMEZONESL=0x4
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONRESOURCEREADER_READCACHEDTIMEZONECITYL=0x9
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONRESOURCEREADER_READFREQUENTLYUSEDZONEL=0x8
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONRESOURCEREADER_READGROUPL=0x6
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZER_REMOVECITYL=0xa
+[TRACE]TRACE_ERROR[0x82]_DUP1_CTZLOCALIZATIONRESOURCEREADER_READGROUPL=0x7
+[TRACE]TRACE_FATAL[0x81]_CTZLOCALIZATIONRESOURCEREADER_CONSTRUCTL=0x1
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONDBACCESSOR_OPENDBL_ENTRY=0x1
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONDBACCESSOR_OPENDBL_EXIT=0x2
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_ADDCITYARRAYFROMRESOURCEL_ENTRY=0xa
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_CONSTRUCTL_ENTRY=0x3
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_CONSTRUCTL_EXIT=0x4
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_ENTRY=0x5
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_EXIT=0x6
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_EXIT2=0x7
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_READALLTIMEZONESL_ENTRY=0x8
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_READALLTIMEZONESL_EXIT=0x9
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_READCACHEDTIMEZONECITYL_ENTRY=0xf
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_READCACHEDTIMEZONECITYL_EXIT=0x10
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_READCITIESINGROUPL_ENTRY=0x39
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_READCITIESINGROUPL_EXIT=0xc
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_READFREQUENTLYUSEDZONEL_ENTRY=0xd
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZATIONRESOURCEREADER_READFREQUENTLYUSEDZONEL_EXIT=0xe
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_ADDCITYL_ENTRY=0x21
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_ADDCITYL_EXIT=0x22
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_CONSTRUCTL_ENTRY=0x11
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_CONSTRUCTL_EXIT=0x12
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_FINDCITYANDSETCITYINDEXL_ENTRY=0x35
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_FINDCITYANDSETCITYINDEXL_EXIT=0x36
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_FINDCITYBYNAMEL_ENTRY=0x2b
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_FINDCITYBYNAMEL_EXIT=0x2c
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_FINDCITYGROUPBYNAMEL_ENTRY=0x2f
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_FINDCITYGROUPBYNAMEL_EXIT=0x30
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_FINDTIMEZONEBYNAMEL_ENTRY=0x2d
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_FINDTIMEZONEBYNAMEL_EXIT=0x2e
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETALLTIMEZONESL_ENTRY=0x19
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETALLTIMEZONESL_EXIT=0x1a
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESINGROUPL_ENTRY=0x23
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESINGROUPL_EXIT=0x24
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESL_ENTRY=0x1b
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESL_ENTRY_OVERLOADED=0x1d
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESL_ENTRY_OVERLOADED2=0x1f
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESL_EXIT=0x1c
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESL_EXIT2=0x1e
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESL_EXIT3=0x20
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESWITHUTCOFFSETL_ENTRY=0x31
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETCITIESWITHUTCOFFSETL_EXIT=0x32
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETFREQUENTLYUSEDDEFAULTZONEL_ENTRY=0x17
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETFREQUENTLYUSEDDEFAULTZONEL_EXIT=0x18
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETFREQUENTLYUSEDZONECITYL_ENTRY=0x29
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETFREQUENTLYUSEDZONECITYL_EXIT=0x2a
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETFREQUENTLYUSEDZONEL_ENTRY=0x25
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETFREQUENTLYUSEDZONEL_EXIT=0x26
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETTIMEZONEIDFROMTZSERVERL_ENTRY=0x27
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETTIMEZONEIDFROMTZSERVERL_EXIT=0x28
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETTIMEZONESWITHUTCOFFSETL_ENTRY=0x33
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_GETTIMEZONESWITHUTCOFFSETL_EXIT=0x34
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_PREPAREFREQUENTLYUSEDZONESL_ENTRY=0x13
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_PREPAREFREQUENTLYUSEDZONESL_EXIT=0x14
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_UPDATEFREQUENTLYUSEDZONESL_ENTRY=0x15
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_UPDATEFREQUENTLYUSEDZONESL_EXIT=0x16
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_WRITEALLFREQUENTLYUSEDZONESL_ENTRY=0x37
+[TRACE]TRACE_FLOW_PARAM[0xDE]_CTZLOCALIZER_WRITEALLFREQUENTLYUSEDZONESL_EXIT=0x38
+[TRACE]TRACE_FLOW_PARAM[0xDE]_DUP1_CTZLOCALIZATIONRESOURCEREADER_ADDCITYARRAYFROMRESOURCEL_EXIT=0xb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDBACCESSOR_CREATEFREQUENTLYUSEDZONETABLEL_ENTRY=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDBACCESSOR_CREATEFREQUENTLYUSEDZONETABLEL_EXIT=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDBACCESSOR_CREATEUSERCITYTABLEL_ENTRY=0x5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDBACCESSOR_CREATEUSERCITYTABLEL_EXIT=0x6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDBACCESSOR_OPENDBL_ENTRY=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDBACCESSOR_OPENDBL_EXIT=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_ADDCITYARRAYFROMRESOURCEL_ENTRY=0xe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_ADDCITYARRAYFROMRESOURCEL_EXIT=0xf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_CONSTRUCTL_ENTRY=0x7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_CONSTRUCTL_EXIT=0x8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_ENTRY=0x9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_EXIT=0xa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_READALLTIMEZONESL_ENTRY=0xc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_READALLTIMEZONESL_EXIT=0xd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_READCACHEDTIMEZONECITYL_ENTRY=0x14
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_READCACHEDTIMEZONECITYL_EXIT=0x15
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_READCITIESINGROUPL_ENTRY=0x10
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_READCITIESINGROUPL_EXIT=0x11
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_READFREQUENTLYUSEDZONEL_ENTRY=0x12
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONRESOURCEREADER_READFREQUENTLYUSEDZONEL_EXIT=0x13
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_ADDCITYL_ENTRY=0x26
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_ADDCITYL_EXIT=0x27
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_CONSTRUCTL_ENTRY=0x16
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_CONSTRUCTL_EXIT=0x17
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_FINDCITYANDSETCITYINDEXL_ENTRY=0x3c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_FINDCITYANDSETCITYINDEXL_EXIT=0x3d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_FINDCITYBYNAMEL_ENTRY=0x32
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_FINDCITYBYNAMEL_EXIT=0x33
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_FINDCITYGROUPBYNAMEL_ENTRY=0x36
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_FINDCITYGROUPBYNAMEL_EXIT=0x37
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_FINDTIMEZONEBYNAMEL_ENTRY=0x34
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_FINDTIMEZONEBYNAMEL_EXIT=0x35
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETALLTIMEZONESL_ENTRY=0x1e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETALLTIMEZONESL_EXIT=0x1f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETCITIESINGROUPL_ENTRY=0x28
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETCITIESINGROUPL_EXIT=0x29
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETCITIESL_ENTRY=0x20
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETCITIESL_EXIT=0x21
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETCITIESWITHUTCOFFSETL_ENTRY=0x38
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETCITIESWITHUTCOFFSETL_EXIT=0x39
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETFREQUENTLYUSEDDEFAULTZONEL_ENTRY=0x1c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETFREQUENTLYUSEDDEFAULTZONEL_EXIT=0x1d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETFREQUENTLYUSEDZONECITYL_ENTRY=0x2e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETFREQUENTLYUSEDZONECITYL_EXIT=0x2f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETFREQUENTLYUSEDZONEL_ENTRY=0x2a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETFREQUENTLYUSEDZONEL_EXIT=0x2b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETTIMEZONEIDFROMTZSERVERL_ENTRY=0x2c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETTIMEZONEIDFROMTZSERVERL_EXIT=0x2d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETTIMEZONESWITHUTCOFFSETL_ENTRY=0x3a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_GETTIMEZONESWITHUTCOFFSETL_EXIT=0x3b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_PREPAREFORUTCSORTL_ENTRY=0x30
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_PREPAREFORUTCSORTL_EXIT=0x31
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_PREPAREFREQUENTLYUSEDZONESL_ENTRY=0x18
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_PREPAREFREQUENTLYUSEDZONESL_EXIT=0x19
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_UPDATEFREQUENTLYUSEDZONESL_ENTRY=0x1a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_UPDATEFREQUENTLYUSEDZONESL_EXIT=0x1b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_WRITEALLFREQUENTLYUSEDZONESL_ENTRY=0x3e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZER_WRITEALLFREQUENTLYUSEDZONESL_EXIT=0x3f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZLOCALIZATIONRESOURCEREADER_FINDTIMEZONERESOURCEIDL_EXIT=0xb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZLOCALIZER_GETCITIESL_ENTRY=0x22
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZLOCALIZER_GETCITIESL_EXIT=0x23
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CTZLOCALIZER_GETCITIESL_ENTRY=0x24
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CTZLOCALIZER_GETCITIESL_EXIT=0x25

--- a/tzservices/tzserver/Client/Source/timezone.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Client/Source/timezone.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -26,6 +26,11 @@
 #include <vtzrules.h>
 #include <tzupdate.h>
 #include "tzruleholder.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "timezoneTraces.h"
+#endif
+
 
 const TInt KNumConnectRetries = 5;
 
@@ -45,6 +50,8 @@
 //
 TInt RTz::StartServer()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_STARTSERVER_ENTRY, "RTz::StartServer Entry" );
+    
 	const TInt KIntServerType = 0x10004019;
 	const TUidType serverUid(KNullUid,TUid::Uid(KIntServerType));
 	
@@ -60,6 +67,8 @@
 
 	if (err != KErrNone)
 		{
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_STARTSERVER_EXIT, "RTz::StartServer Exit;err=%d", err );
+	    
 		return err;
 		}
 
@@ -78,6 +87,7 @@
 	User::WaitForRequest(stat);		// wait for start or death
 	server.Close();
 	return stat.Int();
+	
 	}
 
 /**
@@ -91,12 +101,18 @@
 */
 EXPORT_C CTzRules* RTz::GetTimeZoneRulesL(const TTime& aStartTime, const TTime& aEndTime, TTzTimeReference aTimeRef) const
 	{
+    OstTraceDefExt5( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_ENTRY, "RTz::GetTimeZoneRulesL Entry;Startdate:Year=%d;Month=%d;Day=%d;Hour=%d;Min=%d", aStartTime.DateTime().Year(), aStartTime.DateTime().Month(), aStartTime.DateTime().Day(), aStartTime.DateTime().Hour(), aStartTime.DateTime().Minute() );
+    OstTraceDefExt5( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_ENTRY_PARAM, "Parameters cont..;Sec=%d;End date:Year=%d;month=%d;Day=%d;Hour=%d", aStartTime.DateTime().Second(), aEndTime.DateTime().Year(), aEndTime.DateTime().Month(), aEndTime.DateTime().Day(), aEndTime.DateTime().Hour() );
+    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_ENTRY_PARAM2, "parameters  cont..;Min=%d;Sec=%d;aTimeRef=%u", aEndTime.DateTime().Minute(), aEndTime.DateTime().Second(), aTimeRef );
+    
 	TInt rulesSize = 0;
 	TPckg<TTime> startTimeBuffer(aStartTime);
 	TPckg<TTime> endTimeBuffer(aEndTime);
 	TPckg<TTzTimeReference> timeRefBuffer(aTimeRef);
 	TPckg<TInt> rulesSizeBuffer(rulesSize);
 	TIpcArgs args(&startTimeBuffer, &endTimeBuffer, &timeRefBuffer, &rulesSizeBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_GETTIMEZONERULESL_SEND_RECEIVE4, "RTz::GetTimeZoneRulesL:CTzServer::EGetLocalEncodedTimeZoneRulesSize" );
+	
 	const TInt result = SendReceive(CTzServer::EGetLocalEncodedTimeZoneRulesSize, args);
 	User::LeaveIfError(result);
 	
@@ -108,6 +124,8 @@
 	
 	// get the rules
 	TIpcArgs args2(&rulesSizeBuffer,&inPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_GETTIMEZONERULESL_SEND_RECEIVE3, "RTz::GetTimeZoneRulesL" );
+	
 	const TInt result2 = SendReceive(CTzServer::EGetLocalEncodedTimeZoneRules, args2);
 	User::LeaveIfError(result2);
 	
@@ -117,6 +135,8 @@
 	CTzRules* rules = CTzRules::NewL(readStream);
 	
 	CleanupStack::PopAndDestroy(inBuffer); // pop #1
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_EXIT, "RTz::GetTimeZoneRulesL Exit" );
+	
 	return rules;
 	}
 	
@@ -132,6 +152,11 @@
 */
 EXPORT_C CTzRules* RTz::GetTimeZoneRulesL(const CTzId& aZone, const TTime& aStartTime, const TTime& aEndTime, TTzTimeReference aTimeRef) const
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_ENTRY_OVERLOADED, "RTz::GetTimeZoneRulesL Entry;Time zone numerid id=%u", aZone.TimeZoneNumericID() );
+    OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_ENTRY_Overload_PARAM, "Parameters cont..Startdate:Year=%d;Month=%d;Day=%d;Hour=%d;Min=%d", aStartTime.DateTime().Year(), aStartTime.DateTime().Month(), aStartTime.DateTime().Day(), aStartTime.DateTime().Hour(), aStartTime.DateTime().Minute());
+    OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_Entry_OVERLOAD_PARAM, "Parameters cont..;Sec=%d;End date:Year=%d;month=%d;Day=%d;Hour=%d", aStartTime.DateTime().Second(), aEndTime.DateTime().Year(), aEndTime.DateTime().Month(), aEndTime.DateTime().Day(), aEndTime.DateTime().Hour());
+    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_Entry_OVERLOAD_PARAM2, "Parameters cont..;Min=%d;Sec=%d;aTimeRef=%u", aEndTime.DateTime().Minute(), aEndTime.DateTime().Second(), aTimeRef );
+    
 	TInt rulesSize = 0;
 	TPckg<TTime> startTimeBuffer(aStartTime);
 	TPckg<TTime> endTimeBuffer(aEndTime);
@@ -148,6 +173,8 @@
 	TPtr8 outPtr(outBuffer->Ptr(0) );
 	
 	TIpcArgs args(&startTimeBuffer, &endTimeBuffer, &outPtr, &rulesSizeBuffer);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,SEND_RECEIVE, RTZ_GETTIMEZONERULESL_SEND_RECEIVE2, "RTz::GetTimeZoneRulesL:CTzServer::EGetForeignEncodedTimeZoneRulesSize");
+	
 	const TInt result = SendReceive(CTzServer::EGetForeignEncodedTimeZoneRulesSize, args);
 	User::LeaveIfError(result);
 	
@@ -160,6 +187,8 @@
 	TPtr8 inPtr(inBuffer->Ptr(0) );
 	
 	TIpcArgs args2(&rulesSizeBuffer, &inPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_GETTIMEZONERULESL_SEND_RECEIVE, "RTz::GetTimeZoneRulesL:CTzServer::EGetForeignEncodedTimeZoneRules" );
+	
 	const TInt result2 = SendReceive(CTzServer::EGetForeignEncodedTimeZoneRules, args2);
 	User::LeaveIfError(result2);
 	
@@ -169,6 +198,8 @@
 	CTzRules* rules = CTzRules::NewL(readStream);
 	
 	CleanupStack::PopAndDestroy(inBuffer); // pop #1
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETTIMEZONERULESL_EXIT2, "RTz::GetTimeZoneRulesL Exit" );
+	
 	return rules;
 	}
 	
@@ -194,6 +225,8 @@
 	TPckg<TTzTimeReference> timerRefBuffer(aTimerRef);
 
 	TIpcArgs args(&timeBuffer, &timerRefBuffer, &timeInBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_DOCONVERTL, "RTz::doConvertL:CTzServer::EConvertLocalZoneTime" );
+	
 	const TInt result = SendReceive(CTzServer::EConvertLocalZoneTime, args);
 	User::LeaveIfError(result);
 
@@ -219,6 +252,8 @@
 	TPckg<TTzTimeReference> timerRefBuffer(aTimerRef);
 
 	TIpcArgs args(&timeBuffer, &timerRefBuffer, &outPtr, &timeInBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_DOCONVERTL, "RTz::doConvertL:CTzServer::EConvertForeignZoneTime" );
+	
 	const TInt result = SendReceive(CTzServer::EConvertForeignZoneTime, args);
 	CleanupStack::PopAndDestroy(outBuffer);
 
@@ -250,6 +285,8 @@
 */
 EXPORT_C TInt RTz::Connect()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_CONNECT_ENTRY, "RTz::Connect Entry" );
+    
 	// The number of message slots in the RSessionBase::CreateSession() 
 	// call are delibrately unspecified so the kernel will take messages 
 	// from a global pool as and when required (the session is allowed
@@ -261,11 +298,15 @@
 		TInt err = CreateSession(KTimeZoneServerName,Version());
 		if (err != KErrNotFound && err!=KErrServerTerminated)
 			{
+		    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_CONNECT_EXIT, "RTz::Connect Exit;err=%d", err );
+		    
 			return err;
 			}
 		// need to restart server
 		if (--retry == 0)
 			{
+		    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_CONNECT_EXIT2, "RTz::Connect Exit;err=%d", err );
+		    
 			return err;
 			}
 		err = StartServer();
@@ -274,8 +315,12 @@
 			// Time Zone Server is configurable, so it is possible not to find it
 			if (err != KErrNotFound)
 				{
+			    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_CONNECT_EXIT3, "RTz::Connect Exit;err=%d", err );
+			    
 				return err;
 				}
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FATAL, RTZ_CONNECT, "RTz::Connect:Panic:Server not found" );
+			
 			Panic(EPanicServerNotFound);
 			}
 		}
@@ -387,6 +432,8 @@
 */
 EXPORT_C void RTz::GetOffsetsForTimeZoneIdsL(const RArray<TInt>& aTzNumericIds, RArray<TInt>& aOffsets) const
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP1_RTZ_GETOFFSETSFORTIMEZONEIDSL_ENTRY, "RTz::GetOffsetsForTimeZoneIdsL Entry" );
+    
 	TInt count 			= aTzNumericIds.Count();
 	TInt tintSize 		= sizeof(TInt);
 	TInt idBufLength	= count * tintSize;
@@ -412,6 +459,8 @@
 	TInt size = idBuf->Size();
 	TPtr8 outPtr(idBuf->Ptr(0) );
 	TIpcArgs args(size,&outPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_GETOFFSETSFORTIMEZONEIDSL, "RTz::GetOffsetsForTimeZoneIdsL:CTzServer::EGetOffsetsForTimeZoneIds" );
+	
 	const TInt result = SendReceive(CTzServer::EGetOffsetsForTimeZoneIds, args);	
 	User::LeaveIfError(result);
 	
@@ -429,6 +478,8 @@
 		pos += tintSize;
 		}
 	CleanupStack::PopAndDestroy(idBuf);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP1_RTZ_GETOFFSETSFORTIMEZONEIDSL_EXIT, "RTz::GetOffsetsForTimeZoneIdsL Exit" );
+	
 	}
 
 /** 
@@ -439,6 +490,7 @@
 */
 EXPORT_C CTzId* RTz::GetTimeZoneIdL() const
 	{
+    
 	CBufFlat* inBuffer = CBufFlat::NewL(KMaxTimeZoneIdSize);
 	CleanupStack::PushL(inBuffer);
 
@@ -448,6 +500,8 @@
 	TPtr8 ptr(inBuffer->Ptr(0) );
 
 	TIpcArgs args(&ptr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_GETTIMEZONEIDL, "RTz::GetTimeZoneIdL, CTzServer::EGetLocalTimeZoneId" );
+	
 	const TInt result = SendReceive(CTzServer::EGetLocalTimeZoneId, args);
 	User::LeaveIfError(result);
 
@@ -467,6 +521,7 @@
 */
 EXPORT_C void RTz::SetTimeZoneL(CTzId& aZone) const
 	{
+    
 	CBufFlat* outBuffer = CBufFlat::NewL(KMaxTimeZoneIdSize);
 	CleanupStack::PushL(outBuffer);
 
@@ -487,6 +542,8 @@
 	TPtr8 outPtr(outBuffer->Ptr(0) );
 	TPtr8 inPtr(inBuffer->Ptr(0) );
 	TIpcArgs args(&outPtr, &inPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_SETTIMEZONEL, "RTz::SetTimeZoneL, CTzServer::ESetTimeZone" );
+	
 	const TInt result = SendReceive(CTzServer::ESetTimeZone, args);
 	User::LeaveIfError(result);
 
@@ -513,6 +570,7 @@
 */	
 EXPORT_C TBool RTz::IsDaylightSavingOnL(CTzId& aZone) const
 	{
+    
 	// prepare out zoneid buffer
 	CBufFlat* outBuffer = CBufFlat::NewL(KMaxTimeZoneIdSize);
 	CleanupStack::PushL(outBuffer);
@@ -520,12 +578,14 @@
 	RBufWriteStream writeStream;
 	writeStream.Open(*outBuffer);
 	aZone.ExternalizeL(writeStream);
-	
+		
 	TPckg<TTime> timeBuffer(Time::NullTTime());
 	
 	TPtr8 outPtr(outBuffer->Ptr(0) );
 	TPckgBuf<TInt> package;
 	TIpcArgs args(&outPtr, &timeBuffer, &package);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_ISDAYLIGHTSAVINGONL, "RTz::IsDaylightSavingOnL: For specified zone at the current time, CTzServer::EIsDaylightSavingOn" );
+	
 	const TInt result = SendReceive(CTzServer::EIsDaylightSavingOn, args);
 	User::LeaveIfError(result);
 	CleanupStack::PopAndDestroy(outBuffer);
@@ -541,6 +601,7 @@
 */	
 EXPORT_C TBool RTz::IsDaylightSavingOnL(CTzId& aZone, const TTime& aUTCTime) const
 	{
+    
 	// prepare out zoneid buffer
 	CBufFlat* outBuffer = CBufFlat::NewL(KMaxTimeZoneIdSize);
 	CleanupStack::PushL(outBuffer);
@@ -554,6 +615,8 @@
 	TPtr8 outPtr(outBuffer->Ptr(0) );
  	TPckgBuf<TInt> package;
 	TIpcArgs args(&outPtr, &timeBuffer, &package);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_ISDAYLIGHTSAVINGONL, "RTz::IsDaylightSavingOnL:specified zone at a specified time , CTzServer::EIsDaylightSavingOn" );
+	
  	const TInt result = SendReceive(CTzServer::EIsDaylightSavingOn, args);
  	User::LeaveIfError(result);
  	CleanupStack::PopAndDestroy(outBuffer);
@@ -586,6 +649,8 @@
 	TIpcArgs args(aUpdateEnabled);
 	
 	// Send the message.
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_SETAUTOUPDATEBEHAVIORL, "RTz::SetAutoUpdateBehaviorL, CTzServer::EEnableAutoUpdate" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::EEnableAutoUpdate, args));
     }
 
@@ -597,6 +662,8 @@
     {
     TPckgBuf<TInt> package;
 	TIpcArgs args(&package);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_AUTOUPDATESETTINGL, "RTz::AutoUpdateSettingL, CTzServer::EAutoUpdate" );
+	
 	const TInt result = SendReceive(CTzServer::EAutoUpdate, args);
 	User::LeaveIfError(result);
 	return package();	
@@ -623,6 +690,8 @@
 	TPckg<TTime>   timeBuffer(aLocalTime);
 
 	TIpcArgs args(&timeBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_SETHOMETIME, "RTz::SetHomeTime, CTzServer::ESetHomeTime" );
+	
 	return SendReceive(CTzServer::ESetHomeTime, args);
     }
 
@@ -637,6 +706,8 @@
 	TIpcArgs args(aChange.iNewTimeZoneId, aChange.iOldTimeZoneId);
 	
 	// Send the message.
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,SEND_RECEIVE, RTZ_NOTIFYHOMETIMEZONECHANGEDL, "RTz::NotifyHomeTimeZoneChangedL, CTzServer::ENotifyHomeTimeZoneChanged" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ENotifyHomeTimeZoneChanged, args));
 	}
 
@@ -694,6 +765,8 @@
 	TPckg<TBool> persist(aPersistInCenRep);
 
 	TIpcArgs args(&utcTime, &utcOffset, &persist);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_SETUNKNOWNZONETIMEL, "RTz::SetUnknownZoneTimeL, CTzServer::ESetUnknownZoneTime" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ESetUnknownZoneTime, args));
 	}
 
@@ -706,9 +779,13 @@
 */
 EXPORT_C void RTz::LocalizationReadCitiesL(RPointerArray<CTzLocalizedCityRecord>& aCities)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP4_RTZ_LOCALIZATIONREADCITIESL_ENTRY, "RTz::LocalizationReadCitiesL Entry" );
+    
 	TInt resultSize = 0;
 	TPckg<TInt> resultSizeBuffer(resultSize);
 	TIpcArgs args(&resultSizeBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_LOCALIZATIONREADCITIESL, "RTz::LocalizationReadCitiesL; CTzServer::ELocalizationReadCitiesSize");
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadCitiesSize, args));
 		
 	CBufFlat* inBuffer = CBufFlat::NewL(resultSize);
@@ -717,6 +794,8 @@
 	TPtr8 inPtr(inBuffer->Ptr(0));
 	
 	TIpcArgs args2(&inPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_LOCALIZATIONREADCITIESL, "RTz::LocalizationReadCitiesL; CTzServer::ELocalizationReadCities" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadCities, args2));
 	
 	RBufReadStream readStream;
@@ -726,6 +805,8 @@
 	CleanupStack::PopAndDestroy(&readStream);
 	
 	CleanupStack::PopAndDestroy(inBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP4_RTZ_LOCALIZATIONREADCITIESL_EXIT, "RTz::LocalizationReadCitiesL Exit" );
+	
 	}
 
 /**
@@ -738,9 +819,13 @@
 */
 EXPORT_C void RTz::LocalizationReadCitiesL(RPointerArray<CTzLocalizedCityRecord>& aCities, TInt aTimeZoneId)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_LOCALIZATIONREADCITIESL_ENTRY, "RTz::LocalizationReadCitiesL Entry;aTimeZoneId=%d", aTimeZoneId );
+    
 	TInt resultSize = 0;
 	TPckg<TInt> resultSizeBuffer(resultSize);
 	TIpcArgs args(&resultSizeBuffer, aTimeZoneId);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP2_RTZ_LOCALIZATIONREADCITIESL, "RTz::LocalizationReadCitiesL:For a time zone id, CTzServer::ELocalizationReadCitiesTzIdSize" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadCitiesTzIdSize, args));
 		
 	CBufFlat* inBuffer = CBufFlat::NewL(resultSize);
@@ -749,6 +834,8 @@
 	TPtr8 inPtr(inBuffer->Ptr(0));
 	
 	TIpcArgs args2(&inPtr, aTimeZoneId);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP3_RTZ_LOCALIZATIONREADCITIESL, "RTz::LocalizationReadCitiesL:For a time zone id,CTzServer::ELocalizationReadCities" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadCities, args2));
 		
 	RBufReadStream readStream;
@@ -758,6 +845,8 @@
 	CleanupStack::PopAndDestroy(&readStream);
 	
 	CleanupStack::PopAndDestroy(inBuffer);	
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_LOCALIZATIONREADCITIESL_EXIT, "RTz::LocalizationReadCitiesL Exit" );
+	
 	}
 
 /**
@@ -769,9 +858,13 @@
 */
 EXPORT_C void RTz::LocalizationReadCitiesInGroupL(RPointerArray<CTzLocalizedCityRecord>& aCities, TUint8 aGroupId)
 	{
+    OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, RTZ_LOCALIZATIONREADCITIESINGROUPL_ENTRY, "RTz::LocalizationReadCitiesInGroupL Entry;aGroupId=%hhu", aGroupId );
+    
 	TInt resultSize = 0;
 	TPckg<TInt> resultSizeBuffer(resultSize);
 	TIpcArgs args(&resultSizeBuffer, aGroupId);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_LOCALIZATIONREADCITIESINGROUPL, "RTz::LocalizationReadCitiesInGroupL, CTzServer::ELocalizationReadCitiesInGroupSize" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadCitiesInGroupSize, args));
 		
 	CBufFlat* inBuffer = CBufFlat::NewL(resultSize);
@@ -780,6 +873,8 @@
 	TPtr8 inPtr(inBuffer->Ptr(0));
 	
 	TIpcArgs args2(&inPtr, aGroupId);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_LOCALIZATIONREADCITIESINGROUPL_SEND, "RTz::LocalizationReadCitiesInGroupL :ELocalizationReadCities" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadCities, args2));
 		
 	RBufReadStream readStream;
@@ -789,6 +884,9 @@
 	CleanupStack::PopAndDestroy(&readStream);
 	
 	CleanupStack::PopAndDestroy(inBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_LOCALIZATIONREADCITIESINGROUPL_EXIT, "RTz::LocalizationReadCitiesInGroupL Entry" );
+	
+	
 	}
 
 /**
@@ -800,9 +898,13 @@
 */
 EXPORT_C CTzLocalizedTimeZoneRecord* RTz::LocalizationReadFrequentlyUsedZoneL(TInt aFrequentlyUsedZone)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL_ENTRY, "RTz::LocalizationReadFrequentlyUsedZoneL Entry;aFrequentlyUsedZone=%d", aFrequentlyUsedZone );
+    
 	TInt resultSize = 0;
 	TPckg<TInt> resultSizeBuffer(resultSize);
 	TIpcArgs args(&resultSizeBuffer, aFrequentlyUsedZone);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL, "RTz::LocalizationReadFrequentlyUsedZoneL, CTzServer::ELocalizationReadFrequentlyUsedZoneSize" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadFrequentlyUsedZoneSize, args));
 		
 	CBufFlat* inBuffer = CBufFlat::NewL(resultSize);
@@ -811,6 +913,8 @@
 	TPtr8 inPtr(inBuffer->Ptr(0));
 	
 	TIpcArgs args2(&inPtr, aFrequentlyUsedZone);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL, "RTz::LocalizationReadFrequentlyUsedZoneL, CTzServer::ELocalizationReadFrequentlyUsedZone" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadFrequentlyUsedZone, args2));
 		
 	RBufReadStream readStream;
@@ -820,6 +924,8 @@
 	CleanupStack::PopAndDestroy(&readStream);
 	
 	CleanupStack::PopAndDestroy(inBuffer);	
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL_EXIT, "RTz::LocalizationReadFrequentlyUsedZoneL Exit" );
+	
 	
 	return result;
 	}
@@ -833,9 +939,13 @@
 */
 EXPORT_C CTzLocalizedCityRecord* RTz::LocalizationReadCachedTimeZoneCityL(TInt aFrequentlyUsedZone)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP2_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL_ENTRY, "RTz::LocalizationReadCachedTimeZoneCityL Entry;aFrequentlyUsedZone=%d", aFrequentlyUsedZone );
+    
 	TInt resultSize = 0;
 	TPckg<TInt> resultSizeBuffer(resultSize);
 	TIpcArgs args(&resultSizeBuffer, aFrequentlyUsedZone);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,SEND_RECEIVE, RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL, "RTz::LocalizationReadCachedTimeZoneCityL, CTzServer::ELocalizationReadCachedTimeZoneCitySize" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadCachedTimeZoneCitySize, args));
 		
 	CBufFlat* inBuffer = CBufFlat::NewL(resultSize);
@@ -844,6 +954,8 @@
 	TPtr8 inPtr(inBuffer->Ptr(0));
 	
 	TIpcArgs args2(&inPtr, aFrequentlyUsedZone);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL, "RTz::LocalizationReadCachedTimeZoneCityL, CTzServer::ELocalizationReadCachedTimeZoneCity" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationReadCachedTimeZoneCity, args2));
 		
 	RBufReadStream readStream;
@@ -853,6 +965,8 @@
 	CleanupStack::PopAndDestroy(&readStream);
 	
 	CleanupStack::PopAndDestroy(inBuffer);	
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL_EXIT, "RTz::LocalizationReadCachedTimeZoneCityL Exit" );
+	
 	
 	return result;
 	}
@@ -886,9 +1000,13 @@
 		// This is a mess, although most of the API allows for 32 bit tz ids some of them
 		// only allow for 16 bit tz ids so we accept a TInt but do check that it can fit in 
 		// 16 bits
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, RTZ_LOCALIZATIONWRITECITYL, "RTz::LocalizationWriteCityL, Invalid time zone of the city:Id = %d", aCityTzId);
+	    
 		User::Leave(KErrArgument);
 		}
 	TIpcArgs args(&aCityName, aCityTzId, aCityGroupId, aCityResourceId);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_LOCALIZATIONWRITECITYL, "RTz::LocalizationWriteCityL, CTzServer::ELocalizationWriteCity" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationWriteCity, args));
 	}
 
@@ -909,9 +1027,13 @@
 		// This is a mess, although most of the API allows for 32 bit tz ids some of them
 		// only allow for 16 bit tz ids so we accept a TInt but do check that it can fit in 
 		// 16 bits
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, RTZ_LOCALIZATIONDELETECITYL, "RTz::LocalizationDeleteCityL:Invalid time zone id  of a city: id = %d" , aCityTzId);
+	    
 		User::Leave(KErrArgument);
 		}
 	TIpcArgs args(&aCityName, aCityTzId);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_LOCALIZATIONDELETECITYL, "RTz::LocalizationDeleteCityL, CTzServer::ELocalizationDeleteCity" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationDeleteCity, args));
 	}
 
@@ -933,6 +1055,8 @@
 EXPORT_C void RTz::LocalizationWriteFrequentlyUsedZoneL(const CTzLocalizedTimeZoneRecord& aTimeZone,
 	const CTzLocalizedCityRecord& aCity, TInt aFrequentlyUsedZone)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP1_RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL_ENTRY, "RTz::LocalizationWriteFrequentlyUsedZoneL Entry;aFrequentlyUsedZone=%d", aFrequentlyUsedZone );
+    
 	TInt bufferSize = aTimeZone.ExternalizeSize() + aCity.ExternalizeSize() + sizeof(TInt32);
 	CBufFlat* buffer = CBufFlat::NewL(bufferSize);
 	CleanupStack::PushL(buffer);
@@ -946,8 +1070,12 @@
 	CleanupStack::PopAndDestroy(&bufStream);
 	TPtr8 bufferPtr = buffer->Ptr(0); 
 	TIpcArgs args(&bufferPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL, "RTz::LocalizationWriteFrequentlyUsedZoneL, CTzServer::ELocalizationWriteFrequentlyUsedZone" );
+		
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationWriteFrequentlyUsedZone, args));
 	CleanupStack::PopAndDestroy(buffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL_EXIT, "RTz::LocalizationWriteFrequentlyUsedZoneL Exit" );
+	
 	}
 
 /**
@@ -956,6 +1084,8 @@
 EXPORT_C void RTz::LocalizationWriteAllFrequentlyUsedZonesL(const RPointerArray<CTzLocalizedTimeZoneRecord>& aTimeZones,
 		const RPointerArray<CTzLocalizedCityRecord>& aCities)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL_ENTRY, "RTz::LocalizationWriteAllFrequentlyUsedZonesL Entry" );
+    
 	TInt bufferSize = CTzLocalizedTimeZoneRecord::ExternalizeSize(aTimeZones);
 	bufferSize += CTzLocalizedCityRecord::ExternalizeSize(aCities);
 	CBufFlat* buffer = CBufFlat::NewL(bufferSize);
@@ -969,8 +1099,12 @@
 	CleanupStack::PopAndDestroy(&bufStream);
 	TPtr8 bufferPtr = buffer->Ptr(0); 
 	TIpcArgs args(&bufferPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL, "RTz::LocalizationWriteAllFrequentlyUsedZonesL, CTzServer::ELocalizationWriteAllFrequentlyUsedZones" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ELocalizationWriteAllFrequentlyUsedZones, args));
 	CleanupStack::PopAndDestroy(buffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL_EXIT, "RTz::LocalizationWriteAllFrequentlyUsedZonesL Exit" );
+	
 	}
 
 /**
@@ -1046,6 +1180,8 @@
 
 CTzId* RTz::CreateUserTimeZoneL(const CTzRules& aTzUserRules, const CTzUserNames& aTzUserNames)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_CREATEUSERTIMEZONEL_ENTRY, "RTz::CreateUserTimeZoneL Entry" );
+    
 	TInt size = aTzUserNames.SizeOfObject() + aTzUserRules.SizeOfObject();
 
 	CBufFlat* inpBuffer = CBufFlat::NewL(size);
@@ -1062,6 +1198,8 @@
 	TPtr8 ptrInp(inpBuffer->Ptr(0));
 	TPckgBuf<TUint32> idBuffer;
 	TIpcArgs args(size, &ptrInp, &idBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_CREATEUSERTIMEZONEL, "RTz::CreateUserTimeZoneL, CTzServer::ECreateUserTimeZone" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::ECreateUserTimeZone, args));
 	CleanupStack::PopAndDestroy(2, inpBuffer);
 	return CTzId::NewL(idBuffer());
@@ -1069,10 +1207,14 @@
 
 CTzUserNames* RTz::GetUserTimeZoneNamesL(const CTzId& aTzId) const
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETUSERTIMEZONENAMESL_ENTRY, "RTz::GetUserTimeZoneNamesL Entry ;Time zone id=%u", aTzId.TimeZoneNumericID());
+    
 	TInt nameSize = 0;
 	TPckg<TInt> nameSizeBuffer(nameSize);
 
 	TIpcArgs args(aTzId.TimeZoneNumericID(),&nameSizeBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_GETUSERTIMEZONENAMESL, "RTz::GetUserTimeZoneNamesL, CTzServer::EGetUserTimeZoneNamesSize" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::EGetUserTimeZoneNamesSize, args));
 
 	CBufFlat* retBuffer = CBufFlat::NewL(nameSize);
@@ -1081,6 +1223,8 @@
 	TPtr8 outPtr(retBuffer->Ptr(0) );
 	
 	TIpcArgs args2(&outPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_GETUSERTIMEZONENAMESL, "RTz::GetUserTimeZoneNamesL, CTzServer::EGetUserTimeZoneNames" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::EGetUserTimeZoneNames, args2));
 	
 	RBufReadStream readStream;
@@ -1089,11 +1233,15 @@
 	
 	CTzUserNames* names = CTzUserNames::NewL(readStream);
 	CleanupStack::PopAndDestroy(2, retBuffer); 
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETUSERTIMEZONENAMESL_EXIT, "RTz::GetUserTimeZoneNamesL Exit" );
+	
 	return names;
 	}
 	
 void RTz::UpdateUserTimeZoneL(const CTzId& aTzId, const CTzRules& aTzUserRules, const CTzUserNames& aTzUserNames)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_UPDATEUSERTIMEZONEL_ENTRY, "RTz::UpdateUserTimeZoneL Entry;Time zone id=%u", aTzId.TimeZoneNumericID());
+    
 	TInt size = aTzUserNames.SizeOfObject() + aTzUserRules.SizeOfObject();
 	
 	CBufFlat* inpBuffer = CBufFlat::NewL(size);
@@ -1109,9 +1257,13 @@
 	
 	TPtr8 ptrInp(inpBuffer->Ptr(0) );
 	TIpcArgs args(size, &ptrInp, aTzId.TimeZoneNumericID());
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_UPDATEUSERTIMEZONEL, "RTz::UpdateUserTimeZoneL, CTzServer::EUpdateUserTimeZone" );
+	
 	TInt reply = SendReceive(CTzServer::EUpdateUserTimeZone, args);
 	User::LeaveIfError(reply);
 	CleanupStack::PopAndDestroy(2, inpBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_UPDATEUSERTIMEZONEL_EXIT, "RTz::UpdateUserTimeZoneL Exit" );
+	
 	}
 	
 void RTz::DeleteUserTimeZoneL(const CTzId& aTzId)
@@ -1122,10 +1274,14 @@
 	
 void RTz::GetUserTimeZoneIdsL(RPointerArray<CTzId>& aTzIds) const
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETUSERTIMEZONEIDSL_ENTRY, "RTz::GetUserTimeZoneIdsL Entry" );
+    
 	TInt idsSize = 0;
 	TPckg<TInt> idsSizeBuffer(idsSize);
 
 	TIpcArgs args(&idsSizeBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, RTZ_GETUSERTIMEZONEIDSL, "RTz::GetUserTimeZoneIdsL, CTzServer::EGetUserTimeZoneIdsSize" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::EGetUserTimeZoneIdsSize, args));
 
 	CBufFlat* retBuffer = CBufFlat::NewL(idsSize);
@@ -1134,6 +1290,8 @@
 	TPtr8 outPtr(retBuffer->Ptr(0) );
 	
 	TIpcArgs args2(&outPtr);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, SEND_RECEIVE, DUP1_RTZ_GETUSERTIMEZONEIDSL, "RTz::GetUserTimeZoneIdsL, CTzServer::EGetUserTimeZoneIds" );
+	
 	User::LeaveIfError(SendReceive(CTzServer::EGetUserTimeZoneIds, args2));
 	
 	RBufReadStream readStream;
@@ -1149,6 +1307,8 @@
 		aTzIds.AppendL(zone);
 		}
 	CleanupStack::PopAndDestroy(2, retBuffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, RTZ_GETUSERTIMEZONEIDSL_EXIT, "RTz::GetUserTimeZoneIdsL Exit" );
+	
 	}

--- a/tzservices/tzserver/Client/Source/timezoneconverter.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Client/Source/timezoneconverter.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -19,6 +19,11 @@
 #include <tzconverter.h>
 #include "tzruleholder.h"
 #include "tzchangenotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "timezoneconverterTraces.h"
+#endif
+
 
 //
 // CTzRuleHolder
@@ -78,6 +83,9 @@
 
 void CTzRuleHolder::DoConvertL(TTime& aTime, TTzTimeReference aTimerRef)
 	{
+    OstTraceDefExt5( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZRULEHOLDER_DOCONVERTL_ENTRY, "CTzRuleHolder::DoConvertL Entry: atime:Year=%d;Month=%d;Day=%d;Hour=%d;Min=%d", aTime.DateTime().Year(), aTime.DateTime().Month(), aTime.DateTime().Day(), aTime.DateTime().Hour(), aTime.DateTime().Minute());
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZRULEHOLDER_DOCONVERTL_ENTRY_PARAM, "Parameters cont..;Sec=%d;aTimerRef=%u", aTime.DateTime().Second(), aTimerRef );
+    
 	// The change notifier may not have had a chance to run yet
 	// so check if it is ready to run now to force the update of the client side cache
 	iTzChangeNotifier->RunIfReadyL();
@@ -122,6 +130,8 @@
 		}
 		
 	User::LeaveIfError(iTzRules->ConvertTime(*iTzActualisedRules, aTime, aTimerRef));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULEHOLDER_DOCONVERTL_EXIT, "CTzRuleHolder::DoConvertL Exit" );
+	
 	}
 
 /**

--- a/tzservices/tzserver/Client/Source/timezoneuserdata.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Client/Source/timezoneuserdata.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -18,6 +18,11 @@
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <tzusernames.h>
 #include <tzuserdefineddata.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "timezoneuserdataTraces.h"
+#endif
+
 #endif
 
 
@@ -55,6 +60,8 @@
   aShortDaylightName.Length() > KMaxShortName
 			)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERNAMES_CONSTRUCTL, "CTzUserNames::ConstructL:Invalid size of the argument" );
+	    
 		User::Leave(KErrArgument);
 		}
 	
@@ -426,6 +433,8 @@
 	{
 	if (!aTzId.IsUserTzId())
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATA_READRULESL, "CTzUserData::ReadRulesL:Invalid Time zone id" );
+	    
 		User::Leave(KErrArgument);	
 		}
 		
@@ -451,6 +460,8 @@
 	{
 	if (!aTzId.IsUserTzId())
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATA_READNAMESL, "CTzUserData::ReadNamesL;Invalid time zone id" );
+	    
 		User::Leave(KErrArgument);	
 		}
 
@@ -481,6 +492,8 @@
 	{
 	if (!aTzId.IsUserTzId())
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATA_UPDATEL, "CTzUserData::UpdateL, Invalid time zone id" );
+	    
 		User::Leave(KErrArgument);	
 		}
 
@@ -517,6 +530,8 @@
 	{
 	if (!aTzId.IsUserTzId())
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATA_DELETEL, "CTzUserData::DeleteL:Invalid time zone id" );
+	    	    
 		User::Leave(KErrArgument);	
 		}

--- a/tzservices/tzserver/Client/Source/tzid.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Client/Source/tzid.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -18,6 +18,11 @@
 #include <tzid.h>
 #include "tzidinternal.h"
 #include <tz.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tzidTraces.h"
+#endif
+
 
 
 /**
@@ -88,6 +93,8 @@
 	const TInt KMaxSize = KMaxTInt / 2;
 	if (size < 0 || size >= KMaxSize)
 	    {
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZID_INTERNALIZEL, "CTzId::InternalizeL;Invalid size of Time zone id =%d",size );
+	    
 	    User::Leave( KErrArgument );
 	    }

--- a/tzservices/tzserver/Client/Source/tzlocalizedcityrecord.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Client/Source/tzlocalizedcityrecord.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -16,6 +16,11 @@
 #include "tzlocalizedcityrecord.h"
 #include "tzid.h"
 #include "tzidinternal.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tzlocalizedcityrecordTraces.h"
+#endif
+
 
 EXPORT_C CTzLocalizedCityRecord* CTzLocalizedCityRecord::NewL(const TDesC& aName, TUint8 aGroupId, TInt aIndex,
 		TInt aTzId, TUint aTzResourceId)
@@ -80,6 +85,8 @@
 		// This is a mess, although most of the API allows for 32 bit tz ids some of them
 		// only allow for 16 bit tz ids so we accept a TInt but do check that it can fit in 
 		// 16 bits
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZEDCITYRECORD_CONSTRUCTL, "CTzLocalizedCityRecord::ConstructL;Invalid Time zone id = %d",aTzId );
+	    
 		User::Leave(KErrArgument);
 		}
 	iTzId = aTzId;

--- a/tzservices/tzserver/Client/Source/tzlocalizedtimezonerecord.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Client/Source/tzlocalizedtimezonerecord.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -16,6 +16,11 @@
 #include "tzlocalizedtimezonerecord.h"
 #include "tzid.h"
 #include "tzidinternal.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tzlocalizedtimezonerecordTraces.h"
+#endif
+
 
 
 EXPORT_C CTzLocalizedTimeZoneRecord* CTzLocalizedTimeZoneRecord::NewL(TInt aTimeZoneId, const TDesC& aStandardName,
@@ -88,6 +93,8 @@
 		// This is a mess, although most of the API allows for 32 bit tz ids some of them
 		// only allow for 16 bit tz ids so we accept a TInt but do check that it can fit in 
 		// 16 bits
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZEDTIMEZONERECORD_CONSTRUCTL, "CTzLocalizedTimeZoneRecord::ConstructL;Invalid time zone id = %d", aTzId );
+	    
 		User::Leave(KErrArgument);
 		}
 	iId = aTzId;

--- a/tzservices/tzserver/Client/Source/vtzrules.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Client/Source/vtzrules.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 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"
@@ -18,6 +18,11 @@
 #include <tz.h>
 
 #include "tzrules.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "vtzrulesTraces.h"
+#endif
+
 
 const TInt KDaysInTheWeek = 7;
 const TInt KTzRulesGranularity = 4;
@@ -246,6 +251,8 @@
 */
 EXPORT_C TVTzActualisedRule TTzRule::ActualiseL(TInt aYear) const
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, TTZRULE_ACTUALISEL_ENTRY, "TTzRule::ActualiseL Exit;aYear=%d", aYear );
+    
 	TInt dayOfMonth = iDayOfMonth;
 	TInt daysDifference = 0;
 	TDay dayOfWeek(EMonday);
@@ -336,6 +343,7 @@
 	TVTzActualisedRule tActRule(actualTime, 
 		iNewLocalTimeOffset, 
 		static_cast<TTzTimeReference>(iTimeReference));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, TTZRULE_ACTUALISEL_EXIT, "TTzRule::ActualiseL Exit" );
 	return tActRule;
 	}
 
@@ -710,6 +718,8 @@
 */
 void CTzRules::AddActualisedRulesL(CVTzActualisedRules& aActRules, TInt aYear) const
    	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULES_ADDACTUALISEDRULESL_ENTRY, "CTzRules::AddActualisedRulesL Entry;aYear=%d", aYear );
+    
    	const TInt count=iRules.Count();
    	const TTzRule* trule = NULL;
 
@@ -789,6 +799,8 @@
   				}
 			}
    		}
+   	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULES_ADDACTUALISEDRULESL_EXIT, "CTzRules::AddActualisedRulesL Exit" );
+   	
    	}
 
 /**
@@ -799,6 +811,8 @@
 */
 EXPORT_C void CTzRules::GetActualisedRulesL(CVTzActualisedRules& aActRules) const
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULES_GETACTUALISEDRULESL_ENTRY, "CTzRules::GetActualisedRulesL Entry" );
+    
 	// Always add the initial offset because there may not have been
 	// any rules to actualise before the actualised rules range specified
 	TVTzActualisedRule tDefRule(TDateTime(iStartYear, EJanuary, 0, 0, 0, 0, 0), iInitialStdTimeOffset, ETzWallTimeReference);
@@ -858,6 +872,8 @@
 				}
 			}
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULES_GETACTUALISEDRULESL_EXIT, "CTzRules::GetActualisedRulesL Exit" );
+	
 	}
 
 /**
@@ -907,6 +923,9 @@
 */
 EXPORT_C TInt CTzRules::GetOffsetL(const TTime& aTime, TTzTimeReference aTimeRef) const
 	{
+    OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULES_GETOFFSETL_ENTRY, "CTzRules::GetOffsetL Entry; atime:Year=%d;Month=%d;Day=%d;Hour=%d;Min=%d", aTime.DateTime().Year(), aTime.DateTime().Month(), aTime.DateTime().Day(), aTime.DateTime().Hour(), aTime.DateTime().Minute() );
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZRULES_GETOFFSETL_PARAM, "Parameters cont..Sec=%d;aTimerRef=%u", aTime.DateTime().Second(), aTimeRef );
+    
 	if (iActualisedRulesCache)
 		{
 		TTime startTime(TDateTime(iActualisedRulesCache->StartYear(), EJanuary, 0, 0, 0, 0, 0));	
@@ -931,6 +950,8 @@
 		iActualisedRulesCache = NULL;
 		User::LeaveIfError(leaveCode);		
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULES_GETOFFSETL_EXIT, "CTzRules::GetOffsetL Exit" );
+	
 	
 	return iActualisedRulesCache->GetOffsetFromRuleL(aTime, aTimeRef);;
 	}
@@ -1268,6 +1289,9 @@
 */
 EXPORT_C TBool CVTzActualisedRules::IsDaylightSavingOn(TTime& aTime) const
 	{
+    OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CVTZACTUALISEDRULES_ISDAYLIGHTSAVINGON_ENTRY, "CVTzActualisedRules::IsDaylightSavingOn Entry;aTime:Year=%d;Month=%d;Day=%d;Hour=%d;Min=%d", aTime.DateTime().Year(), aTime.DateTime().Month(), aTime.DateTime().Day(), aTime.DateTime().Hour(), aTime.DateTime().Minute());
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CVTZACTUALISEDRULES_ISDAYLIGHTSAVINGON_PARAM, "Parameter cont..;Sec=%d", aTime.DateTime().Second() );
+    
 	const TInt count = iRules.Count();
 
 	// ensure that there are rules
@@ -1398,6 +1422,8 @@
 				}
 			}
 	    }
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CVTZACTUALISEDRULES_ISDAYLIGHTSAVINGON_EXIT, "CVTzActualisedRules::IsDaylightSavingOn Exit;dstOn=%u", dstOn );
+	
 	return(dstOn);
 	}
 	
@@ -1417,6 +1443,8 @@
  */
 EXPORT_C TInt CVTzActualisedRules::GetOffsetFromRuleL(const TTime& aUserTime, TTzTimeReference aUserTimeRef) const
 	{
+    OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CVTZACTUALISEDRULES_GETOFFSETFROMRULEL_ENTRY, "CVTzActualisedRules::GetOffsetFromRuleL Entry;aUserTime:Year=%d;Month=%d;Day=%d;Hour=%d;Min=%d", aUserTime.DateTime().Year(), aUserTime.DateTime().Month(), aUserTime.DateTime().Day(), aUserTime.DateTime().Hour(), aUserTime.DateTime().Minute());
+    
 	// The first rule with iTimeOfChange <= aUserTime that is found going backwards in the array is the one that
 	// applies at the requested aUserTime.
 	__ASSERT_ALWAYS(aUserTimeRef!=ETzStdTimeReference, RTz::Panic(RTz::EPanicUnsupportedTimeReference));
@@ -1472,8 +1500,11 @@
 
 	if (!ruleFound)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CVTZACTUALISEDRULES_GETOFFSETFROMRULEL, "CVTzActualisedRules::GetOffsetFromRuleL:Rule not found" );
+	    
 		User::Leave(KErrNotFound);
 		}
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CVTZACTUALISEDRULES_GETOFFSETFROMRULEL_EXIT, "CVTzActualisedRules::GetOffsetFromRuleL Exit;resultOffset=%d", resultOffset );
 		
 	return resultOffset;
 	}

--- a/tzservices/tzserver/Server/Source/DataProvider.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/DataProvider.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -19,6 +19,12 @@
 #include "ReadOnlyTzDb.h"
 #include "vtzrules.h"
 #include "timezoneserver.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "DataProviderTraces.h"
+#endif
+
+
 
 CTzDataProvider* CTzDataProvider::NewL(RFs& aFs, CTzSwiObserver& aSwiObserver, 
 		CTzUserDataDb& aTzUserDataDb, MTzDataObserver& aTzDataObserver)
@@ -92,6 +98,8 @@
 */
 void CTzDataProvider::GetOffsetsForTimeZoneIdsL(CBufFlat& aTimeZoneIdArray) const
 	{
+OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_ENTRY, "CTzDataProvider::GetOffsetsForTimeZoneIdsL Entrty" );
+
 	const TInt KElementSize = sizeof(TInt);
 	
 	// Get number of time zone identifiers in array.
@@ -145,6 +153,8 @@
 		// Advance array offset to next time zone identifier.
 		arrayOffset += KElementSize;
 		}
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_EXIT, "CTzDataProvider::GetOffsetsForTimeZoneIdsL Exit" );
+    
 	}
 
 void CTzDataProvider::BackupBeginningL()

--- a/tzservices/tzserver/Server/Source/MAIN.CPP	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/MAIN.CPP	Wed Oct 20 17:03:03 2010 +0300
@@ -1,5 +1,5 @@
 
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -16,6 +16,11 @@
 
 #include "timezoneserver.h"
 #include <s32file.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "MAINTraces.h"
+#endif
+
 
 CTZSrvScheduler::~CTZSrvScheduler()
 	{
@@ -47,7 +52,10 @@
 	// Perform all server initialisation, in particular creation of the
 	// scheduler and server and then run the scheduler
 	//
-	{
+	{ 
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, _RUNSERVERL, "::RunServerL Entry" );
+    
+    
 	// create and install the active scheduler we need
 	CTZSrvScheduler* s = CTZSrvScheduler::NewL();
 	CleanupStack::PushL(s);
@@ -66,13 +74,18 @@
 	//
 	// Cleanup the scheduler
 	CleanupStack::PopAndDestroy(s);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, __RUNSERVERL_EXIT, "::RunServerL Exit" );
+	
 	}
 
 GLDEF_C TInt E32Main()
 //
 // Timezone server entrypoint
 //
-	{
+	{     
+  OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, _E32MAIN_ENTRY, "::E32Main Entry" );
+  
+            
 	__UHEAP_MARK;
 	//
 	CTrapCleanup* cleanup = CTrapCleanup::New();
@@ -84,5 +97,7 @@
 		}
 	//
 	__UHEAP_MARKEND;
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, _E32MAIN_EXIT, "::E32Main Exit ;return value=%u", r );
+	
 	return r;
 	}

--- a/tzservices/tzserver/Server/Source/readonlytzdb.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/readonlytzdb.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -18,6 +18,12 @@
 #include <f32file.h>
 #include "dataprovider.h"
 #include <vtzrules.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "readonlytzdbTraces.h"
+#endif
+
+
 
 const TUint KDefaultTzNumericId = 0;
 
@@ -61,6 +67,8 @@
 //
 TInt CReadOnlyTzDb::CopyDatabaseToRam(const TDesC& aTzDbFileName)
   {
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_COPYDATABASETORAM_ENTRY, "CReadOnlyTzDb::CopyDatabaseToRam Entry;aTzDbFileName=%S", aTzDbFileName );
+    
 	TInt error = KErrNone;
 	RFile file;
 
@@ -100,6 +108,8 @@
 			}
 		}
 	file.Close();
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_COPYDATABASETORAM_EXIT, "CReadOnlyTzDb::CopyDatabaseToRam Exit;error=%d", error );
+	
 	return error;
 	}
   
@@ -120,12 +130,16 @@
 
 void CReadOnlyTzDb::InitialiseL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP1_CREADONLYTZDB_INITIALISEL_ENTRY, "CReadOnlyTzDb::InitialiseL Entry" );
+    
 	// deny access to Flash-based database 
 	// if it is being restored in this precise moment
 	// We must not allow access to the ROM-based DB either, 
 	// because this might contain outdated data.
 	if (iRestoreInProcess)
 		{
+	    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_ERROR, CREADONLYTZDB_INITIALISEL, "CReadOnlyTzDb::InitialiseL:Error:Restoring in process" );
+	    
 		User::Leave(KErrNotReady);
 		}
 		
@@ -191,6 +205,8 @@
 	iRuleSetsTable = CTzDbRuleSetsTable::NewL(*this, *(reinterpret_cast<TTzRuleSetsTable*>(KRuleSetsBaseAddress)));
 	iRuleUsesTable = CTzDbRuleUsesTable::NewL(*(reinterpret_cast<TTzRuleUsesTable*>(KRuleUsesBaseAddress)));
 	iRuleDefinitionsTable = CTzDbRuleDefinitionsTable::NewL(*(reinterpret_cast<TTzRuleDefinitionsTable*>(KRuleDefinitionsBaseAddress)));	
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, DUP1_CREADONLYTZDB_INITIALISEL_EXIT, "CReadOnlyTzDb::InitialiseL Exit" );
+	
 	}
 
 //
@@ -224,6 +240,8 @@
 //
 CTzId* CReadOnlyTzDb::GetDefaultTimeZoneIdL()
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_ENTRY, "CReadOnlyTzDb::GetDefaultTimeZoneIdL Entry" );
+    
 	if (iZonesTable == NULL)
 		{
 		InitialiseL();
@@ -234,6 +252,7 @@
 
 	if (defZone)
 		{
+	    
 		CleanupStack::PushL(defZone); // push #1
 
 		HBufC8* fullZoneName = defZone->GetFullZoneNameLC(); // push #2
@@ -243,13 +262,18 @@
 
 		CleanupStack::Pop(defTZID);
 		CleanupStack::PopAndDestroy(2, defZone);
+		
 		}
-
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_EXIT, "CReadOnlyTzDb::GetDefaultTimeZoneIdL Exit" );
+	
 	return defTZID;
 	}
 
 void CReadOnlyTzDb::GetTzRulesL(CTzRules& aTzRules, CTzId& aTzId)
 	{
+    
+  OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_GETTZRULESL_ENTRY, "CReadOnlyTzDb::GetTzRulesL Entry;Time zone id =%u", aTzId.TimeZoneNumericID());
+  
 	if (iZonesTable == NULL)
 		{
 		InitialiseL();
@@ -258,6 +282,7 @@
 	TRAPD(err, DoGetTzRulesL(aTzRules, aTzId));
 	if ( (err == KErrCorrupt) && (iTzDbData) )
 		{
+	    
 		ReleaseData();
 		// if the corruption occurred while accessing the Flash DB, we must flag it 
 		// as corrupt before propagating the leave
@@ -268,6 +293,8 @@
 		}
 		
 	User::LeaveIfError(err);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_GETTZRULESL_EXIT, "CReadOnlyTzDb::GetTzRulesL Exit" );
+	
 	}
 	
 void CReadOnlyTzDb::DoGetTzRulesL(CTzRules& aTzRules, CTzId& aTzId)
@@ -303,6 +330,8 @@
 //
 CTzDbZone* CReadOnlyTzDb::FindZoneL(CTzId& aLocation, TBool aFillInLocationIDs)
 	{
+    OstTraceDefExt3( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_FINDZONEL_EnTRY, "CReadOnlyTzDb::FindZoneL;Time zone id=%u;Time zone name=%s;aFillInLocationIDs=%u", aLocation.TimeZoneNumericID(), aLocation.TimeZoneNameID(), aFillInLocationIDs );
+    
 	CTzDbZone* zone = NULL;
 	if (aLocation.TimeZoneNumericID() > KDefaultTzNumericId)
 		{
@@ -326,6 +355,7 @@
 			CleanupStack::Pop(zone); // pop #1
 			}
 		}
+OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_FINDZONEL_EXIT, "CReadOnlyTzDb::FindZoneL Exit" );
 
 	return zone;
 	}
@@ -338,6 +368,9 @@
 //
 CTzDbZone* CReadOnlyTzDb::FindZoneByNameL(const TDesC8& aLocation)
 	{
+    OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY, "CReadOnlyTzDb::FindZoneByNameL Entry;aLocation.=%s", aLocation );
+    
+           
 	// first of all, look in links table
 	CTzDbZone* retZone = iLinksTable->FindZoneL(aLocation);
 
@@ -368,6 +401,7 @@
 		
 		CleanupStack::PopAndDestroy(2,regionName); // pop #2, #1 - cityName, regionName
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_FINDZONEBYNAMEL_EXIT, "CReadOnlyTzDb::FindZoneByNameL Exit" );
 
 	return retZone;
 	}
@@ -469,6 +503,10 @@
 */
 TInt CReadOnlyTzDb::GetOffsetForTimeZoneIdL(const TTime& aTime, TInt aTzId)
 	{
+ 
+    OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_ENTRY, "CReadOnlyTzDb::GetOffsetForTimeZoneIdL Entry;aTzId=%d;Year=%d;Month=%d;Day=%d", aTzId, aTime.DateTime().Year(), aTime.DateTime().Month(), aTime.DateTime().Day());
+    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_PARAM, "parameters..;Hour=%d;Minute=%d;seconds=%d",aTime.DateTime().Hour(),aTime.DateTime().Minute() ,aTime.DateTime().Second() );
+    
 	if (iZonesTable == NULL)
 		{
 		InitialiseL();
@@ -503,6 +541,7 @@
 			}
 		CleanupStack::PopAndDestroy(zone);
 		}
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_EXIT, "CReadOnlyTzDb::GetOffsetForTimeZoneIdL Exit;offset=%u", offset );
 			
 	return offset;
 	}

--- a/tzservices/tzserver/Server/Source/timezoneconfig.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/timezoneconfig.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -25,6 +25,11 @@
 #include "CBackupRestoreNotification.h"
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <tzuserdefineddata.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "timezoneconfigTraces.h"
+#endif
+
 #endif
 
 _LIT8(KUnknownTZName, "Unknown/Zone");
@@ -224,6 +229,9 @@
 
 void CTzConfigAgent::PublishTzDbChangeInfoL()
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_ENTRY, "CTzConfigAgent::PublishTzDbChangeInfoL Entry" );
+    
+    
 	RFile file;
 	CleanupClosePushL(file);
 
@@ -299,6 +307,8 @@
 			NTzUpdate::TTzRulesChange rulesChange;
 			rulesChange.iUTCTimeOfRulesChange.UniversalTime();
 			TPckgBuf<NTzUpdate::TTzRulesChange> bufRules(rulesChange);
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, PUBLISH_UPDATE_NOTIFICATION, TZRULES_CHANGE_NOTIFICATION_2, "Time zone rules change" );
+			
 			RProperty::Set(NTzUpdate::KPropertyCategory, NTzUpdate::ETzRulesChange, bufRules);
 			}
 	
@@ -308,13 +318,19 @@
 			NTzUpdate::TTzNamesChange namesChange;
 			namesChange.iUTCTimeOfNamesChange.UniversalTime();
 			TPckgBuf<NTzUpdate::TTzNamesChange> bufNames(namesChange);
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, PUBLISH_UPDATE_NOTIFICATION, TZNAMES_CHANGE_NOTIFICATION_2, "Time zone names change notification" );
+			
 			RProperty::Set(NTzUpdate::KPropertyCategory, NTzUpdate::ETzNamesChange, bufNames);	
 			}
 		}
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_EXIT, "CTzConfigAgent::PublishTzDbChangeInfoL Exit" );
+	
 	}
 
 void CTzConfigAgent::ReadTimeStampsL(RFile& aFile, TTime& aTzdbSaved, TTime& aUserDbSaved, TTime& aResourceFileSaved)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_READTIMESTAMPSL_ENTRY, "CTzConfigAgent::ReadTimeStampsL Entry" );
+    
 	RFileReadStream readStream(aFile);
 	CleanupClosePushL(readStream);
 	
@@ -330,6 +346,8 @@
 	high = readStream.ReadUint32L();
 	aResourceFileSaved = TTime(MAKE_TINT64(high, low));
 	CleanupStack::PopAndDestroy(&readStream);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_READTIMESTAMPSL_EXIT, "CTzConfigAgent::ReadTimeStampsL Exit" );
+	
 	}
 
 void CTzConfigAgent::WriteTimeStampsL(RFile& aFile, const TTime& aTzdbModified, const TTime& aUserDbModified, const TTime& aResourceFileModified)
@@ -351,6 +369,8 @@
  */
 TTime  CTzConfigAgent::GetResourceFileTimeStampsL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_GETRESOURCEFILETIMESTAMPSL_ENTRY, "CTzConfigAgent::GetResourceFileTimeStampsL Entry" );
+    
 	CDir* files = NULL;
 	TInt err = iFs.GetDir(KResourceDir, KEntryAttNormal, ESortNone, files);
 	CleanupStack::PushL(files);
@@ -369,15 +389,22 @@
 			}
 		}
 	CleanupStack::PopAndDestroy(files);
+	OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_GETRESOURCEFILETIMESTAMPSL_EXIT, "CTzConfigAgent::GetResourceFileTimeStampsL Exit;sum=%Ld", sum );
+	
 	if(sum==0)
 		{
+	    
 		return Time::NullTTime();
 		}
+	
 	return TTime(sum);
 	}
 
 void CTzConfigAgent::PublishNewDstChangeInfoL()
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_ENTRY, "CTzConfigAgent::PublishNewDstChangeInfoL Entry" );
+    
+    
     TInt propertyDefineError = RProperty::Define(KUidSystemCategory,
     												KNextDSTChangePropertyKey,
     												RProperty::EByteArray,
@@ -388,6 +415,8 @@
 	if (propertyDefineError != KErrAlreadyExists)
 		{
 	    // if there was an actual error defining the property then we should leave
+	    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_ERROR, PROPERTY_DEFINITION, "Property definition return value: =%d", propertyDefineError );
+	    
 		User::LeaveIfError(propertyDefineError);
 		}
 	
@@ -424,8 +453,12 @@
 		{
 		// package the data and set the property value 
 		TPckgBuf<NTzUpdate::TDSTChangeInfo> newDSTChangeInfoBuf(newDSTChangeInfo);
+		OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,PUBLISH_UPDATE_NOTIFICATION, NEXT_DST_CHANGE, "Publish New   Dst Change " );
+		
 	    User::LeaveIfError(RProperty::Set(KUidSystemCategory, KNextDSTChangePropertyKey, newDSTChangeInfoBuf));
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_EXIT, "CTzConfigAgent::PublishNewDstChangeInfoL Exit" );
+	
 	}
 
 /*
@@ -433,6 +466,7 @@
 CTzConfigAgent* CTzConfigAgent::NewL(MTZCfgAgentObserver& aServer, CTzUserDataDb& aUserDataDb,
 		CTzSwiObserver& aTzSwiObserver)
 	{
+    
 	CTzConfigAgent* self = new(ELeave) CTzConfigAgent(aServer, aUserDataDb, aTzSwiObserver);
 	CleanupStack::PushL(self);
 	self->ConstructL();
@@ -452,6 +486,9 @@
 
 const CTzId& CTzConfigAgent::SetTimeZoneL(const CTzId& aZoneId, const TAny* aRequester, TBool aUpdateCentralRepository, TBool aForceCacheUpdate)
 	{
+    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETTIMEZONEL_ENTRY, "CTzConfigAgent::SetTimeZoneL Entry;aZoneId=%u;aUpdateCentralRepository=%u;aForceCacheUpdate=%u", aZoneId.TimeZoneNumericID(), aUpdateCentralRepository, aForceCacheUpdate );
+    
+    
 	TInt oldTzId = 0;
 	TBool zoneChanged = EFalse;
 	TTime now;
@@ -476,6 +513,8 @@
 		CTzRules& newZoneRules =  newZone->GetEncodedTimeZoneRulesL();
 		if (newZoneRules.Count() == 0)
 		    {
+		    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_ERROR, INVALID_TIME_ZONE, "Invalid Time zone;KErrNotFound=%u", KErrNotFound );
+		    
 		    User::Leave(KErrNotFound);
 		    }
 
@@ -541,6 +580,8 @@
 	iTzDataProvider->ReleaseTzRules();
 	
 	TRAP_IGNORE(PublishNewDstChangeInfoL());
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETTIMEZONEL_EXIT, "CTzConfigAgent::SetTimeZoneL Exit;retun value;Time Zone Id=%u;Time Zone Name=%s", iSystemTzCache->TimeZoneId().TimeZoneNumericID(), iSystemTzCache->TimeZoneId().TimeZoneNameID() );
+	
 	
 	return (iSystemTzCache->TimeZoneId());
 	}
@@ -671,6 +712,8 @@
 // Reset the current time zone information to take advantage of any changes.
 void CTzConfigAgent::NotifyTZDataStatusChangeL(RTz::TTzChanges aChange)
 	{
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_ENTRY, "CTzConfigAgent::NotifyTZDataStatusChangeL Entry;aChange=%u", aChange );
+    
 	if (aChange == RTz::ETZLocalizationDataChanged)
 		{
 		TInt j = 0;
@@ -684,6 +727,8 @@
 		NTzUpdate::TTzNamesChange namesChange;
 		namesChange.iUTCTimeOfNamesChange.UniversalTime();
 		TPckgBuf<NTzUpdate::TTzNamesChange> bufNames(namesChange);
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, PUBLISH_UPDATE_NOTIFICATION, TZNAMES_CHANGE_NOTIFICATION, "Time zone names change notification" );
+		
 		User::LeaveIfError(RProperty::Set(NTzUpdate::KPropertyCategory, NTzUpdate::ETzNamesChange, bufNames));
 		}
 	else 
@@ -700,8 +745,12 @@
 		NTzUpdate::TTzRulesChange rulesChange;
 		rulesChange.iUTCTimeOfRulesChange.UniversalTime();
 		TPckgBuf<NTzUpdate::TTzRulesChange> bufRules(rulesChange);
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, PUBLISH_UPDATE_NOTIFICATION, TZRULES_CHANGE_NOTIFICATION, "Time zone rules change notification" );
+		
 		User::LeaveIfError(RProperty::Set(NTzUpdate::KPropertyCategory, NTzUpdate::ETzRulesChange, bufRules));
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_EXIT, "CTzConfigAgent::NotifyTZDataStatusChangeL Exit" );
+	
 	}
 
 /**
@@ -734,6 +783,8 @@
 */
 TBool CTzConfigAgent::CalculateNextDstChangeL(TTime& aNextDstEvent, TTime& aPreviousDstEvent)
     {
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_ENTRY, "CTzConfigAgent::CalculateNextDstChangeL Entry" );
+    
     // Get the current time/date.
     TTime now;
     now.UniversalTime();
@@ -785,11 +836,15 @@
         else
             {
             aNextDstEvent = utcTimeOfChange;
+            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_EXIT2, "CTzConfigAgent::CalculateNextDstChangeL :DST has changed" );
+            
             return ETrue;
             }
         }
         
     // No DST change has been found.
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_EXIT, "CTzConfigAgent::CalculateNextDstChangeL Exit: No DST change" );
+    
     return EFalse;
     }
 
@@ -851,6 +906,9 @@
 */
 void CTzConfigAgent::HandleDstChangeTimerL()
     {
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_ENTRY, "CTzConfigAgent::HandleDstChangeTimerL Entry" );
+    
+    
 	// UTC offset must be updated only when Auto Update is ON
 	if (iEnabled == RTz::ETZAutoDSTUpdateOn)
 		{
@@ -867,13 +925,18 @@
 		// Publish update notification.
 		// Note that the value published is the same as
 		// the AutoUpdate Configuration
+		OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,PUBLISH_UPDATE_NOTIFICATION, UTC_OFF_SET_CHANGE, "CTzConfigAgent::HandleDstChangeTimerL:EUtcOffsetChangeNotification" );
+		
 		TInt err = RProperty::Set(
    				NTzUpdate::KPropertyCategory, 
    				NTzUpdate::EUtcOffsetChangeNotification, iEnabled);
+		
 			User::LeaveIfError(err);
 	    }
 	
 	TRAP_IGNORE(PublishNewDstChangeInfoL());
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_EXIT, "CTzConfigAgent::HandleDstChangeTimerL Exit" );
+	
     }
 
     
@@ -918,6 +981,9 @@
 */
 void CTzConfigAgent::SetAutoUpdateBehaviorL(TInt aUpdateEnabled)
     {
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_ENTRY, "CTzConfigAgent::SetAutoUpdateBehaviorL Entry;aUpdateEnabled=%u", aUpdateEnabled );
+    
+    
     // Check if the configuration has changed.
     if (aUpdateEnabled != iEnabled)
         {
@@ -945,6 +1011,8 @@
         }
     
     TRAP_IGNORE(PublishNewDstChangeInfoL());
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_EXIT, "CTzConfigAgent::SetAutoUpdateBehaviorL Exit" );
+    
     }
 
  /**
@@ -960,6 +1028,9 @@
 */
 TInt CTzConfigAgent::SetHomeTimeL(const TTime& aHomeTime)     
 	{
+    OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETHOMETIMEL_ENTRY, "CTzConfigAgent::SetHomeTimeL Entry;YY=%d;MM=%d;DD=%d;HH=%d;Min=%d", aHomeTime.DateTime().Year(),aHomeTime.DateTime().Month(),aHomeTime.DateTime().Day(),aHomeTime.DateTime().Hour(), aHomeTime.DateTime().Minute() );
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETHOMETIMEL_PARAM, "Parameter..;SS=%d", aHomeTime.DateTime().Second() );
+    
 	TTime utcTime(aHomeTime);
 
 	ConvertL(utcTime, ETzWallTimeReference);
@@ -992,12 +1063,15 @@
 	iChangeNotifier->Start();
 	
 	TRAP_IGNORE(PublishNewDstChangeInfoL());
-
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETHOMETIMEL_EXIT, "CTzConfigAgent::SetHomeTimeL Exit;result=%u", result );
 	return result;
 	}
 
 TInt CTzConfigAgent::SetUnknownTimeZoneTimeL(const TTime& aUTCTime, const TInt aUTCOffset, TBool aPersistInCenRep)     
 	{
+    
+    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_ENTRY, "CTzConfigAgent::SetUnknownTimeZoneTimeL Entry;aUTCOffset=%d;aPersistInCenRep=%u", aUTCOffset, aPersistInCenRep );
+    
 	//
 	// Cancel DST timer. (It will not be restarted, as we won't have DST rules for this unknown zone)
 	//
@@ -1016,7 +1090,7 @@
 	// Restart environment change notification.
 	//
 	iChangeNotifier->Start();
-
+    
 	User::LeaveIfError(result);
 
 	TInt oldTzId = iSystemTzCache->TimeZoneId().TimeZoneNumericID();
@@ -1056,9 +1130,13 @@
 	change.iOldTimeZoneId = oldTzId;
 
 	TPckgBuf<NTzUpdate::TTimeZoneChange> changeBuf(change);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,PUBLISH_UPDATE_NOTIFICATION, TZCHANGE_NOTIFICATION, "CTzConfigAgent::SetUnknownTimeZoneTimeL:TTimeZoneChange Notification" );
+	
 	RProperty::Set(NTzUpdate::KPropertyCategory, NTzUpdate::ECurrentTimeZoneId, changeBuf);
 
 	iTzDataProvider->ReleaseTzRules();
+	
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_EXIT, "CTzConfigAgent::SetUnknownTimeZoneTimeL Exit;KErrNone=%d", KErrNone );
 
 	return KErrNone;
 	}
@@ -1176,6 +1254,8 @@
 	}
 void CTzConfigAgent::NotifyUserTzRulesChangeL(TTzUserDataChange aChange)
 	{
+    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_ENTRY, "CTzConfigAgent::NotifyUserTzRulesChangeL Entry;Operation=%u;Time zone Id=%u",aChange.iOperation , aChange.iTzId );
+    
 	//Only interested when a user TZ rule is updated or deleted
 	if (aChange.iOperation == ETzUserDataUpdated ||	aChange.iOperation == ETzUserDataDeleted)
 		{	
@@ -1205,6 +1285,8 @@
 			CleanupStack::PopAndDestroy(tzid);	
 			}
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_EXIT, "CTzConfigAgent::NotifyUserTzRulesChangeL Exit" );
+	
 	}
  
 void CTzConfigAgent::NotifyUserTzNamesChange(TTzUserDataChange /*aChange*/)
@@ -1251,6 +1333,8 @@
 
 void CTzConfigAgent::RestoreCompletedL(TInt aRestoreResult)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZCONFIGAGENT_RESTORECOMPLETEDL_ENTRY, "CTzConfigAgent::RestoreCompletedL Entry;aRestoreResult=%u", aRestoreResult );
+    
 	if(aRestoreResult == KErrNone)
 		{
 		//Both read only DB and user defined DB will refresh the data
@@ -1295,8 +1379,12 @@
 		NTzUpdate::TTzNamesChange namesChange;
 		namesChange.iUTCTimeOfNamesChange.UniversalTime();
 		TPckgBuf<NTzUpdate::TTzNamesChange> bufNames(namesChange);
+		OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,PUBLISH_UPDATE_NOTIFICATION, TZNAMES_CHANGE_NOTIFICATION_4, "CTzConfigAgent::RestoreCompletedL: TzNames change notification" );
+		
 		RProperty::Set(NTzUpdate::KPropertyCategory, NTzUpdate::ETzNamesChange, bufNames);	
 		}
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,PUBLISH_UPDATE_NOTIFICATION, CTZCONFIGAGENT_RESTORECOMPLETEDL_EXIT, "CTzConfigAgent::RestoreCompletedL Exit" );
+	
 	}
 //------------------------------------------------------------------------------------
 CTZRulesCache::~CTZRulesCache()
@@ -1316,6 +1404,8 @@
 
 const CTzRules& CTZRulesCache::doGetEncodedTimeZoneRulesL(TInt aStartYear, TInt aEndYear)
 	{
+    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_ENTRY, "CTZRulesCache::doGetEncodedTimeZoneRulesL Entry;aStartYear=%d;aEndYear=%d", aStartYear, aEndYear );
+    
 	CTzDataProvider& tzDataProvider = iTimeZoneConfigAgent.TzDataProvider();
 	
 	CTzRules* newRules = CTzRules::NewL(aStartYear, aEndYear);
@@ -1329,12 +1419,17 @@
 	// replace current cached rules
 	delete iEncodedRules;
 	iEncodedRules = newRules;
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_EXIT, "CTZRulesCache::doGetEncodedTimeZoneRulesL Exit" );
+	
 	
 	return *iEncodedRules;
 	}
 	
 void CTZRulesCache::doGetActualisedTimeZoneRulesL(const TTime& aTime)
 	{
+     OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_ENTRY, "CTZRulesCache::doGetActualisedTimeZoneRulesL Entry;YY=%d;MM=%d;DD=%d;HH=%d;MIN=%d", aTime.DateTime().Year(),aTime.DateTime().Month(),aTime.DateTime().Day(),aTime.DateTime().Hour(),aTime.DateTime().Minute() );
+     OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_PARAM, "Parameters..;SS=%d",aTime.DateTime().Second());
+     
 	TDateTime dateTime(aTime.DateTime() );
 
 	// At least we need the rule for the year preceeding the converted time
@@ -1368,6 +1463,8 @@
 	// replace current cached rules
 	delete iActualisedRules;
 	iActualisedRules = newRules;
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_EXIT, "CTZRulesCache::doGetActualisedTimeZoneRulesL Exit" );
+	
 	}
 	
 void CTZRulesCache::ConstructL(const CTzId& aTimeZoneId, const TTime& aTime)
@@ -1436,6 +1533,7 @@
 
 TInt CTZRulesCache::GetEncodedTimeZoneRulesSizeL(const TTime& aStartTime, const TTime& aEndTime, TTzTimeReference /*aTimeRef */)
 	{
+    
 	// fetch a new set of rules from the data provider if the range of the rules in iEncodedRules does not
 	// contain both aStartTime and aEndTime
 	if (
@@ -1461,6 +1559,7 @@
 
 CVTzActualisedRules& CTZRulesCache::GetTimeZoneRulesL(const TTime& aTime,TTzTimeReference aTimerRef)
 	{
+    
     if ((iTimeZoneId->TimeZoneNumericID() != KUnknownTZId) 
 		&& (!(RuleApplies(*iActualisedRules, aTime, aTimerRef))))
 		{
@@ -1475,6 +1574,9 @@
 TBool CTZRulesCache::RuleApplies(CVTzActualisedRules& actRules, 
     const TTime& aTime, TTzTimeReference aTimerRef) const 
 	{
+    OstTraceDefExt5( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZRULESCACHE_RULEAPPLIES_ENTRY, "CTZRulesCache::RuleApplies Entry;actRules Start year=%d;actRules End year=%d;aTime:YY=%d;aTime:MM=%d;aTime:DD=%d", actRules.StartYear(),  actRules.EndYear(),aTime.DateTime().Year(),aTime.DateTime().Month(),aTime.DateTime().Day() );
+    OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZRULESCACHE_RULEAPPLIES_ENTRY_PARAM, "Parametere cont..;aTime:Hours=%d;aTime:Min=%d;aTime:Sec=%d;aTimerRef=%u",aTime.DateTime().Hour(), aTime.DateTime().Minute(), aTime.DateTime().Second(), aTimerRef );
+    
 	TInt startYear = actRules.StartYear();
 	TInt endYear = actRules.EndYear();
 	
@@ -1508,6 +1610,8 @@
 		
 	const TTime KStart(TDateTime(startYear, EJanuary, 0, 0, 0, 0, 0));
 	const TTime KEnd(TDateTime(endYear, EJanuary, 0, 0, 0, 0, 0));
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZRULESCACHE_RULEAPPLIES_EXIT, "CTZRulesCache::RuleApplies Exit" );
+	
 	return ((aTime >= KStart) && (aTime < KEnd));
 	}

--- a/tzservices/tzserver/Server/Source/timezoneserver.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/timezoneserver.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -17,6 +17,11 @@
 #endif
 #include "timezoneserver.h"
 #include "timezonesession.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "timezoneserverTraces.h"
+#endif
+
 
 // Set server priority
 const TInt KServerPriority = 0;  // EStandard Priority
@@ -94,6 +99,8 @@
 //
 void CTzServer::ConstructL()
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVER_CONSTRUCTL_ENTRY, "CTzServer::ConstructL Entry" );
+    
 	iTzUserDataDb = CTzUserDataDb::NewL();
 	iTzSwiObserver = CTzSwiObserver::NewL();
 	iTimeZoneMgr = CTzConfigAgent::NewL(*this, *iTzUserDataDb, *iTzSwiObserver);
@@ -102,20 +109,29 @@
 	iTzUserDataDb->AddObserverL(iTimeZoneMgr);
 	iTimeZoneMgr->AddObserverL(iTzLocalizationDb);
 	StartL(KTimeZoneServerName); 
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVER_CONSTRUCTL_EXIT, "CTzServer::ConstructL Exit" );
+	
 	}
 
 // Create a new server session
 CSession2* CTzServer::NewSessionL(const TVersion& aVersion,const RMessage2& /*aMessage*/) const
 	{
+    OstTraceDefExt3( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVER_NEWSESSIONL_ENTRY, "CTzServer::NewSessionL Entry;Major version No=%hhd;Minorr version No=%hhd;Build  version No=%hd", aVersion.iMajor, aVersion.iMinor, aVersion.iBuild );
+    
+    
 	TVersion ver(KTimeZoneServerMajorVersion, KTimeZoneServerMinorVersion, KTimeZoneServerBuildVersion);
 	if (!User::QueryVersionSupported(ver,aVersion))
 		{
+	    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_ERROR, CTZSERVER_NEWSESSIONL, "CTzServer::NewSessionL Version not supported  Error value: %d", KErrNotSupported );
+	    
 		User::Leave(KErrNotSupported);
 		}
 
 	CTzServerSession* session = CTzServerSession::NewL();
 
 	SessionAdded();
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, DUP1_CTZSERVER_NEWSESSIONL_EXIT, "CTzServer::NewSessionL Exit" );
+	
 	return session;
 	}
 
@@ -141,6 +157,7 @@
 // if there is no pending request
 void CTzServer::NotifyTZStatusChange(RTz::TTzChanges aChange, const TAny* aRequester)
 	{
+    
 	iSessionIter.SetToFirst();
 	CSession2* pS;
 	while ((pS = iSessionIter++)!=NULL)

--- a/tzservices/tzserver/Server/Source/timezonesession.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/timezonesession.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -24,6 +24,11 @@
 #include <tzlocalizedtimezonerecord.h>
 #include "timezonesession.h"
 #include "timezoneserver.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "timezonesessionTraces.h"
+#endif
+
 
 CTzServerSession* CTzServerSession::NewL()
 	{
@@ -83,6 +88,9 @@
 // Server
 TInt CTzServerSession::doRegisterTzChangeNotifier(const RMessage2& aMessage)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_ENTRY, "CTzServerSession::doRegisterTzChangeNotifier Entry" );
+    
+    
 	if (!iPendingRequest)
 		{
 		iClientMessage = aMessage;
@@ -93,10 +101,14 @@
 		// the same client already requested such notice
 		// Panic the client
 		iPendingRequest = EFalse;
+		OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FATAL, CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_PANIC, "CTzServerSession::doRegisterTzChangeNotifier : The same client already requested such notice" );
+		
 		aMessage.Panic(KTimeZoneServerName, RTz::EPanicNotificationRequestPending);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT, "CTzServerSession::doRegisterTzChangeNotifier Exit;KErrCancel=%d", KErrCancel );
 		
 		return (KErrCancel);
 		}
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT2, "CTzServerSession::doRegisterTzChangeNotifier Exit ;KRequestPending=%d", KRequestPending );
 
 	return KRequestPending;
 	}
@@ -122,6 +134,8 @@
 
 TInt CTzServerSession::doSetTimeZoneL(const RMessage2& aMessage)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOSETTIMEZONEL_ENTRY, "CTzServerSession::doSetTimeZoneL Entry" );
+    
 	CBufFlat* buffer = CBufFlat::NewL(KMaxTimeZoneIdSize);
 	CleanupStack::PushL(buffer);
 
@@ -141,11 +155,16 @@
 	if (err == KErrArgument)
 	    {
     	CleanupStack::PopAndDestroy(buffer);
+      	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOSETTIMEZONEL_PANIC, "CTzServerSession::doSetTimeZoneL: Panic: EPanicInvalidArgument" );
+      	
         aMessage.Panic(KTimeZoneServerName, RTz::EPanicInvalidArgument);
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOSETTIMEZONEL_EXIT, "CTzServerSession::doSetTimeZoneL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
 	    }
 	else
 	    {
+	    
 	    User::LeaveIfError(err);
 	    }
 	
@@ -165,12 +184,15 @@
 	aMessage.WriteL(1, buffer->Ptr(0));
 
 	CleanupStack::PopAndDestroy(buffer);
-
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOSETTIMEZONEL_EXIT2, "CTzServerSession::doSetTimeZoneL Exit;KErrNone=%d", KErrNone );
+	
 	return (KErrNone);
 	}
 	
 TInt CTzServerSession::doIsDaylightSavingOnL(const RMessage2& aMessage)
 {
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_ENTRY, "CTzServerSession::doIsDaylightSavingOnL Entry" );
+    
 	CBufFlat* buffer = CBufFlat::NewL(KMaxTimeZoneIdSize);
 	CleanupStack::PushL(buffer);
 	// Read from client message buffer
@@ -194,7 +216,11 @@
 	if (err == KErrArgument)
 	    {
     	CleanupStack::PopAndDestroy(buffer);
+    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FATAL, CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_PANIC, "CTzServerSession::doIsDaylightSavingOnL:Client Sent invalid data to server to panic" );
+    	
         aMessage.Panic( KTimeZoneServerName, RTz::EPanicInvalidArgument );
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT, "CTzServerSession::doIsDaylightSavingOnL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
 	    }
 	else
@@ -215,11 +241,16 @@
 	TPckg<TInt> response(isDaylightSavingOn);
 	aMessage.WriteL(2, response);
 	CleanupStack::PopAndDestroy(buffer);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT2, "CTzServerSession::doIsDaylightSavingOnL Exit;KErrNone=%d", KErrNone );
+	
 	return (KErrNone);
 }
 
 TInt CTzServerSession::doGetLocalTimeZoneIdL(const RMessage2& aMessage)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_ENTRY, "CTzServerSession::doGetLocalTimeZoneIdL Entry" );
+    
+    
 	const CTzId& KZoneId = TzServer()->TimeZoneManager().GetTimeZoneIdL();
 
 	CBufFlat* buffer = CBufFlat::NewL(KMaxTimeZoneIdSize);
@@ -237,12 +268,16 @@
 	aMessage.WriteL(0, buffer->Ptr(0));
 
 	CleanupStack::PopAndDestroy(buffer);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_EXIT, "CTzServerSession::doGetLocalTimeZoneIdL Exit;KErrNone=%d", KErrNone );
+	
 	return (KErrNone);
 
 	}
 
 TInt CTzServerSession::doGetLocalEncodedTimeZoneRulesL(const RMessage2& aMessage)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_ENTRY, "CTzServerSession::doGetLocalEncodedTimeZoneRulesL Entry" );
+    
 	TPckgBuf<TInt> rulesSizeBuffer;
 	aMessage.ReadL(0, rulesSizeBuffer);
 
@@ -252,7 +287,11 @@
     const TInt KMaxSize = KMaxTInt / 2;
     if (size <= 0 || size >= KMaxSize)
         {
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FATAL, CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_PANIC, "CTzServerSession::doGetLocalEncodedTimeZoneRulesL:Invalid rules buffer size sent by client to server" );
+        
         aMessage.Panic( KTimeZoneServerName, RTz::EPanicInvalidArgument );
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT, "CTzServerSession::doGetLocalEncodedTimeZoneRulesL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
         }
 
@@ -271,7 +310,11 @@
 	if (err == KErrArgument)
 	    {
 	    CleanupStack::PopAndDestroy(buffer);
+	    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FATAL, CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_PANIC2, "CTzServerSession::doGetLocalEncodedTimeZoneRulesL:Invalid data sent by client to Server" );
+	    
         aMessage.Panic( KTimeZoneServerName, RTz::EPanicInvalidArgument );
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT2, "CTzServerSession::doGetLocalEncodedTimeZoneRulesL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
 	    }
 	else
@@ -286,6 +329,8 @@
 	aMessage.WriteL(1, buffer->Ptr(0));
 	
 	CleanupStack::PopAndDestroy(buffer);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT3, "CTzServerSession::doGetLocalEncodedTimeZoneRulesL Exit;KErrNone=%d", KErrNone );
+	
 	return KErrNone;
 	}
 
@@ -312,6 +357,8 @@
 
 TInt CTzServerSession::doGetForeignEncodedTimeZoneRulesL(const RMessage2& aMessage)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_ENTRY, "CTzServerSession::doGetForeignEncodedTimeZoneRulesL Entry" );
+    
 	TPckgBuf<TInt> rulesSizeBuffer;
 	aMessage.ReadL(0, rulesSizeBuffer);
    
@@ -321,7 +368,11 @@
     const TInt KMaxSize = KMaxTInt/2;
     if (size <= 0 || size >= KMaxSize)
         {
+        OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FATAL, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC, "CTzServerSession::doGetForeignEncodedTimeZoneRulesL Panic: EPanicInvalidArgument" );
+        
         aMessage.Panic( KTimeZoneServerName, RTz::EPanicInvalidArgument );
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT, "CTzServerSession::doGetForeignEncodedTimeZoneRulesL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
         }
 
@@ -339,7 +390,11 @@
 	if (err == KErrArgument)
 	    {
 	    CleanupStack::PopAndDestroy(buffer);
+	    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FATAL, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC2, "CTzServerSession::doGetForeignEncodedTimeZoneRulesL:Invalid data sent by client to Server" );
+	    
         aMessage.Panic( KTimeZoneServerName, RTz::EPanicInvalidArgument );
+      OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT2, "CTzServerSession::doGetForeignEncodedTimeZoneRulesL Exit;KRequestPending=%d", KRequestPending );
+      
         return KRequestPending;
 	    }
 	else
@@ -347,6 +402,7 @@
 	    User::LeaveIfError(err);
 	    }
 	
+
 	writeStream.CommitL();
 	writeStream.Close();
 	
@@ -354,11 +410,15 @@
 	aMessage.WriteL(1, buffer->Ptr(0));
 	
 	CleanupStack::PopAndDestroy(buffer);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT3, "CTzServerSession::doGetForeignEncodedTimeZoneRulesL Exit;KErrNone=%d", KErrNone );
+	
 	return KErrNone;
 	}
 	
 TInt CTzServerSession::doGetForeignEncodedTimeZoneRulesSizeL(const RMessage2& aMessage)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_ENTRY, "CTzServerSession::doGetForeignEncodedTimeZoneRulesSizeL Entry" );
+    
 	TPckgBuf<TTime> startTimeBuffer;
 	aMessage.ReadL(0, startTimeBuffer);
 
@@ -384,7 +444,11 @@
 	if (err == KErrArgument)
 	    {
 	    CleanupStack::PopAndDestroy(buffer);
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FATAL, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_PANIC, "CTzServerSession::doGetForeignEncodedTimeZoneRulesSizeL Panic: Invalid   data sent by client to server" );
+	    
         aMessage.Panic( KTimeZoneServerName, RTz::EPanicInvalidArgument );
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT, "CTzServerSession::doGetForeignEncodedTimeZoneRulesSizeL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
 	    }
 	else
@@ -406,6 +470,8 @@
 	aMessage.WriteL(3, rulesSizeBuffer);
 
 	CleanupStack::PopAndDestroy(2,buffer);
+	OstTraceDef1(  OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT2, "CTzServerSession::doGetForeignEncodedTimeZoneRulesSizeL Exit;KErrNone=%d", KErrNone );
+	
 	return KErrNone;
 	}
 
@@ -430,6 +496,8 @@
 
 TInt CTzServerSession::doConvertForeignZoneTimeL(const RMessage2& aMessage)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_ENTRY, "CTzServerSession::doConvertForeignZoneTimeL Entry" );
+    
 	TPckgBuf<TTime> timeBuffer;
 	aMessage.ReadL(0, timeBuffer);
 
@@ -455,7 +523,11 @@
 	if (err == KErrArgument)
 	    {
 	    CleanupStack::PopAndDestroy(buffer);
+	    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FATAL, CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_PANIC, "CTzServerSession::doConvertForeignZoneTimeL panic: Invalid data sent by client" );
+	    
         aMessage.Panic( KTimeZoneServerName, RTz::EPanicInvalidArgument );
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT, "CTzServerSession::doConvertForeignZoneTimeL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
 	    }
 	else
@@ -473,6 +545,8 @@
 	aMessage.WriteL(3, timeInBuffer);
 
 	CleanupStack::PopAndDestroy(2);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT2, "CTzServerSession::doConvertForeignZoneTimeL Exit;KErrNone=%d", KErrNone );
+	
 	return (KErrNone);
 	}
 	
@@ -481,13 +555,19 @@
 */
 TInt CTzServerSession::doGetOffsetsForTimeZoneIdsL(const RMessage2& aMessage) const
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_ENTRY, "CTzServerSession::doGetOffsetsForTimeZoneIdsL Entry" );
+    
 	TInt bufferSize = aMessage.Int0();				
     
     // If buffer size invalid then panic client.
     const TInt KMaxSize = KMaxTInt / 4;
     if (bufferSize <= 0 || bufferSize > KMaxSize)
         {
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FATAL, CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_PANIC, "CTzServerSession::doGetOffsetsForTimeZoneIdsL panic:Invalid buffer size sent by client" );
+        
         aMessage.Panic( KTimeZoneServerName, RTz::EPanicInvalidArgument );
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_EXIT, "CTzServerSession::doGetOffsetsForTimeZoneIdsL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
         }
 	
@@ -504,6 +584,7 @@
 	aMessage.WriteL(1, idBuf->Ptr(0));
 
 	CleanupStack::PopAndDestroy(idBuf);
+	OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL, "CTzServerSession::doGetOffsetsForTimeZoneIdsL;KErrNone=%d", KErrNone );
 		
 	return KErrNone;
 	}
@@ -543,6 +624,8 @@
 	change.iOldTimeZoneId = aMessage.Int1();
 		
 	TPckgBuf<NTzUpdate::TTimeZoneChange> changeBuf(change);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,PUBLISH_UPDATE_NOTIFICATION, TTIME_ZONE_CHANGE, "CTzServerSession::doNotifyHomeTimeZoneChanged: Time zone change notification" );
+	
 	return RProperty::Set(NTzUpdate::KPropertyCategory, NTzUpdate::EHomeTimeZoneId, changeBuf);
 	}
 
@@ -573,6 +656,9 @@
  */	
 TInt CTzServerSession::doCreateUserTimeZoneL(const RMessage2& aMessage)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_ENTRY, "CTzServerSession::doCreateUserTimeZoneL Entry" );
+    
+    
 	const TInt buffersize = aMessage.Int0();
 	
 	CBufFlat* buffer = CBufFlat::NewL(buffersize);
@@ -593,7 +679,11 @@
 	if (err == KErrArgument)
 	    {
     	CleanupStack::PopAndDestroy(2, buffer);
+     OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FATAL, CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_FATAL, "CTzServerSession::doCreateUserTimeZoneL:Panic:EPanicInvalidArgument" );
+    	 	 
         aMessage.Panic(KTimeZoneServerName, RTz::EPanicInvalidArgument);
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT, "CTzServerSession::doCreateUserTimeZoneL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
 	    }
 	else
@@ -609,6 +699,8 @@
 	CleanupStack::PopAndDestroy(4, buffer);
 	TPckgBuf<TInt> idBuffer(id);
 	aMessage.WriteL(2, idBuffer);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT2, "CTzServerSession::doCreateUserTimeZoneL Exit;KErrNone=%d", KErrNone );
+	
 	return KErrNone;
 	}
 
@@ -620,6 +712,8 @@
  */	
 TInt CTzServerSession::doUpdateUserTimeZoneL(const RMessage2& aMessage)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_ENTRY, "CTzServerSession::doUpdateUserTimeZoneL Entry" );
+    
 	const TInt buffersize = aMessage.Int0();
 	
 	CBufFlat* buffer = CBufFlat::NewL(buffersize);
@@ -640,7 +734,11 @@
 	if (err == KErrArgument)
 	    {
     	CleanupStack::PopAndDestroy(2, buffer);
+    	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FATAL, CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_PANIC, "CTzServerSession::doUpdateUserTimeZoneL Panic: Invalid data sent by client to server" );
+    	
         aMessage.Panic(KTimeZoneServerName, RTz::EPanicInvalidArgument);
+        OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT, "CTzServerSession::doUpdateUserTimeZoneL Exit;KRequestPending=%d", KRequestPending );
+        
         return KRequestPending;
 	    }
 	else
@@ -657,6 +755,8 @@
 	
     TzServer()->UserTimeZoneDb().UpdateTzL(id, *rules, *names);
 	CleanupStack::PopAndDestroy(4, buffer);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT2, "CTzServerSession::doUpdateUserTimeZoneL Exit" );
+	
 	return KErrNone;
 	}
 	
@@ -697,6 +797,8 @@
 */	
  TInt CTzServerSession::doGetUserTimeZoneNamesL(const RMessage2& aMessage)
 	{
+     OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_ENTRY, "CTzServerSession::doGetUserTimeZoneNamesL Entry" );
+          
 	TInt size = iTzUserDataCache->SizeOfNames();
 	if ( size > 0 )
 		{
@@ -712,8 +814,12 @@
 		writeStream.CommitL();
 		aMessage.WriteL(0, buffer->Ptr(0));
 		CleanupStack::PopAndDestroy(2, buffer);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT, "CTzServerSession::doGetUserTimeZoneNamesLExit;KErrNone=%d", KErrNone );
+		
 		return KErrNone;
 		}
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT2, "CTzServerSession::doGetUserTimeZoneNamesL Exit;KErrArgument=%d", KErrArgument );
+	
 	return KErrArgument;
 	}
 	
@@ -723,6 +829,7 @@
  */		
 TInt CTzServerSession::doGetUserTimeZoneIdsSizeL(const RMessage2& aMessage)
 	{
+    
 	RArray<TUint32> ids;
 	CleanupClosePushL(ids);
 	TzServer()->UserTimeZoneDb().ReadTzIdsL(ids);
@@ -742,6 +849,7 @@
  */	
 TInt CTzServerSession::doGetUserTimeZoneIdsL(const RMessage2& aMessage)
 	{
+    
 	CBufFlat* buffer = CBufFlat::NewL(iTzUserDataCache->SizeOfIds());
 	CleanupStack::PushL(buffer);
 	buffer->ExpandL(0,iTzUserDataCache->SizeOfIds());
@@ -764,6 +872,7 @@
 
 TInt CTzServerSession::doGetHeapSizeL(const RMessage2& aMessage)
 	{
+    
 	TInt reply = User::Heap().Count();
 	TInt sizeInBytes;
 	reply = User::AllocSize(sizeInBytes);
@@ -776,6 +885,7 @@
 
 TInt CTzServerSession::doLocalizationReadCitiesSizeL(const RMessage2& aMessage)
 	{
+    
 	iCitiesResultCache.ResetAndDestroy();
 	TzServer()->LocalizationDb().ReadCitiesL(iCitiesResultCache);
 	TInt resultSize = CTzLocalizedCityRecord::ExternalizeSize(iCitiesResultCache);
@@ -789,6 +899,7 @@
 
 TInt CTzServerSession::doLocalizationReadCitiesTzIdSizeL(const RMessage2& aMessage)
 	{
+        
 	iCitiesResultCache.ResetAndDestroy();
 	TzServer()->LocalizationDb().ReadCitiesL(iCitiesResultCache, aMessage.Int1());
 	TInt resultSize = CTzLocalizedCityRecord::ExternalizeSize(iCitiesResultCache);
@@ -802,6 +913,7 @@
 
 TInt CTzServerSession::doLocalizationReadCitiesInGroupSizeL(const RMessage2& aMessage)
 	{
+    
 	iCitiesResultCache.ResetAndDestroy();
 	TzServer()->LocalizationDb().ReadCitiesInGroupL(iCitiesResultCache, aMessage.Int1());
 	TInt resultSize = CTzLocalizedCityRecord::ExternalizeSize(iCitiesResultCache);
@@ -815,6 +927,7 @@
 
 TInt CTzServerSession::doLocalizationReadCitiesL(const RMessage2& aMessage)
 	{
+    
 	TInt maxSize = aMessage.GetDesLengthL(0);
 	CBufFlat* buffer = CBufFlat::NewL(maxSize);
 	CleanupStack::PushL(buffer);
@@ -1022,6 +1135,9 @@
 
 void CTzServerSession::ServiceL(const RMessage2& aMessage)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZSERVERSESSION_SERVICEL_ENTRY, "CTzServerSession::ServiceL Entry" );
+    
+    
 	TInt reply = KErrNone;
 	switch(aMessage.Function())
 		{
@@ -1180,6 +1296,8 @@
 #if defined(_DEBUG)
 	User::Heap().Check();
 #endif
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZSERVERSESSION_SERVICEL_EXIT, "CTzServerSession::ServiceL Exit" );
+	
 	}
 
 const CTzServer* CTzServerSession::TzServer() const

--- a/tzservices/tzserver/Server/Source/tzdbentities.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/tzdbentities.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -16,6 +16,11 @@
 #include "tzdbentities.h"
 #include "ReadOnlyTzDb.h"
 #include <vtzrules.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tzdbentitiesTraces.h"
+#endif
+
 
 /**
 This const must match the last TTzRuleDay enumeration in tzdefines.h.
@@ -308,6 +313,8 @@
 
 CTzDbZone* CTzDbRegion::FindZoneL(TUint aCityNameReference)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBREGION_FINDZONEL_ENTRY, "CTzDbRegion::FindZoneL Entry;aCityNameReference=%u", aCityNameReference );
+    
 	TTzRegionalZoneIndex* zoneIndex = const_cast<TTzRegionalZoneIndex*>(&iReadOnlyTzDb.GetTRegionalZoneIndex(iPersistedEntity.iOffsetToRegionalZoneIndex));
 	const TInt KZoneCount = zoneIndex->iNumberOfZones;
 	TTzZone* tzone(NULL);
@@ -321,11 +328,15 @@
 		}
 
 	// if it gets here, it means that the zone has not been found
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBREGION_FINDZONEL_EXIT, "CTzDbRegion::FindZoneL Exit" );
+	
 	return NULL;
 	}
 
 CTzDbZone* CTzDbRegion::FindZoneL(const TDesC8& aCityName)
 	{
+    OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDBREGION_FINDZONEL_ENTRY2, "CTzDbRegion::FindZoneL Entry;aCityName=%s", aCityName );
+    
 	TTzZone* tzone(NULL);
 	TTzRegionalZoneIndex* zoneIndex = const_cast<TTzRegionalZoneIndex*>(&iReadOnlyTzDb.GetTRegionalZoneIndex(iPersistedEntity.iOffsetToRegionalZoneIndex));
 	const TInt KZoneCount = zoneIndex->iNumberOfZones;
@@ -363,6 +374,7 @@
 			start = mid + 1;
 			}
 		}
+OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDBREGION_FINDZONEL_EXIT2, "CTzDbRegion::FindZoneL Exit;found=%u", found );
 
 	if (found)
 		{
@@ -390,6 +402,9 @@
 
 void CTzDbZone::GetRulesL(CTzRules& aRules)
 	{	
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDBZONE_GETRULESL_ENTRY, "CTzDbZone::GetRulesL Entry;Start year=%d;End year=%d",aRules.StartYear(), aRules.EndYear() );
+    
+    
 	// start and end years of interest
 	TInt firstYearOfInterest = aRules.StartYear();
 	TInt lastYearOfInterest = aRules.EndYear();
@@ -472,6 +487,8 @@
 				}
 			} // if IsTimeInStdTimeAlignment(...)
 		} // for
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBZONE_GETRULESL_EXIT, "CTzDbZone::GetRulesL Exit" );
+	
 			
 	}
 	
@@ -626,6 +643,8 @@
 
 void CTzDbStdTimeAlignment::GetRulesL(CTzRules& aRules, const TDateTime& aStartDateTime, TDateTime& aEndDateTime)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBSTDTIMEALIGNMENT_GETRULESL_ENTRY, "CTzDbStdTimeAlignment::GetRulesL Entry" );
+    
 	// get the ruleSet for this time alignment
 	CTzDbRuleSet* ruleSet = iReadOnlyTzDb.GetRuleSetL(iPersistedEntity.iOffsetToRuleSet);
 	if (ruleSet)
@@ -657,10 +676,14 @@
 	
 		CleanupStack::PopAndDestroy(2, ruleSet); // POP #2,#1 - NEWRULES, RULESET
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBSTDTIMEALIGNMENT_GETRULESL_EXIT, "CTzDbStdTimeAlignment::GetRulesL Exit" );
+	
 	}
 
 void CTzDbStdTimeAlignment::AddRulesToCollectionL(CTzRules& aRuleCollection, CTzRules& aNewRules)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_ENTRy, "CTzDbStdTimeAlignment::AddRulesToCollectionL Entry" );
+        
 	TTzRule* tRule(NULL);
 	TVTzActualisedRule tActRule;
 	TInt count = aNewRules.Count();
@@ -825,6 +848,8 @@
 				}		
 			}
 		} // for
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_EXIT, "CTzDbStdTimeAlignment::AddRulesToCollectionL Exit" );
+	
 	}
 
 TInt CTzDbStdTimeAlignment::UtcOffset()
@@ -973,6 +998,11 @@
 //
 void CTzDbRuleSet::GetRulesL(CTzRules& aTzRules, TInt aUtcOffset, const TDateTime& aStartDateTime, const TDateTime& aEndDateTime) const
 	{	
+    
+    OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBRULESET_GETRULESL_ENTRY, "CTzDbRuleSet::GetRulesL Entry;aUtcOffset=%d;Startdate:Year=%d;Month=%d;Day=%d;Hours=%d", aUtcOffset,aStartDateTime.Year(),aStartDateTime.Month() , aStartDateTime.Day(),aStartDateTime.Hour() );
+    OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBRULESET_GETRULESL_PARAM, "parameters cont..;Start date:Min=%d;Sec=%d;End Date:Year=%d;Month=%d;Day=%d", aStartDateTime.Minute(), aStartDateTime.Second(), aEndDateTime.Year(), aEndDateTime.Month(), aEndDateTime.Day() );
+    OstTraceDefExt3( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDBRULESET_GETRULESL_ENTRY_PARAM2, "parameters cont..;Hour=%d;Min=%d;Sec=%d", aEndDateTime.Hour(), aEndDateTime.Minute(), aEndDateTime.Second() );
+    
 	TInt startYear = aStartDateTime.Year();
 	// the last year we are interested in is the earliest of the following:
 	// 		1) the last year of the CTzRules
@@ -1000,6 +1030,8 @@
 	CompleteRulesAndAddToCollectionL(aTzRules,ruleDefs,ruleUses,aUtcOffset,initialLocalTimeOffset,aStartDateTime,endDateTime);
 	
 	CleanupStack::PopAndDestroy(2,&ruleDefs); // POP #2,#1 - ruleUses, ruleDefs
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBRULESET_GETRULESL_EXIT, "CTzDbRuleSet::GetRulesL Exit" );
+	
 	}
 
 TInt CTzDbRuleSet::GetLocalTimeOffsetAtEndOfYearL(TInt aYear, TInt aUtcOffset) const
@@ -1034,6 +1066,8 @@
 					TInt aUtcOffset, TInt aInitialLocalTimeOffset,
 					TDateTime aStart, TDateTime aEnd) const
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBRULESET_COMPLETERULESANDADDTOCOLLECTIONL_ENTRY, "CTzDbRuleSet::CompleteRulesAndAddToCollectionL Entry" );
+    
 	TInt count = aRuleDefs.Count();
 	if (count != aRuleUses.Count())
 		{
@@ -1120,7 +1154,9 @@
 			aTzRules.AddRuleL(trule);
 	
 			}
-		}	
+		}
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDBRULESET_COMPLETERULESANDADDTOCOLLECTIONL_EXIT, "CTzDbRuleSet::CompleteRulesAndAddToCollectionL Exit" );
+	
 	}
 
 void CTzDbRuleSet::FetchRuleDefinitionsL(RArray<TTzRuleDefinition*>& aTzRuleDefinitions, RArray<TTzRuleUse*>& aTzRuleUses, TInt aStartYear, TInt aEndYear) const
@@ -1151,6 +1187,8 @@
 
 void CTzDbRuleSet::ActualiseRuleDefinitionsL(CVTzActualisedRules& aActualisedRules, const RArray<TTzRuleDefinition*>& aTzRuleDefinitions, const RArray<TTzRuleUse*>& aTzRuleUses, TInt aUtcOffset, const TDateTime& aStartDateTime, const TDateTime& aEndDateTime, const TVTzActualisedRule& aDefaultRule) const
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZDBRULESET_ACTUALISERULEDEFINITIONSL_ENTRY, "CTzDbRuleSet::ActualiseRuleDefinitionsL Entry" );
+    
 	TInt startYear = aStartDateTime.Year();
 	TInt endYear = (aActualisedRules.EndYear() < (TUint)aEndDateTime.Year()) ? aActualisedRules.EndYear() : aEndDateTime.Year();	
 	TInt rulesAddedSoFar = 0;
@@ -1190,7 +1228,9 @@
 	if ( (rulesAddedSoFar == 0) || (yearOfFirstRule > startYear) )
 		{
 		aActualisedRules.AddRuleL(aDefaultRule);
-		}			
+		}	
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZDBRULESET_ACTUALISERULEDEFINITIONSL_EXIT, "CTzDbRuleSet::ActualiseRuleDefinitionsL Exit" );
+	
 	}
 	
 //============================================================================================

--- a/tzservices/tzserver/Server/Source/tzlocalizationdb.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/tzlocalizationdb.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -23,6 +23,11 @@
 #endif
 #include <tzlocalizedcityrecord.h>
 #include <tzlocalizedtimezonerecord.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tzlocalizationdbTraces.h"
+#endif
+
 
 // Database location and access policy
 _LIT(KTzLocalizationDbName,"c:TzLocalization.db");
@@ -115,6 +120,8 @@
 
 void CTzLocalizationDb::OpenDbL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_OPENDBL_ENTRY, "CTzLocalizationDb::OpenDbL Entry" );
+    
 	if (iZoneMutex.OpenGlobal(KTzMutexName) != KErrNone)
 		{
 		User::LeaveIfError(iZoneMutex.CreateGlobal(KTzMutexName)) ;
@@ -142,6 +149,8 @@
 		{
 		User::Leave(error);
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_OPENDBL_EXIT, "CTzLocalizationDb::OpenDbL Exit" );
+	
 	}
 
 void CTzLocalizationDb::CloseDb()
@@ -168,6 +177,8 @@
 */
 void CTzLocalizationDb::CreateBlankFrequentlyUsedZoneTableL()
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_ENTRY, "CTzLocalizationDb::CreateBlankFrequentlyUsedZoneTableL Entry" );
+    
 	// Create the columns for the cached zones table
 	RArray<TDbCol> cachedTableCols;
 	CleanupClosePushL(cachedTableCols);
@@ -226,6 +237,8 @@
 	CleanupStack::PopAndDestroy(&zoneView);
 	CleanupStack::PopAndDestroy(frequentlyUsedZoneColSet);
 	CleanupStack::PopAndDestroy(&cachedTableCols); //cachedTableCols
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_EXIT, "CTzLocalizationDb::CreateBlankFrequentlyUsedZoneTableL Exit" );
+	
 	}
 
 /**
@@ -262,6 +275,9 @@
 //Check if the database is corrupt or invalid.
 TBool CTzLocalizationDb::IsInvalidL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_ISINVALIDL_ENTRY, "CTzLocalizationDb::IsInvalidL Entry" );
+    
+    
 	RDbView zoneView;
 	CleanupClosePushL(zoneView);
 	PrepareZoneViewL(zoneView);
@@ -282,6 +298,8 @@
 		    }
 		}
 	CleanupStack::PopAndDestroy(&zoneView);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_ISINVALIDL_EXIT, "CTzLocalizationDb::IsInvalidL Exit;isInvalid=%u", isInvalid );
+	
 	return isInvalid;
 	}
 
@@ -316,14 +334,20 @@
 
 void CTzLocalizationDb::NotifyUserTzNamesChange(TTzUserDataChange aChange)
 	{
+    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_ENTRY, "CTzLocalizationDb::NotifyUserTzNamesChange Entry" );
+    
 	if (iLocked)
 		{
+	    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT, "CTzLocalizationDb::NotifyUserTzNamesChange Exit" );
+	    
 		return;
 		}
 	
 	if (aChange.iOperation == ETzUserDataCreated)
 		{
 		// Creation of new zones has no impact on existing zones
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT3, "CTzLocalizationDb::NotifyUserTzNamesChange Exit" );
+	    
 		return;
 		}
 	
@@ -336,12 +360,18 @@
 		// is to reboot the server.
 		iLocked = ETrue;
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT2, "CTzLocalizationDb::NotifyUserTzNamesChange Exit" );
+	
 	}
 
 void CTzLocalizationDb::NotifyTZDataStatusChangeL(RTz::TTzChanges aChange)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_ENTRY, "CTzLocalizationDb::NotifyTZDataStatusChangeL;aChange=%u", aChange );
+    
 	if (iLocked)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT, "CTzLocalizationDb::NotifyTZDataStatusChangeL Exit" );
+	    
 		return;
 		}
 	
@@ -426,6 +456,8 @@
 		CleanupStack::PopAndDestroy(&frequentlyUsedZones); 
 		CleanupStack::PopAndDestroy(systemDataDb);
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT2, "CTzLocalizationDb::NotifyTZDataStatusChangeL Exit" );
+	
 	}
 
 void CTzLocalizationDb::UpdateTimeZoneAndCityRecordForSystemDataL(RPointerArray<CTzLocalizedTimeZoneRecord>& aFrequentlyUsedZones, 
@@ -468,6 +500,8 @@
 	{
 	if (iLocked)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONDB_READCITIESL, "CTzLocalizationDb::ReadCitiesL:Database locked" );
+	    
 		User::Leave(KErrLocked);
 		}
 	_LIT(KSQLQueryLit,"SELECT * FROM UserCities");
@@ -478,6 +512,8 @@
 	{
 	if (iLocked)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, DUP1_CTZLOCALIZATIONDB_READCITIESL, "CTzLocalizationDb::ReadCitiesL:Database locked" );
+	    
 		User::Leave(KErrLocked);
 		}
 	// Assign basic SQL query literal
@@ -497,6 +533,8 @@
 	{
 	if (iLocked)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONDB_READCITIESINGROUPL, "CTzLocalizationDb::ReadCitiesInGroupL:Database locked" );
+	    
 		User::Leave(KErrLocked);
 		}
 	// Assign basic SQL query literal
@@ -522,6 +560,8 @@
 	{
 	if (iLocked)
 		{
+	    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_ERROR, CTZLOCALIZATIONDB_READFREQUENTLYUSEDZONEL, "CTzLocalizationDb::ReadFrequentlyUsedZoneL: Database locked;aFrequentlyUsedZone=%d", aFrequentlyUsedZone );
+	    
 		User::Leave(KErrLocked);
 		}
 	return DoReadFrequentlyUsedZoneL(aFrequentlyUsedZone);
@@ -570,6 +610,8 @@
 	{
 	if (iLocked)
 		{
+	    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_ERROR, CTZLOCALIZATIONDB_READCACHEDTIMEZONECITYL, "CTzLocalizationDb::ReadCachedTimeZoneCityL:Database locked;aFrequentlyUsedZone=%d", aFrequentlyUsedZone );
+	    
 		User::Leave(KErrLocked);
 		}
 	
@@ -612,8 +654,12 @@
 
 void CTzLocalizationDb::WriteCityL(const TDesC& aCityName, TUint16 aCityTzId, TUint8 aCityGroupId, TUint aCityTzResourceId)
 	{
+    OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP2_CTZLOCALIZATIONDB_WRITECITYL_ENTRY, "CTzLocalizationDb::WriteCityL Entry;aCityName=%S;aCityTzId=%hd;aCityGroupId=%hhu;aCityTzResourceId=%u", aCityName, aCityTzId, aCityGroupId, aCityTzResourceId );
+    
 	if (iLocked)
 		{
+	       OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONDB_WRITECITYL, "CTzLocalizationDb::WriteCityL:Database locked" );
+	       
 		User::Leave(KErrLocked);
 		}
 	
@@ -652,18 +698,24 @@
 	else
 		{
 		//City already exists.
+	   OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, DUP1_CTZLOCALIZATIONDB_WRITECITYL, "CTzLocalizationDb::WriteCityL:City already exists" );
+	   
 		User::Leave(KErrAlreadyExists);
 		}
 	CleanupStack::PopAndDestroy(&cityView);
 	iZoneMutex.Wait();
 	iLocalizedTimeZoneDb.Compact();
 	iZoneMutex.Signal();
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP2_CTZLOCALIZATIONDB_WRITECITYL_EXIT, "CTzLocalizationDb::WriteCityL Exit" );
+	
 	}
 
 void CTzLocalizationDb::DeleteCityL(const TDesC& aCityName, TUint16 aCityTzId)
 	{
 	if (iLocked)
 		{
+	  	    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_ERROR, CTZLOCALIZATIONDB_DELETECITYL, "CTzLocalizationDb::DeleteCityL:Database locked" );
+	  	    
 		User::Leave(KErrLocked);
 		}
 	
@@ -710,8 +762,11 @@
 void CTzLocalizationDb::WriteFrequentlyUsedZoneL(const CTzLocalizedTimeZoneRecord& aTimeZone, 
 		const CTzLocalizedCityRecord& aCity, TInt aFrequentlyUsedZone)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_ENTRY, "CTzLocalizationDb::WriteFrequentlyUsedZoneL Entry" );
+    
+    
 	if (iLocked)
-		{
+		{	   
 		User::Leave(KErrLocked);
 		}
 	
@@ -797,6 +852,8 @@
 	CleanupStack::PopAndDestroy(&zoneView);
 	iLocalizedTimeZoneDb.Compact();
 	iZoneMutex.Signal();
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_EXIT, "CTzLocalizationDb::WriteFrequentlyUsedZoneL Exit" );
+	
 	}
 
 /**
@@ -811,6 +868,8 @@
 	{
 	if (iLocked)
 		{
+	 OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZLOCALIZATIONDB_WRITEALLFREQUENTLYUSEDZONESL, "CTzLocalizationDb::WriteAllFrequentlyUsedZonesL:Database locked" );
+	 
 		User::Leave(KErrLocked);
 		}
 	DoWriteAllFrequentlyUsedZonesL(aTimeZones, aCities);
@@ -1008,6 +1067,8 @@
 
 void CTzLocalizationDb::NotifyUserTzNamesChangeL(TTzUserDataChange aChange)
 	{
+    OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_ENTRY, "CTzLocalizationDb::NotifyUserTzNamesChangeL Entry;Operation=%u;Time zone Id=%d",aChange.iOperation, aChange.iTzId );
+    
 	// If an existing user-defined time zone is updated it means we may have
 	// to refresh the data in the frequently used zones table but the city table
 	// only contains the time zone id so there is nothing to update in there.
@@ -1096,6 +1157,8 @@
 	CleanupStack::PopAndDestroy(&cachedCities); 
 	CleanupStack::PopAndDestroy(&frequentlyUsedZones);
 	CleanupStack::PopAndDestroy(systemDataDb);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_EXIT, "CTzLocalizationDb::NotifyUserTzNamesChangeL Exit" );
+	
 	}
 
 void CTzLocalizationDb::UpdateTimeZoneAndCityRecordL(RPointerArray<CTzLocalizedTimeZoneRecord>& aFrequentlyUsedZones, RPointerArray<CTzLocalizedCityRecord>& aCachedCities, TInt aTzId)
@@ -1188,6 +1251,8 @@
 
 void CTzLocalizationDb::RestoreDbL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_RESTOREDBL_ENTRY, "CTzLocalizationDb::RestoreDbL Entry" );
+    
 	// When the Tz server is connected or a restore completes, we have to
 	// refresh the data in the frequently used zones table and the city table
 	// because it may contain the time zone id that has been deleted.  Or if the
@@ -1250,6 +1315,8 @@
 	CleanupStack::PopAndDestroy(&cachedCities); 
 	CleanupStack::PopAndDestroy(&frequentlyUsedZones);
 	CleanupStack::PopAndDestroy(systemDataDb);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZLOCALIZATIONDB_RESTOREDBL_EXIT, "CTzLocalizationDb::RestoreDbL Exit" );
+	
 	}
 
 /**

--- a/tzservices/tzserver/Server/Source/tzsystemdata.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/tzsystemdata.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -17,6 +17,11 @@
 #include <bautils.h>
 #include <tzlocalizedcityrecord.h>
 #include <tzlocalizedtimezonerecord.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tzsystemdataTraces.h"
+#endif
+
 
 // Resource File locations
 _LIT(KTzLocalizationTimeZoneResourceFileName,"\\Resource\\TimeZoneLocalization\\timezones.rSC");
@@ -59,6 +64,7 @@
 */
 void CTzSystemDataDb::ConstructL()
 	{
+    
 	User::LeaveIfError(iFs.Connect());
 	
 	// If resource files are found on flash drive,
@@ -162,6 +168,8 @@
 		}
 
 	// If it's got to here the aId hasn't been found, so leave
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZSYSTEMDATADB_FINDTIMEZONERESOURCEIDL, "CTzSystemDataDb::FindTimeZoneResourceIdL:Time  zone resource id not found;aTimeZoneId=%d", aTimeZoneId );
+	
 	User::Leave(KErrNotFound);
 
 	return KErrNotFound;	// To satisfy compiler

--- a/tzservices/tzserver/Server/Source/tzuserdata.cpp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/Server/Source/tzuserdata.cpp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 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"
@@ -22,6 +22,11 @@
 #include <tzuserdefineddata.h>
 #endif
 #include "tzidinternal.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tzuserdataTraces.h"
+#endif
+
 
 _LIT(KUserDatabaseName, "c:\\private\\1020383e\\SQLite__tzuserdata.db");
 _LIT(KTzPrivatePath, "c:\\private\\1020383e\\");
@@ -182,6 +187,7 @@
 		
 void CTzUserDataDb::OpenL()
 	{
+    
 	RFs fs;
 	CleanupClosePushL(fs);
 	
@@ -202,6 +208,8 @@
 		}
 	else
 		{
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FATAL, CTZUSERDATADB_OPENL, "CTzUserDataDb::OpenL:Error while creating path;return value=%d", ret );
+	    
 		User::LeaveIfError(ret);
 		}
 	CleanupStack::PopAndDestroy(&fs);
@@ -216,6 +224,9 @@
 	
 void CTzUserDataDb::CreateSchemaL()
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_CREATESCHEMAL_ENTRY, "CTzUserDataDb::CreateSchemaL ENtry" );
+    
+    
 	RSqlStatement stmt;
 	CleanupClosePushL(stmt);
 	
@@ -243,12 +254,18 @@
 	stmt.Close();
 	
 	CleanupStack::PopAndDestroy(&stmt);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_CREATESCHEMAL_EXIT, "CTzUserDataDb::CreateSchemaL Exit" );
+	
 	}
 	
 TInt CTzUserDataDb::CreateTzL(const CTzRules& aRules, const CTzUserNames& aNames)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_CREATETZL_ENTRY, "CTzUserDataDb::CreateTzL Entry" );
+    
 	if(iBackupInProgress || iRestoreInProgress)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_CREATETZL_ERROR, "CTzUserDataDb::CreateTzL:Error:RestoreInProgress or RestoreInProgress" );
+	    
 		User::Leave(KErrLocked);
 		}
 
@@ -277,6 +294,8 @@
 	// If all the user IDs have been used, leave with KErrOverflow	
 	if(iNextCandidateTzId == KOutOfBoundsUserId)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_CREATETZL_ERROR1, "CTzUserDataDb::CreateTzL:All user ids has been used " );
+	    
 		User::Leave(KErrOverflow);		
 		}
 				
@@ -335,6 +354,8 @@
 		
 		if(ret < KErrNone)
 			{
+		    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_CREATETZL_ERROR2, "CTzUserDataDb::CreateTzL:Error while inserting rule:Error value=%d", ret );
+		    
 			User::Leave(ret);
 			}			
 		}
@@ -367,6 +388,8 @@
 	
 	if(ret < KErrNone)
 		{
+	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_CREATETZL_ERROR3, "CTzUserDataDb::CreateTzL:Errror while inserting a row in Names;Error value=%d", ret );
+	    
 		User::Leave(ret);
 		}
 
@@ -412,13 +435,19 @@
 	NotifyTzNamesChange(retId, ETzUserDataCreated);
 
 	CleanupStack::PopAndDestroy(&stmt);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_CREATETZL_EXIT, "CTzUserDataDb::CreateTzL Exit;retId=%u", retId );
+	
 	return retId;	
 	}
 	
 void CTzUserDataDb::ReadTzRulesL(CTzRules& aRules, TUint aTzId)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_READTZRULESL_ENTRY, "CTzUserDataDb::ReadTzRulesL Entry;aTzId=%u", aTzId );
+    
 	if(iBackupInProgress || iRestoreInProgress)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_READTZRULESL_ERROR, "CTzUserDataDb::ReadTzRulesL:Error:BackupInProgress or RestoreInProgress" );
+	    
 		User::Leave(KErrLocked);
 		}
 		
@@ -512,12 +541,18 @@
 	__ASSERT_ALWAYS(stmt.Next() == KSqlAtEnd, RTz::Panic(RTz::EPanicBadSchema));
 
 	CleanupStack::PopAndDestroy(&stmt);	
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_READTZRULESL_EXIT, "CTzUserDataDb::ReadTzRulesL Exit" );
+	
 	}
 
 CTzUserNames* CTzUserDataDb::ReadTzNamesL(TUint aTzId)
 	{
+    OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CTZUSERDATADB_READTZNAMESL_ENTRY, "CTzUserDataDb::ReadTzNamesL Entry;aTzId=%u", aTzId );
+    
 	if(iBackupInProgress || iRestoreInProgress)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_READTZNAMESL_ERROR, "CTzUserDataDb::ReadTzNamesL:Error:RestoreInProgress or RestoreInProgress " );
+	    
 		User::Leave(KErrLocked);
 		}
 
@@ -586,14 +621,20 @@
 	__ASSERT_ALWAYS(stmt.Next() == KSqlAtEnd, RTz::Panic(RTz::EPanicBadSchema));
 
 	CleanupStack::PopAndDestroy(&stmt);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_READTZNAMESL_EXIT, "CTzUserDataDb::ReadTzNamesL Exit" );
+	
 
 	return userNames;
 	}
 	
 void CTzUserDataDb::ReadTzIdsL(RArray<TUint32>& aTzIds)
 	{
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_READTZIDSL_ENTRY, "CTzUserDataDb::ReadTzIdsL Entry" );
+    
 	if(iBackupInProgress || iRestoreInProgress )
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_READTZIDSL_ERROR, "CTzUserDataDb::ReadTzIdsL:Error : BackupInProgress or RestoreInProgress" );
+	    
 		User::Leave(KErrLocked);
 		}
 	
@@ -614,12 +655,19 @@
 		}
 
 	CleanupStack::PopAndDestroy(&stmt);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_READTZIDSL_EXIT, "CTzUserDataDb::ReadTzIdsL Exit" );
+	
 	}
 	
 void CTzUserDataDb::UpdateTzL(TUint aTzId, const CTzRules& aTzRules, const CTzUserNames& aTzNames)
 	{	
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_UPDATETZL_ENTRY, "CTzUserDataDb::UpdateTzL Entry;aTzId=%u", aTzId );
+    
 	if(iBackupInProgress || iRestoreInProgress)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_UPDATETZL_ERROR, "CTzUserDataDb::UpdateTzL:Error:BackupInProgress or RestoreInProgress" );
+	    
+	    
 		User::Leave(KErrLocked);
 		} 
 		
@@ -797,6 +845,8 @@
 	NotifyTzNamesChange(aTzId, ETzUserDataUpdated);
 	
 	CleanupStack::PopAndDestroy(&stmt);	
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_UPDATETZL_EXIT, "CTzUserDataDb::UpdateTzL Exit" );
+	
 	}
     
 /**
@@ -804,8 +854,12 @@
 */
 void CTzUserDataDb::DeleteTzL(TUint aTzId)
 	{
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_DELETETZL_ENTRY, "CTzUserDataDb::DeleteTzL Entry;aTzId=%u", aTzId );
+    
 	if(iBackupInProgress || iRestoreInProgress)
 		{
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CTZUSERDATADB_DELETETZL_ERROR, "CTzUserDataDb::DeleteTzL:Error :BackupInProgress or RestoreInProgress" );
+	    
 		User::Leave(KErrLocked);
 		}
 		
@@ -855,6 +909,8 @@
 	NotifyTzNamesChange(aTzId, ETzUserDataDeleted);	
 	
 	CleanupStack::PopAndDestroy(&stmt);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CTZUSERDATADB_DELETETZL_EXIT, "CTzUserDataDb::DeleteTzL Exit" );
+	
 	}
 	
 void CTzUserDataDb::CleanupDatabaseRollback(TAny *aDatabase)
@@ -914,6 +970,7 @@
     
 void CTzUserDataDb::NotifyTzNamesChange(TUint aTzId, TTzUserDataChangeOp aChangeOp)
 	{
+    
 	TTzUserDataChange change;
 	change.iTzId = aTzId;
 	change.iOperation = aChangeOp;
@@ -930,6 +987,8 @@
 	NTzUpdate::TTzNamesChange namesChange;
 	namesChange.iUTCTimeOfNamesChange.UniversalTime();
 	TPckgBuf<NTzUpdate::TTzNamesChange> bufNames(namesChange);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,PUBLISH_UPDATE_NOTIFICATION, TZNAMES_CHANGE_NOTIFICATION_3, "CTzUserDataDb::NotifyTzNamesChange:Time zone names change notification" );
+	
 	RProperty::Set(NTzUpdate::KPropertyCategory, NTzUpdate::ETzNamesChange, bufNames);	
 	}

--- a/tzservices/tzserver/group/TimeZoneClient.mmp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/group/TimeZoneClient.mmp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 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"
@@ -33,7 +33,8 @@
 USERINCLUDE			../Client/Include
 USERINCLUDE			../Server/Include
 USERINCLUDE			../Include
-USERINCLUDE                     ../../../commonappservices/backuprestorenotification/inc
+USERINCLUDE                     ../../../commonappservices/backuprestorenotification/inc 
+USERINCLUDE                     ../traces
 
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN

--- a/tzservices/tzserver/group/TimeZoneServer.mmp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/group/TimeZoneServer.mmp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 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"
@@ -37,6 +37,7 @@
 USERINCLUDE		../Server/Include
 USERINCLUDE		../Include
 USERINCLUDE             ../../../commonappservices/backuprestorenotification/inc
+USERINCLUDE             ../traces
 
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN

--- a/tzservices/tzserver/test/Unit/group/DstUnitTests.mmp	Tue Oct 12 17:17:12 2010 +0300
+++ b/tzservices/tzserver/test/Unit/group/DstUnitTests.mmp	Wed Oct 20 17:03:03 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 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"
@@ -13,9 +13,9 @@
 // Description:
 //
 
-	CAPABILITY		All -TCB
-	TARGET			dstunittestserver.exe
-	TARGETTYPE		exe
+CAPABILITY		All -TCB
+TARGET			dstunittestserver.exe
+TARGETTYPE		exe
 	UID			0x1000007A 0x1028637D
 
 MACRO SYMBIAN_TZ_UNIT_TEST
@@ -49,6 +49,7 @@
 USERINCLUDE		../../../Include
 USERINCLUDE		../../../Client/Include
 USERINCLUDE		../../../Server/Include
+USERINCLUDE		../../../traces
 
 SOURCE 			../../../../Server/Source/DataProvider.cpp
 SOURCE 			../../../../Server/Source/readonlytzdb.cpp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/test/Unit/traces/OstTraceDefinitions.h	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* This is Default Licence added by TraceCompiler
+* Copyright (c) 2010 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 __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+
+#include <opensystemtrace.h>
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/test/Unit/traces/fixed_id.definitions	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,393 @@
+#
+# This is Default Licence added by TraceCompiler
+# Copyright (c) 2010 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: 
+#
+#
+
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]PUBLISH_UPDATE_NOTIFICATION=0xdf
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW_PARAM=0xe1
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_CTZCONFIGAGENT_RESTORECOMPLETEDL_EXIT=0xb
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_NEXT_DST_CHANGE=0x3
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TTIME_ZONE_CHANGE=0x7
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZCHANGE_NOTIFICATION=0x9
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZNAMES_CHANGE_NOTIFICATION=0x4
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZNAMES_CHANGE_NOTIFICATION_2=0x2
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZNAMES_CHANGE_NOTIFICATION_3=0x8
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZNAMES_CHANGE_NOTIFICATION_4=0xa
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZRULES_CHANGE_NOTIFICATION=0x5
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZRULES_CHANGE_NOTIFICATION_2=0x1
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_UTC_OFF_SET_CHANGE=0xc
+[TRACE]TRACE_ERROR[0x82]_CREADONLYTZDB_INITIALISEL=0x1a
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_DELETECITYL=0xe
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCACHEDTIMEZONECITYL=0x7
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCITIESINGROUPL=0xb
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCITIESL=0x9
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READFREQUENTLYUSEDZONEL=0x6
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_WRITEALLFREQUENTLYUSEDZONESL=0xf
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_WRITECITYL=0xc
+[TRACE]TRACE_ERROR[0x82]_CTZSERVER_NEWSESSIONL=0x5
+[TRACE]TRACE_ERROR[0x82]_CTZSYSTEMDATADB_FINDTIMEZONERESOURCEIDL=0x10
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR=0x11
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR1=0x12
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR2=0x13
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR3=0x14
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_DELETETZL_ERROR=0x19
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZIDSL_ERROR=0x17
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZNAMESL_ERROR=0x16
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZRULESL_ERROR=0x15
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_UPDATETZL_ERROR=0x18
+[TRACE]TRACE_ERROR[0x82]_DUP1_CTZLOCALIZATIONDB_READCITIESL=0xa
+[TRACE]TRACE_ERROR[0x82]_DUP1_CTZLOCALIZATIONDB_WRITECITYL=0xd
+[TRACE]TRACE_ERROR[0x82]_INVALID_TIME_ZONE=0x2
+[TRACE]TRACE_ERROR[0x82]_PROPERTY_DEFINITION=0x1
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_PANIC=0x7
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_FATAL=0x10
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC=0xf
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC2=0x5
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_PANIC=0x6
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_PANIC=0x3
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_PANIC2=0x4
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_PANIC=0x8
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_PANIC=0x2
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_PANIC=0x1
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_PANIC=0xa
+[TRACE]TRACE_FATAL[0x81]_CTZUSERDATADB_OPENL=0xe
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_COPYDATABASETORAM_ENTRY=0x1
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_COPYDATABASETORAM_EXIT=0x2
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY=0x4
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_FINDZONEBYNAMEL_EXIT=0xe
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_FINDZONEL_EXIT=0xd
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_FINDZONEL_EnTRY=0x3
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_ENTRY=0x9
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_EXIT=0xa
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_ENTRY=0xf
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_EXIT=0x10
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_PARAM=0x90
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_GETTZRULESL_ENTRY=0xb
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CREADONLYTZDB_GETTZRULESL_EXIT=0xc
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_ENTRY=0x1d
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_EXIT=0x1e
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_EXIT2=0x91
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_GETRESOURCEFILETIMESTAMPSL_ENTRY=0x15
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_GETRESOURCEFILETIMESTAMPSL_EXIT=0x16
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_ENTRY=0x1f
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_EXIT=0x20
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0x1b
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x1c
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_ENTRY=0x27
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_EXIT=0x28
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_ENTRY=0x17
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_EXIT=0x18
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_ENTRY=0x11
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_EXIT=0x12
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_READTIMESTAMPSL_ENTRY=0x13
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_READTIMESTAMPSL_EXIT=0x14
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_RESTORECOMPLETEDL_ENTRY=0x29
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_ENTRY=0x21
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_EXIT=0x22
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETHOMETIMEL_ENTRY=0x23
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETHOMETIMEL_EXIT=0x24
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETHOMETIMEL_PARAM=0x92
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETTIMEZONEL_ENTRY=0x19
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETTIMEZONEL_EXIT=0x1a
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_ENTRY=0x25
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_EXIT=0x26
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_ENTRY=0x5
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_EXIT=0x6
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBREGION_FINDZONEL_ENTRY=0x5d
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBREGION_FINDZONEL_ENTRY2=0x5f
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBREGION_FINDZONEL_EXIT=0x5e
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBREGION_FINDZONEL_EXIT2=0x60
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBRULESET_ACTUALISERULEDEFINITIONSL_ENTRY=0x6b
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBRULESET_ACTUALISERULEDEFINITIONSL_EXIT=0x6c
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBRULESET_COMPLETERULESANDADDTOCOLLECTIONL_ENTRY=0x69
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBRULESET_COMPLETERULESANDADDTOCOLLECTIONL_EXIT=0x6a
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBRULESET_GETRULESL_ENTRY=0x67
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBRULESET_GETRULESL_ENTRY_PARAM2=0x97
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBRULESET_GETRULESL_EXIT=0x68
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBRULESET_GETRULESL_PARAM=0x96
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_ENTRy=0x65
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_EXIT=0x66
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBSTDTIMEALIGNMENT_GETRULESL_ENTRY=0x63
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBSTDTIMEALIGNMENT_GETRULESL_EXIT=0x64
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBZONE_GETRULESL_ENTRY=0x61
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZDBZONE_GETRULESL_EXIT=0x62
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_ENTRY=0x6f
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_EXIT=0x70
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_ISINVALIDL_ENTRY=0x71
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_ISINVALIDL_EXIT=0x72
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0x77
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x78
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT2=0x79
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_ENTRY=0x7e
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_EXIT=0x7f
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_ENTRY=0x73
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x74
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT2=0x76
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT3=0x75
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_OPENDBL_ENTRY=0x6d
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_OPENDBL_EXIT=0x6e
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_RESTOREDBL_ENTRY=0x80
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_RESTOREDBL_EXIT=0x81
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_ENTRY=0x7c
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_EXIT=0x7d
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_ENTRY=0x2c
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_EXIT=0x2d
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_PARAM=0x93
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_ENTRY=0x2a
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_EXIT=0x2b
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_RULEAPPLIES_ENTRY=0x2f
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_RULEAPPLIES_ENTRY_PARAM=0x94
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_RULEAPPLIES_EXIT=0x30
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_ENTRY=0x4c
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT=0x4d
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT2=0x4e
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_ENTRY=0x52
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT=0x53
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT2=0x54
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_ENTRY=0x45
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x46
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT2=0x47
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT3=0x48
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_ENTRY=0x49
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT=0x4a
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT2=0x4b
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_ENTRY=0x41
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x42
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT2=0x43
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT3=0x44
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_ENTRY=0x3f
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_EXIT=0x40
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL=0x51
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_ENTRY=0x4f
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_EXIT=0x50
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_ENTRY=0x58
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT=0x59
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT2=0x5a
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_ENTRY=0x3c
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT=0x3d
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT2=0x3e
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_ENTRY=0x35
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT=0x36
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT2=0x37
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOSETTIMEZONEL_ENTRY=0x38
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT=0x3a
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT2=0x3b
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOSETTIMEZONEL_PANIC=0x39
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_ENTRY=0x55
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT=0x56
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT2=0x57
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_SERVICEL_ENTRY=0x5b
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVERSESSION_SERVICEL_EXIT=0x5c
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVER_CONSTRUCTL_ENTRY=0x31
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVER_CONSTRUCTL_EXIT=0x32
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZSERVER_NEWSESSIONL_ENTRY=0x95
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_CREATESCHEMAL_ENTRY=0x82
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_CREATESCHEMAL_EXIT=0x83
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_CREATETZL_ENTRY=0x84
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_CREATETZL_EXIT=0x85
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_DELETETZL_ENTRY=0x8e
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_DELETETZL_EXIT=0x8f
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_READTZIDSL_ENTRY=0x8a
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_READTZIDSL_EXIT=0x8b
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_READTZNAMESL_ENTRY=0x88
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_READTZNAMESL_EXIT=0x89
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_READTZRULESL_ENTRY=0x86
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_READTZRULESL_EXIT=0x87
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_UPDATETZL_ENTRY=0x8c
+[TRACE]TRACE_FLOW_PARAM[0xE1]_CTZUSERDATADB_UPDATETZL_EXIT=0x8d
+[TRACE]TRACE_FLOW_PARAM[0xE1]_DUP1_CREADONLYTZDB_INITIALISEL_ENTRY=0x7
+[TRACE]TRACE_FLOW_PARAM[0xE1]_DUP1_CREADONLYTZDB_INITIALISEL_EXIT=0x8
+[TRACE]TRACE_FLOW_PARAM[0xE1]_DUP1_CTZSERVER_NEWSESSIONL_EXIT=0x34
+[TRACE]TRACE_FLOW_PARAM[0xE1]_DUP2_CTZLOCALIZATIONDB_WRITECITYL_ENTRY=0x7a
+[TRACE]TRACE_FLOW_PARAM[0xE1]_DUP2_CTZLOCALIZATIONDB_WRITECITYL_EXIT=0x7b
+[[OBSOLETE]][GROUP]FUN_PARAM=0xde
+[[OBSOLETE]][GROUP]TRACE_FLOW_PARAM=0xe0
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CREADONLYTZDB_FINDZONEBYNAMEL_PARAM=0x1
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL=0x2
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CTZCONFIGAGENT_RESTORECOMPLETEDL_PARAM=0x4
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL=0x3
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_PARAM=0x5
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_UTC_OFFSET_CHANGE=0x6
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_WRITECITYL=0x8
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZSERVER_NEWSESSIONL=0x4
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL=0x3
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL=0xc
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_PANIC=0x9
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC=0xb
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOSETTIMEZONEL_PANIC=0xd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_COPYDATABASETORAM_ENTRY=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_COPYDATABASETORAM_EXIT=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY=0xd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_FINDZONEBYNAMEL_EXIT=0xe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_FINDZONEL_ENTRY=0xb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_FINDZONEL_EXIT=0xc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_ENTRY=0x7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_EXIT=0x8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_ENTRY=0xf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_EXIT=0x10
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETTZRULESL_ENTRY=0x9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETTZRULESL_EXIT=0xa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_INITIALISEL_ENTRY=0x5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_INITIALISEL_EXIT=0x6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_ENTRY=0x1a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_EXIT=0x1b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0x18
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x19
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_ENTRY=0x22
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_EXIT=0x23
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_ENTRY=0x15
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_EXIT=0x16
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_ENTRY=0x11
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_EXIT=0x12
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_READTIMESTAMPSL_ENTRY=0x13
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_READTIMESTAMPSL_EXIT=0x14
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_RESTORECOMPLETEDL_ENTRY=0x24
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_RESTORECOMPLETEDL_EXIT=0x25
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_ENTRY=0x1c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_EXIT=0x1d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETHOMETIMEL_ENTRY=0x1e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETHOMETIMEL_EXIT=0x1f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETTIMEZONEL_ENTRY=0x17
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_ENTRY=0x20
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_EXIT=0x21
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_ENTRY=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_EXIT=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBRULESET_GETRULESL_ENTRY=0x6f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBRULESET_GETRULESL_EXIT=0x70
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_ENTRY=0x6d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_EXIT=0x6e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBSTDTIMEALIGNMENT_GETRULESL_ENTRY=0x6b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBSTDTIMEALIGNMENT_GETRULESL_EXIT=0x6c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBZONE_GETRULESL_ENTRY=0x69
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBZONE_GETRULESL_EXIT=0x6a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_ENTRY=0x73
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_EXIT=0x74
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_ISINVALIDL_ENTRY=0x75
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_ISINVALIDL_EXIT=0x76
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0x7b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x7c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_ENTRY=0x82
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_EXIT=0x83
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_ENTRY=0x77
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x78
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_OPENDBL_ENTRY=0x71
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_OPENDBL_EXIT=0x72
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_RESTOREDBL_ENTRY=0x84
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_RESTOREDBL_EXIT=0x85
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_WRITECITYL_ENTRY=0x7e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_WRITECITYL_EXIT=0x7f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_ENTRY=0x80
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_EXIT=0x81
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_ENTRY=0x28
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_EXIT=0x29
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_ENTRY=0x26
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_EXIT=0x27
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_GETENCODEDTIMEZONERULESSIZEL_ENTRY=0x2a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_GETENCODEDTIMEZONERULESSIZEL_EXIT=0x2b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_GETTIMEZONERULESL_ENTRY=0x2c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_GETTIMEZONERULESL_EXIT=0x2d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_ENTRY=0x4a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT=0x4b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_ENTRY=0x50
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT=0x51
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_ENTRY=0x43
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x44
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_ENTRY=0x47
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT=0x48
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETHEAPSIZEL_ENTRY=0x5d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETHEAPSIZEL_EXIT=0x5e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_ENTRY=0x3f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x40
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_ENTRY=0x3d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_EXIT=0x3e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_ENTRY=0x4d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_EXIT=0x4e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONEIDSL_ENTRY=0x5b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONEIDSL_EXIT=0x5c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONEIDSSIZEL_ENTRY=0x59
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONEIDSSIZEL_EXIT=0x5a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_ENTRY=0x56
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT=0x57
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_ENTRY=0x3a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT=0x3b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESINGROUPSIZEL_ENTRY=0x63
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESINGROUPSIZEL_EXIT=0x64
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESL_ENTRY=0x65
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESL_EXIT=0x66
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESSIZEL_ENTRY=0x5f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESSIZEL_EXIT=0x60
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESTZIDSIZEL_ENTRY=0x61
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESTZIDSIZEL_EXIT=0x62
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_ENTRY=0x34
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT=0x35
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOSETTIMEZONEL_ENTRY=0x37
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT=0x38
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_ENTRY=0x53
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT=0x54
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_SERVICEL_ENTRY=0x67
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_SERVICEL_EXIT=0x68
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_CONSTRUCTL_ENTRY=0x2e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_CONSTRUCTL_EXIT=0x2f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_NEWSESSIONL_ENTRY=0x30
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_NEWSESSIONL_EXIT=0x31
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_NOTIFYTZSTATUSCHANGE_ENTRY=0x32
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_NOTIFYTZSTATUSCHANGE_EXIT=0x33
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSYSTEMDATADB_CONSTRUCTL_ENTRY=0x86
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSYSTEMDATADB_CONSTRUCTL_EXIT=0x87
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_CREATESCHEMAL_ENTRY=0x8a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_CREATESCHEMAL_EXIT=0x8b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_CREATETZL_ENTRY=0x8c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_CREATETZL_EXIT=0x8d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_DELETETZL_ENTRY=0x96
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_DELETETZL_EXIT=0x97
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_NOTIFYTZNAMESCHANGE_ENTRY=0x98
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_NOTIFYTZNAMESCHANGE_EXIT=0x99
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_OPENL_ENTRY=0x88
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_OPENL_EXIT=0x89
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZIDSL_ENTRY=0x92
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZIDSL_EXIT=0x93
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZNAMESL_ENTRY=0x90
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZNAMESL_EXIT=0x91
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZRULESL_ENTRY=0x8e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZRULESL_EXIT=0x8f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_UPDATETZL_ENTRY=0x94
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_UPDATETZL_EXIT=0x95
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_EXIT=0x9a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x7d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x79
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT=0x4c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT=0x52
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x45
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT=0x49
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x41
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_EXIT=0x4f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT=0x58
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT=0x3c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT=0x36
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT=0x39
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT=0x55
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x7a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x46
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x42
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE0]_CREADONLYTZDB_COPYDATABASETORAM=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE0]_CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE0]_CREADONLYTZDB_FINDZONEL_ENTRY=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE0]_CREADONLYTZDB_GETTZRULESL_ENTRY=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE1]_CTZRULESCACHE_GETENCODEDTIMEZONERULESSIZEL_ENTRY=0x2e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE1]_DUP1_CTZSERVER_NEWSESSIONL_ENTRY=0x33

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/traces/OstTraceDefinitions.h	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* This is Default Licence added by TraceCompiler
+* Copyright (c) 2010 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 __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+
+#include <opensystemtrace.h>
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/traces/fixed_id.definitions	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,849 @@
+#
+# This is Default Licence added by TraceCompiler
+# Copyright (c) 2010 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: 
+#
+#
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]PUBLISH_UPDATE_NOTIFICATION=0xe7
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW_PARAM=0xe3
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_CTZCONFIGAGENT_RESTORECOMPLETEDL_EXIT=0x9
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_NEXT_DST_CHANGE=0x3
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_TTIME_ZONE_CHANGE=0xa
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_TZCHANGE_NOTIFICATION=0x7
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_TZNAMES_CHANGE_NOTIFICATION=0x4
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_TZNAMES_CHANGE_NOTIFICATION_2=0x2
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_TZNAMES_CHANGE_NOTIFICATION_3=0xb
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_TZNAMES_CHANGE_NOTIFICATION_4=0x8
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_TZRULES_CHANGE_NOTIFICATION=0x5
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_TZRULES_CHANGE_NOTIFICATION_2=0x1
+[TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE7]_UTC_OFF_SET_CHANGE=0x6
+[TRACE]TRACE_ERROR[0x82]_CREADONLYTZDB_INITIALISEL=0x6d
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_DELETECITYL=0x78
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCACHEDTIMEZONECITYL=0x75
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCITIESINGROUPL=0x73
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCITIESL=0x71
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READFREQUENTLYUSEDZONEL=0x74
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_WRITEALLFREQUENTLYUSEDZONESL=0x79
+[TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_WRITECITYL=0x76
+[TRACE]TRACE_ERROR[0x82]_CTZSERVER_NEWSESSIONL=0x70
+[TRACE]TRACE_ERROR[0x82]_CTZSYSTEMDATADB_FINDTIMEZONERESOURCEIDL=0x7a
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR=0x7b
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR1=0x7c
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR2=0x7d
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR3=0x7e
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_DELETETZL_ERROR=0x83
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZIDSL_ERROR=0x81
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZNAMESL_ERROR=0x80
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZRULESL_ERROR=0x7f
+[TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_UPDATETZL_ERROR=0x82
+[TRACE]TRACE_ERROR[0x82]_DUP1_CTZLOCALIZATIONDB_READCITIESL=0x72
+[TRACE]TRACE_ERROR[0x82]_DUP1_CTZLOCALIZATIONDB_WRITECITYL=0x77
+[TRACE]TRACE_ERROR[0x82]_INVALID_TIME_ZONE=0x6f
+[TRACE]TRACE_ERROR[0x82]_PROPERTY_DEFINITION=0x6e
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_PANIC=0x31
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_FATAL=0x33
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC=0x2e
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC2=0x2f
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_PANIC=0x30
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_PANIC=0x2c
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_PANIC2=0x2d
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_PANIC=0x32
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_PANIC=0x2b
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_PANIC=0x2a
+[TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_PANIC=0x34
+[TRACE]TRACE_FATAL[0x81]_CTZUSERDATADB_OPENL=0x35
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_COPYDATABASETORAM_ENTRY=0x19b
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_COPYDATABASETORAM_EXIT=0x19c
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY=0x1a5
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_FINDZONEBYNAMEL_EXIT=0x1a6
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_FINDZONEL_EXIT=0x1a4
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_FINDZONEL_EnTRY=0x1a3
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_ENTRY=0x19f
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_EXIT=0x1a0
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_ENTRY=0x1a7
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_EXIT=0x1a9
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_PARAM=0x1a8
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETTZRULESL_ENTRY=0x1a1
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETTZRULESL_EXIT=0x1a2
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_ENTRY=0x1b6
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_EXIT=0x1b8
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_EXIT2=0x1b7
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_GETRESOURCEFILETIMESTAMPSL_ENTRY=0x1ae
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_GETRESOURCEFILETIMESTAMPSL_EXIT=0x1af
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_ENTRY=0x1b9
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_EXIT=0x1ba
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0x1b4
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x1b5
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_ENTRY=0x1c2
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_EXIT=0x1c3
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_ENTRY=0x1b0
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_EXIT=0x1b1
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_ENTRY=0x1aa
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_EXIT=0x1ab
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_READTIMESTAMPSL_ENTRY=0x1ac
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_READTIMESTAMPSL_EXIT=0x1ad
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_RESTORECOMPLETEDL_ENTRY=0x1c4
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_ENTRY=0x1bb
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_EXIT=0x1bc
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETHOMETIMEL_ENTRY=0x1bd
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETHOMETIMEL_EXIT=0x1bf
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETHOMETIMEL_PARAM=0x1be
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETTIMEZONEL_ENTRY=0x1b2
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETTIMEZONEL_EXIT=0x1b3
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_ENTRY=0x1c0
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_EXIT=0x1c1
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_ENTRY=0x195
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_EXIT=0x196
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBREGION_FINDZONEL_ENTRY=0x1f9
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBREGION_FINDZONEL_ENTRY2=0x1fb
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBREGION_FINDZONEL_EXIT=0x1fa
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBREGION_FINDZONEL_EXIT2=0x1fc
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_ACTUALISERULEDEFINITIONSL_ENTRY=0x209
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_ACTUALISERULEDEFINITIONSL_EXIT=0x20a
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_COMPLETERULESANDADDTOCOLLECTIONL_ENTRY=0x207
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_COMPLETERULESANDADDTOCOLLECTIONL_EXIT=0x208
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_GETRULESL_ENTRY=0x203
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_GETRULESL_ENTRY_PARAM2=0x205
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_GETRULESL_EXIT=0x206
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_GETRULESL_PARAM=0x204
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_ENTRy=0x201
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_EXIT=0x202
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBSTDTIMEALIGNMENT_GETRULESL_ENTRY=0x1ff
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBSTDTIMEALIGNMENT_GETRULESL_EXIT=0x200
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBZONE_GETRULESL_ENTRY=0x1fd
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBZONE_GETRULESL_EXIT=0x1fe
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_ENTRY=0x20d
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_EXIT=0x20e
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_ISINVALIDL_ENTRY=0x20f
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_ISINVALIDL_EXIT=0x210
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0x215
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x216
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT2=0x217
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_ENTRY=0x21c
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_EXIT=0x21d
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_ENTRY=0x211
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x212
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT2=0x214
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT3=0x213
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_OPENDBL_ENTRY=0x20b
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_OPENDBL_EXIT=0x20c
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_RESTOREDBL_ENTRY=0x21e
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_RESTOREDBL_EXIT=0x21f
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_ENTRY=0x21a
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_EXIT=0x21b
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_ENTRY=0x1c7
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_EXIT=0x1c9
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_PARAM=0x1c8
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_ENTRY=0x1c5
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_EXIT=0x1c6
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_RULEAPPLIES_ENTRY=0x1ca
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_RULEAPPLIES_ENTRY_PARAM=0x1cb
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_RULEAPPLIES_EXIT=0x1cc
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_ENTRY=0x1e8
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT=0x1e9
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT2=0x1ea
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_ENTRY=0x1ee
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT=0x1ef
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT2=0x1f0
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_ENTRY=0x1e1
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x1e2
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT2=0x1e3
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT3=0x1e4
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_ENTRY=0x1e5
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT=0x1e6
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT2=0x1e7
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_ENTRY=0x1dd
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x1de
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT2=0x1df
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT3=0x1e0
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_ENTRY=0x1db
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_EXIT=0x1dc
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL=0x1ed
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_ENTRY=0x1eb
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_EXIT=0x1ec
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_ENTRY=0x1f4
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT=0x1f5
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT2=0x1f6
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_ENTRY=0x1d8
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT=0x1d9
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT2=0x1da
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_ENTRY=0x1d1
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT=0x1d2
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT2=0x1d3
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOSETTIMEZONEL_ENTRY=0x1d4
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT=0x1d6
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT2=0x1d7
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOSETTIMEZONEL_PANIC=0x1d5
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_ENTRY=0x1f1
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT=0x1f2
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT2=0x1f3
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_SERVICEL_ENTRY=0x1f7
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_SERVICEL_EXIT=0x1f8
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVER_CONSTRUCTL_ENTRY=0x1cd
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVER_CONSTRUCTL_EXIT=0x1ce
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVER_NEWSESSIONL_ENTRY=0x1cf
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_CREATESCHEMAL_ENTRY=0x220
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_CREATESCHEMAL_EXIT=0x221
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_CREATETZL_ENTRY=0x222
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_CREATETZL_EXIT=0x223
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_DELETETZL_ENTRY=0x22c
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_DELETETZL_EXIT=0x22d
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZIDSL_ENTRY=0x228
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZIDSL_EXIT=0x229
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZNAMESL_ENTRY=0x226
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZNAMESL_EXIT=0x227
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZRULESL_ENTRY=0x224
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZRULESL_EXIT=0x225
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_UPDATETZL_ENTRY=0x22a
+[TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_UPDATETZL_EXIT=0x22b
+[TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_CREADONLYTZDB_INITIALISEL_ENTRY=0x19d
+[TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_CREADONLYTZDB_INITIALISEL_EXIT=0x19e
+[TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_CTZSERVER_NEWSESSIONL_EXIT=0x1d0
+[TRACE]TRACE_FLOW_PARAM[0xE3]_DUP2_CTZLOCALIZATIONDB_WRITECITYL_ENTRY=0x218
+[TRACE]TRACE_FLOW_PARAM[0xE3]_DUP2_CTZLOCALIZATIONDB_WRITECITYL_EXIT=0x219
+[TRACE]TRACE_FLOW_PARAM[0xE3]__E32MAIN_ENTRY=0x199
+[TRACE]TRACE_FLOW_PARAM[0xE3]__E32MAIN_EXIT=0x19a
+[TRACE]TRACE_FLOW_PARAM[0xE3]__RUNSERVERL=0x197
+[TRACE]TRACE_FLOW_PARAM[0xE3]___RUNSERVERL_EXIT=0x198
+[[OBSOLETE]][GROUP]FUN_PARAM=0xde
+[[OBSOLETE]][GROUP]PUBLISH_UPDATE_NOTIFICATION=0xe5
+[[OBSOLETE]][GROUP]SEND_RECEIVE=0xe6
+[[OBSOLETE]][GROUP]TRACE_FLOW_PARAM=0xe2
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CREADONLYTZDB_FINDZONEBYNAMEL_PARAM=0x1
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL=0x2
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CTZCONFIGAGENT_RESTORECOMPLETEDL_PARAM=0x4
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL=0x3
+[[OBSOLETE]][TRACE]FUN_PARAM[0xDE]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_PARAM=0x5
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_NEXT_DST_CHANGE=0x3
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TTIME_ZONE_CHANGE=0x7
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZNAMES_CHANGE_NOTIFICATION=0x4
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZNAMES_CHANGE_NOTIFICATION_2=0x2
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZNAMES_CHANGE_NOTIFICATION_3=0x8
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZRULES_CHANGE_NOTIFICATION=0x5
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_TZRULES_CHANGE_NOTIFICATION_2=0x1
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xDF]_UTC_OFFSET_CHANGE=0x6
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_CTZCONFIGAGENT_RESTORECOMPLETEDL_EXIT=0xb
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_NEXT_DST_CHANGE=0x3
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_TTIME_ZONE_CHANGE=0x7
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_TZCHANGE_NOTIFICATION=0x9
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_TZNAMES_CHANGE_NOTIFICATION=0x4
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_TZNAMES_CHANGE_NOTIFICATION_2=0x2
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_TZNAMES_CHANGE_NOTIFICATION_3=0x8
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_TZNAMES_CHANGE_NOTIFICATION_4=0xa
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_TZRULES_CHANGE_NOTIFICATION=0x5
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_TZRULES_CHANGE_NOTIFICATION_2=0x1
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE1]_UTC_OFFSET_CHANGE=0x6
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_CTZCONFIGAGENT_RESTORECOMPLETEDL_EXIT=0x9
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_NEXT_DST_CHANGE=0x3
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_TTIME_ZONE_CHANGE=0xa
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_TZCHANGE_NOTIFICATION=0x7
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_TZNAMES_CHANGE_NOTIFICATION=0x4
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_TZNAMES_CHANGE_NOTIFICATION_2=0x2
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_TZNAMES_CHANGE_NOTIFICATION_3=0xb
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_TZNAMES_CHANGE_NOTIFICATION_4=0x8
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_TZRULES_CHANGE_NOTIFICATION=0x5
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_TZRULES_CHANGE_NOTIFICATION_2=0x1
+[[OBSOLETE]][TRACE]PUBLISH_UPDATE_NOTIFICATION[0xE5]_UTC_OFF_SET_CHANGE=0x6
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_DOCONVERTL=0x6
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_GETUSERTIMEZONEIDSL=0x24
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_GETUSERTIMEZONENAMESL=0x21
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_ISDAYLIGHTSAVINGONL=0xb
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_LOCALIZATIONDELETECITYL=0x1c
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL=0x1a
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_LOCALIZATIONREADCITIESINGROUPL=0x16
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_LOCALIZATIONREADCITIESL=0x12
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL=0x18
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP1_RTZ_LOCALIZATIONWRITECITYL=0x1b
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP2_RTZ_LOCALIZATIONREADCITIESL=0x13
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_DUP3_RTZ_LOCALIZATIONREADCITIESL=0x14
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_AUTOUPDATESETTINGL=0xd
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_CREATEUSERTIMEZONEL=0x1f
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_DOCONVERTL=0x5
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_GETOFFSETSFORTIMEZONEIDSL=0x7
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_GETTIMEZONEIDL=0x8
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE=0x4
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE2=0x3
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE3=0x2
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE4=0x1
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_GETUSERTIMEZONEIDSL=0x23
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_GETUSERTIMEZONENAMESL=0x20
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_ISDAYLIGHTSAVINGONL=0xa
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL=0x19
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_LOCALIZATIONREADCITIESINGROUPL=0x15
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_LOCALIZATIONREADCITIESL=0x11
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL=0x17
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL=0x1e
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL=0x1d
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_NOTIFYHOMETIMEZONECHANGEDL=0xf
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_SETAUTOUPDATEBEHAVIORL=0xc
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_SETHOMETIME=0xe
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_SETTIMEZONEL=0x9
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_SETUNKNOWNZONETIMEL=0x10
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE0]_RTZ_UPDATEUSERTIMEZONEL=0x22
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_DOCONVERTL=0x6
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_GETUSERTIMEZONEIDSL=0x24
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_GETUSERTIMEZONENAMESL=0x21
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_ISDAYLIGHTSAVINGONL=0xb
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_LOCALIZATIONDELETECITYL=0x1c
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL=0x1a
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_LOCALIZATIONREADCITIESL=0x12
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL=0x18
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP1_RTZ_LOCALIZATIONWRITECITYL=0x1b
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP2_RTZ_LOCALIZATIONREADCITIESL=0x13
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_DUP3_RTZ_LOCALIZATIONREADCITIESL=0x14
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_AUTOUPDATESETTINGL=0xd
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_CREATEUSERTIMEZONEL=0x1f
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_DOCONVERTL=0x5
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_GETOFFSETSFORTIMEZONEIDSL=0x7
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_GETTIMEZONEIDL=0x8
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE=0x4
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE2=0x3
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE3=0x2
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE4=0x1
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_GETUSERTIMEZONEIDSL=0x23
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_GETUSERTIMEZONENAMESL=0x20
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_ISDAYLIGHTSAVINGONL=0xa
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL=0x19
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_LOCALIZATIONREADCITIESINGROUPL=0x15
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_LOCALIZATIONREADCITIESINGROUPL_SEND=0x16
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_LOCALIZATIONREADCITIESL=0x11
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL=0x17
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL=0x1e
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL=0x1d
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_NOTIFYHOMETIMEZONECHANGEDL=0xf
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_SETAUTOUPDATEBEHAVIORL=0xc
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_SETHOMETIME=0xe
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_SETTIMEZONEL=0x9
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_SETUNKNOWNZONETIMEL=0x10
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE4]_RTZ_UPDATEUSERTIMEZONEL=0x22
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_DOCONVERTL=0x6
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_GETUSERTIMEZONEIDSL=0x24
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_GETUSERTIMEZONENAMESL=0x21
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_ISDAYLIGHTSAVINGONL=0xb
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_LOCALIZATIONDELETECITYL=0x1c
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL=0x1a
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_LOCALIZATIONREADCITIESL=0x12
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL=0x18
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP1_RTZ_LOCALIZATIONWRITECITYL=0x1b
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP2_RTZ_LOCALIZATIONREADCITIESL=0x13
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_DUP3_RTZ_LOCALIZATIONREADCITIESL=0x14
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_AUTOUPDATESETTINGL=0xd
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_CREATEUSERTIMEZONEL=0x1f
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_DOCONVERTL=0x5
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_GETOFFSETSFORTIMEZONEIDSL=0x7
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_GETTIMEZONEIDL=0x8
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE=0x4
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE2=0x3
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE3=0x2
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_GETTIMEZONERULESL_SEND_RECEIVE4=0x1
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_GETUSERTIMEZONEIDSL=0x23
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_GETUSERTIMEZONENAMESL=0x20
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_ISDAYLIGHTSAVINGONL=0xa
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL=0x19
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_LOCALIZATIONREADCITIESINGROUPL=0x15
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_LOCALIZATIONREADCITIESINGROUPL_SEND=0x16
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_LOCALIZATIONREADCITIESL=0x11
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL=0x17
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL=0x1e
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL=0x1d
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_NOTIFYHOMETIMEZONECHANGEDL=0xf
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_SETAUTOUPDATEBEHAVIORL=0xc
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_SETHOMETIME=0xe
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_SETTIMEZONEL=0x9
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_SETUNKNOWNZONETIMEL=0x10
+[[OBSOLETE]][TRACE]SEND_RECEIVE[0xE6]_RTZ_UPDATEUSERTIMEZONEL=0x22
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CREADONLYTZDB_INITIALISEL=0x4b
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZID_INTERNALIZEL=0x69
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_DELETECITYL=0x56
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCACHEDTIMEZONECITYL=0x53
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCITIESINGROUPL=0x51
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READCITIESL=0x4f
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_READFREQUENTLYUSEDZONEL=0x52
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_WRITEALLFREQUENTLYUSEDZONESL=0x57
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZATIONDB_WRITECITYL=0x54
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZEDCITYRECORD_CONSTRUCTL=0x6a
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZLOCALIZEDTIMEZONERECORD_CONSTRUCTL=0x6b
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZSERVER_NEWSESSIONL=0x4e
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZSYSTEMDATADB_FINDTIMEZONERESOURCEIDL=0x58
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR=0x59
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR1=0x5a
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR2=0x5b
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_CREATETZL_ERROR3=0x5c
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_DELETETZL_ERROR=0x61
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZIDSL_ERROR=0x5f
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZNAMESL_ERROR=0x5e
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_READTZRULESL_ERROR=0x5d
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATADB_UPDATETZL_ERROR=0x60
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATA_DELETEL=0x68
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATA_READNAMESL=0x66
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATA_READRULESL=0x65
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERDATA_UPDATEL=0x67
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CTZUSERNAMES_CONSTRUCTL=0x64
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CVTZACTUALISEDRULES_GETOFFSETFROMRULEL=0x6c
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL=0x2a
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CTZLOCALIZATIONDB_READCITIESL=0x50
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CTZLOCALIZATIONDB_WRITECITYL=0x55
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1__E32MAIN=0x8
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1__RUNSERVERL=0x1
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2__E32MAIN=0x7
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_INVALID_TIME_ZONE=0x4d
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_PROPERTY_DEFINITION=0x4c
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RTZ_LOCALIZATIONDELETECITYL=0x63
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RTZ_LOCALIZATIONWRITECITYL=0x62
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]__E32MAIN=0x6
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_PANIC=0x24
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_FATAL=0x26
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_PANIC=0xa
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC=0x21
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_PANIC2=0x22
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_PANIC=0x23
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_PANIC=0x1f
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_PANIC2=0x20
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_PANIC=0x25
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_PANIC=0x1e
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_PANIC=0x1d
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_PANIC=0x27
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CTZUSERDATADB_OPENL=0x28
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_RTZ_CONNECT=0x29
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_RTZ_STARTSERVER_CREATION_ERROR=0x1b
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]__RUNSERVERL=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_COPYDATABASETORAM_ENTRY=0xe2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_COPYDATABASETORAM_EXIT=0xe3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY=0xec
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_FINDZONEBYNAMEL_EXIT=0xed
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_FINDZONEL_ENTRY=0xea
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_FINDZONEL_EXIT=0xeb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_ENTRY=0xe6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_EXIT=0xe7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_ENTRY=0xee
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_EXIT=0xef
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETTZRULESL_ENTRY=0xe8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_GETTZRULESL_EXIT=0xe9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_INITIALISEL_ENTRY=0xe4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREADONLYTZDB_INITIALISEL_EXIT=0xe5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_ENTRY=0xf9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_EXIT=0xfa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0xf7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_EXIT=0xf8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_ENTRY=0x101
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_EXIT=0x102
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_ENTRY=0xf4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_EXIT=0xf5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_ENTRY=0xf0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_EXIT=0xf1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_READTIMESTAMPSL_ENTRY=0xf2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_READTIMESTAMPSL_EXIT=0xf3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_RESTORECOMPLETEDL_ENTRY=0x103
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_RESTORECOMPLETEDL_EXIT=0x104
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_ENTRY=0xfb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_EXIT=0xfc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETHOMETIMEL_ENTRY=0xfd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETHOMETIMEL_EXIT=0xfe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETTIMEZONEL_ENTRY=0xf6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_ENTRY=0xff
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_EXIT=0x100
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_ENTRY=0xdc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_EXIT=0xdd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBRULESET_GETRULESL_ENTRY=0x14e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBRULESET_GETRULESL_EXIT=0x14f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_ENTRY=0x14c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_EXIT=0x14d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBSTDTIMEALIGNMENT_GETRULESL_ENTRY=0x14a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBSTDTIMEALIGNMENT_GETRULESL_EXIT=0x14b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBZONE_GETRULESL_ENTRY=0x148
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZDBZONE_GETRULESL_EXIT=0x149
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_ENTRY=0x152
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_EXIT=0x153
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_ISINVALIDL_ENTRY=0x154
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_ISINVALIDL_EXIT=0x155
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0x15a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x15b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_ENTRY=0x161
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_EXIT=0x162
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_ENTRY=0x156
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x157
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_OPENDBL_ENTRY=0x150
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_OPENDBL_EXIT=0x151
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_RESTOREDBL_ENTRY=0x163
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_RESTOREDBL_EXIT=0x164
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_WRITECITYL_ENTRY=0x15d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_WRITECITYL_EXIT=0x15e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_ENTRY=0x15f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_EXIT=0x160
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULEHOLDER_DOCONVERTL_ENTRY=0xcf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULEHOLDER_DOCONVERTL_EXIT=0xd0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_ENTRY=0x107
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_EXIT=0x108
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_ENTRY=0x105
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_EXIT=0x106
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_GETENCODEDTIMEZONERULESSIZEL_ENTRY=0x109
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_GETENCODEDTIMEZONERULESSIZEL_EXIT=0x10a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_GETTIMEZONERULESL_ENTRY=0x10b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULESCACHE_GETTIMEZONERULESL_EXIT=0x10c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULES_ADDACTUALISEDRULESL_ENTRY=0xd3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULES_ADDACTUALISEDRULESL_EXIT=0xd4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULES_GETACTUALISEDRULESL_ENTRY=0xd5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULES_GETACTUALISEDRULESL_EXIT=0xd6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZRULES_GETOFFSETL_ENTRY=0xd7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_ENTRY=0x129
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT=0x12a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_ENTRY=0x12f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT=0x130
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_ENTRY=0x122
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x123
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_ENTRY=0x126
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT=0x127
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETHEAPSIZEL_ENTRY=0x13c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETHEAPSIZEL_EXIT=0x13d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_ENTRY=0x11e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x11f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_ENTRY=0x11c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_EXIT=0x11d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_ENTRY=0x12c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_EXIT=0x12d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONEIDSL_ENTRY=0x13a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONEIDSL_EXIT=0x13b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONEIDSSIZEL_ENTRY=0x138
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONEIDSSIZEL_EXIT=0x139
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_ENTRY=0x135
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT=0x136
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_ENTRY=0x119
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT=0x11a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESINGROUPSIZEL_ENTRY=0x142
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESINGROUPSIZEL_EXIT=0x143
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESL_ENTRY=0x144
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESL_EXIT=0x145
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESSIZEL_ENTRY=0x13e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESSIZEL_EXIT=0x13f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESTZIDSIZEL_ENTRY=0x140
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOLOCALIZATIONREADCITIESTZIDSIZEL_EXIT=0x141
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_ENTRY=0x113
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT=0x114
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOSETTIMEZONEL_ENTRY=0x116
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT=0x117
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_ENTRY=0x132
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT=0x133
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_SERVICEL_ENTRY=0x146
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVERSESSION_SERVICEL_EXIT=0x147
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_CONSTRUCTL_ENTRY=0x10d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_CONSTRUCTL_EXIT=0x10e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_NEWSESSIONL_ENTRY=0x10f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_NEWSESSIONL_EXIT=0x110
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_NOTIFYTZSTATUSCHANGE_ENTRY=0x111
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSERVER_NOTIFYTZSTATUSCHANGE_EXIT=0x112
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSYSTEMDATADB_CONSTRUCTL_ENTRY=0x165
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZSYSTEMDATADB_CONSTRUCTL_EXIT=0x166
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_CREATESCHEMAL_ENTRY=0x169
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_CREATESCHEMAL_EXIT=0x16a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_CREATETZL_ENTRY=0x16b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_CREATETZL_EXIT=0x16c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_DELETETZL_ENTRY=0x175
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_DELETETZL_EXIT=0x176
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_NOTIFYTZNAMESCHANGE_ENTRY=0x177
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_NOTIFYTZNAMESCHANGE_EXIT=0x178
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_OPENL_ENTRY=0x167
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_OPENL_EXIT=0x168
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZIDSL_ENTRY=0x171
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZIDSL_EXIT=0x172
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZNAMESL_ENTRY=0x16f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZNAMESL_EXIT=0x170
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZRULESL_ENTRY=0x16d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_READTZRULESL_EXIT=0x16e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_UPDATETZL_ENTRY=0x173
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CTZUSERDATADB_UPDATETZL_EXIT=0x174
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CVTZACTUALISEDRULES_GETOFFSETFROMRULEL_ENTRY=0xda
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CVTZACTUALISEDRULES_GETOFFSETFROMRULEL_EXIT=0xdb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CVTZACTUALISEDRULES_ISDAYLIGHTSAVINGON_ENTRY=0xd8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CVTZACTUALISEDRULES_ISDAYLIGHTSAVINGON_EXIT=0xd9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_EXIT=0x179
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x15c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x158
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT=0x12b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT=0x131
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x124
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT=0x128
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x120
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_EXIT=0x12e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT=0x137
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT=0x11b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT=0x115
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT=0x118
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT=0x134
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RTZ_CONNECT_EXIT=0xb0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RTZ_GETTIMEZONERULESL_ENTRY=0xac
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RTZ_GETTIMEZONERULESL_EXIT=0xad
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RTZ_ISDAYLIGHTSAVINGONL_ENTRY=0xb9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RTZ_LOCALIZATIONREADCITIESL_ENTRY=0xbc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RTZ_LOCALIZATIONREADCITIESL_EXIT=0xbd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x159
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x125
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x121
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_RTZ_CONNECT_EXIT=0xb1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_CONNECT_ENTRY=0xae
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_CONNECT_EXIT=0xaf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_CREATEUSERTIMEZONEL_ENTRY=0xc8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETOFFSETSFORTIMEZONEIDSL_ENTRY=0xb2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETOFFSETSFORTIMEZONEIDSL_EXIT=0xb3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETTIMEZONEIDL_ENTRY=0xb4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETTIMEZONEIDL_EXIT=0xb5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETTIMEZONERULESL_ENTRY=0xaa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETTIMEZONERULESL_EXIT=0xab
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETUSERTIMEZONEIDSL_ENTRY=0xcd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETUSERTIMEZONEIDSL_EXIT=0xce
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETUSERTIMEZONENAMESL_ENTRY=0xc9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_GETUSERTIMEZONENAMESL_EXIT=0xca
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_ISDAYLIGHTSAVINGONL_ENTRY=0xb8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL_ENTRY=0xc2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL_EXIT=0xc3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONREADCITIESINGROUPL_ENTRY=0xbe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONREADCITIESINGROUPL_EXIT=0xbf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONREADCITIESL_ENTRY=0xba
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONREADCITIESL_EXIT=0xbb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL_ENTRY=0xc0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL_EXIT=0xc1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL_ENTRY=0xc6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL_EXIT=0xc7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL_ENTRY=0xc4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL_EXIT=0xc5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_SETTIMEZONEL_ENTRY=0xb6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_SETTIMEZONEL_EXIT=0xb7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_STARTSERVER_ENTRY=0xa8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_STARTSERVER_EXIT=0xa9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_UPDATEUSERTIMEZONEL_ENTRY=0xcb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RTZ_UPDATEUSERTIMEZONEL_EXIT=0xcc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_TTZRULE_ACTUALISEL_ENTRY=0xd1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_TTZRULE_ACTUALISEL_EXIT=0xd2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__E32MAIN_ENTRY=0xe0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__E32MAIN_EXIT=0xe1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__RUNSERVERL_ENTRY=0xde
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__RUNSERVERL_EXIT=0xdf
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE2]_CREADONLYTZDB_COPYDATABASETORAM=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE2]_CREADONLYTZDB_FINDZONEBYNAMEL=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE2]_CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY=0x5
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE2]_CREADONLYTZDB_FINDZONEL_ENTRY=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE2]_CREADONLYTZDB_GETTZRULESL_ENTRY=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_COPYDATABASETORAM_ENTRY=0xcb
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_COPYDATABASETORAM_EXIT=0xcc
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY=0xd5
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_FINDZONEBYNAMEL_EXIT=0xd6
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_FINDZONEL_EXIT=0xd4
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_FINDZONEL_EnTRY=0xd3
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_ENTRY=0xcf
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_EXIT=0xd0
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_ENTRY=0xd7
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_EXIT=0xd9
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_PARAM=0xd8
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETTZRULESL_ENTRY=0xd1
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CREADONLYTZDB_GETTZRULESL_EXIT=0xd2
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_ENTRY=0xe6
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_EXIT=0xe8
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_CALCULATENEXTDSTCHANGEL_EXIT2=0xe7
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_GETRESOURCEFILETIMESTAMPSL_ENTRY=0xde
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_GETRESOURCEFILETIMESTAMPSL_EXIT=0xdf
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_ENTRY=0xe9
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_HANDLEDSTCHANGETIMERL_EXIT=0xea
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0xe4
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_NOTIFYTZDATASTATUSCHANGEL_EXIT=0xe5
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_ENTRY=0xf2
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_NOTIFYUSERTZRULESCHANGEL_EXIT=0xf3
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_ENTRY=0xe0
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_PUBLISHNEWDSTCHANGEINFOL_EXIT=0xe1
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_ENTRY=0xda
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_PUBLISHTZDBCHANGEINFOL_EXIT=0xdb
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_READTIMESTAMPSL_ENTRY=0xdc
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_READTIMESTAMPSL_EXIT=0xdd
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_RESTORECOMPLETEDL_ENTRY=0xf4
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_ENTRY=0xeb
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETAUTOUPDATEBEHAVIORL_EXIT=0xec
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETHOMETIMEL_ENTRY=0xed
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETHOMETIMEL_EXIT=0xef
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETHOMETIMEL_PARAM=0xee
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETTIMEZONEL_ENTRY=0xe2
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETTIMEZONEL_EXIT=0xe3
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_ENTRY=0xf0
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZCONFIGAGENT_SETUNKNOWNTIMEZONETIMEL_EXIT=0xf1
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_ENTRY=0xc5
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDATAPROVIDER_GETOFFSETSFORTIMEZONEIDSL_EXIT=0xc6
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBREGION_FINDZONEL_ENTRY=0x129
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBREGION_FINDZONEL_ENTRY2=0x12b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBREGION_FINDZONEL_EXIT=0x12a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBREGION_FINDZONEL_EXIT2=0x12c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_ACTUALISERULEDEFINITIONSL_ENTRY=0x139
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_ACTUALISERULEDEFINITIONSL_EXIT=0x13a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_COMPLETERULESANDADDTOCOLLECTIONL_ENTRY=0x137
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_COMPLETERULESANDADDTOCOLLECTIONL_EXIT=0x138
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_GETRULESL_ENTRY=0x133
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_GETRULESL_ENTRY_PARAM2=0x135
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_GETRULESL_EXIT=0x136
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBRULESET_GETRULESL_PARAM=0x134
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_ENTRy=0x131
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBSTDTIMEALIGNMENT_ADDRULESTOCOLLECTIONL_EXIT=0x132
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBSTDTIMEALIGNMENT_GETRULESL_ENTRY=0x12f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBSTDTIMEALIGNMENT_GETRULESL_EXIT=0x130
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBZONE_GETRULESL_ENTRY=0x12d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZDBZONE_GETRULESL_EXIT=0x12e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_ENTRY=0x13d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_CREATEBLANKFREQUENTLYUSEDZONETABLEL_EXIT=0x13e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_ISINVALIDL_ENTRY=0x13f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_ISINVALIDL_EXIT=0x140
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_ENTRY=0x145
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT=0x146
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYTZDATASTATUSCHANGEL_EXIT2=0x147
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_ENTRY=0x14c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGEL_EXIT=0x14d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_ENTRY=0x141
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT=0x142
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT2=0x144
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_NOTIFYUSERTZNAMESCHANGE_EXIT3=0x143
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_OPENDBL_ENTRY=0x13b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_OPENDBL_EXIT=0x13c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_RESTOREDBL_ENTRY=0x14e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_RESTOREDBL_EXIT=0x14f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_ENTRY=0x14a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZLOCALIZATIONDB_WRITEFREQUENTLYUSEDZONEL_EXIT=0x14b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULEHOLDER_DOCONVERTL_ENTRY=0x184
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULEHOLDER_DOCONVERTL_ENTRY_PARAM=0x185
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULEHOLDER_DOCONVERTL_EXIT=0x186
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_ENTRY=0xf7
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_EXIT=0xf9
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETACTUALISEDTIMEZONERULESL_PARAM=0xf8
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_ENTRY=0xf5
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_DOGETENCODEDTIMEZONERULESL_EXIT=0xf6
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_GETENCODEDTIMEZONERULESSIZEL_ENTRY=0x32
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_RULEAPPLIES_ENTRY=0xfa
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_RULEAPPLIES_ENTRY_PARAM=0xfb
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULESCACHE_RULEAPPLIES_EXIT=0xfc
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULES_ADDACTUALISEDRULESL_ENTRY=0x189
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULES_ADDACTUALISEDRULESL_EXIT=0x18a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULES_GETACTUALISEDRULESL_ENTRY=0x18b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULES_GETACTUALISEDRULESL_EXIT=0x18c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULES_GETOFFSETL_ENTRY=0x18d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULES_GETOFFSETL_EXIT=0x18f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZRULES_GETOFFSETL_PARAM=0x18e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_ENTRY=0x118
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT=0x119
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCONVERTFOREIGNZONETIMEL_EXIT2=0x11a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_ENTRY=0x11e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT=0x11f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOCREATEUSERTIMEZONEL_EXIT2=0x120
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_ENTRY=0x111
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT=0x112
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT2=0x113
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESL_EXIT3=0x114
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_ENTRY=0x115
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT=0x116
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETFOREIGNENCODEDTIMEZONERULESSIZEL_EXIT2=0x117
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_ENTRY=0x10d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT=0x10e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT2=0x10f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALENCODEDTIMEZONERULESL_EXIT3=0x110
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_ENTRY=0x10b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETLOCALTIMEZONEIDL_EXIT=0x10c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL=0x11d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_ENTRY=0x11b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETOFFSETSFORTIMEZONEIDSL_EXIT=0x11c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_ENTRY=0x124
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT=0x125
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOGETUSERTIMEZONENAMESL_EXIT2=0x126
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_ENTRY=0x108
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT=0x109
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOISDAYLIGHTSAVINGONL_EXIT2=0x10a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_ENTRY=0x101
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT=0x102
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOREGISTERTZCHANGENOTIFIER_EXIT2=0x103
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOSETTIMEZONEL_ENTRY=0x104
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT=0x106
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOSETTIMEZONEL_EXIT2=0x107
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOSETTIMEZONEL_PANIC=0x105
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_ENTRY=0x121
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT=0x122
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_DOUPDATEUSERTIMEZONEL_EXIT2=0x123
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_SERVICEL_ENTRY=0x127
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVERSESSION_SERVICEL_EXIT=0x128
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVER_CONSTRUCTL_ENTRY=0xfd
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVER_CONSTRUCTL_EXIT=0xfe
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZSERVER_NEWSESSIONL_ENTRY=0xff
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_CREATESCHEMAL_ENTRY=0x150
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_CREATESCHEMAL_EXIT=0x151
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_CREATETZL_ENTRY=0x152
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_CREATETZL_EXIT=0x153
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_DELETETZL_ENTRY=0x15c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_DELETETZL_EXIT=0x15d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZIDSL_ENTRY=0x158
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZIDSL_EXIT=0x159
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZNAMESL_ENTRY=0x156
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZNAMESL_EXIT=0x157
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZRULESL_ENTRY=0x154
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_READTZRULESL_EXIT=0x155
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_UPDATETZL_ENTRY=0x15a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CTZUSERDATADB_UPDATETZL_EXIT=0x15b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CVTZACTUALISEDRULES_GETOFFSETFROMRULEL_ENTRY=0x193
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CVTZACTUALISEDRULES_GETOFFSETFROMRULEL_EXIT=0x194
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CVTZACTUALISEDRULES_ISDAYLIGHTSAVINGON_ENTRY=0x190
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CVTZACTUALISEDRULES_ISDAYLIGHTSAVINGON_EXIT=0x192
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_CVTZACTUALISEDRULES_ISDAYLIGHTSAVINGON_PARAM=0x191
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_CREADONLYTZDB_INITIALISEL_ENTRY=0xcd
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_CREADONLYTZDB_INITIALISEL_EXIT=0xce
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_CTZSERVER_NEWSESSIONL_ENTRY=0x37
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_CTZSERVER_NEWSESSIONL_EXIT=0x100
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_RTZ_GETOFFSETSFORTIMEZONEIDSL_ENTRY=0x16d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_RTZ_GETOFFSETSFORTIMEZONEIDSL_EXIT=0x16e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP1_RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL_ENTRY=0x179
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP2_CTZLOCALIZATIONDB_WRITECITYL_ENTRY=0x148
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP2_CTZLOCALIZATIONDB_WRITECITYL_EXIT=0x149
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP2_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL_ENTRY=0x177
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP4_RTZ_LOCALIZATIONREADCITIESL_ENTRY=0x16f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_DUP4_RTZ_LOCALIZATIONREADCITIESL_EXIT=0x170
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_CONNECT_ENTRY=0x169
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_CONNECT_EXIT=0x16a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_CONNECT_EXIT2=0x16b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_CONNECT_EXIT3=0x16c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_CREATEUSERTIMEZONEL_ENTRY=0x17d
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETOFFSETSFORTIMEZONEIDSL_ENTRY=0x9e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_ENTRY=0x160
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_ENTRY_OVERLOADED=0x164
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_ENTRY_Overload_PARAM=0x165
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_ENTRY_PARAM=0x161
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_ENTRY_PARAM2=0x162
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_EXIT=0x163
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_EXIT2=0x168
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_Entry_OVERLOAD_PARAM=0x166
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETTIMEZONERULESL_Entry_OVERLOAD_PARAM2=0x167
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETUSERTIMEZONEIDSL_ENTRY=0x182
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETUSERTIMEZONEIDSL_EXIT=0x183
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETUSERTIMEZONENAMESL_ENTRY=0x17e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_GETUSERTIMEZONENAMESL_EXIT=0x17f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONREADCACHEDTIMEZONECITYL_EXIT=0x178
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONREADCITIESINGROUPL_ENTRY=0x173
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONREADCITIESINGROUPL_EXIT=0x174
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONREADCITIESL_ENTRY=0x171
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONREADCITIESL_EXIT=0x172
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL_ENTRY=0x175
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONREADFREQUENTLYUSEDZONEL_EXIT=0x176
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL_ENTRY=0x17b
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONWRITEALLFREQUENTLYUSEDZONESL_EXIT=0x17c
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_LOCALIZATIONWRITEFREQUENTLYUSEDZONEL_EXIT=0x17a
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_STARTSERVER_ENTRY=0x15e
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_STARTSERVER_EXIT=0x15f
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_UPDATEUSERTIMEZONEL_ENTRY=0x180
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_RTZ_UPDATEUSERTIMEZONEL_EXIT=0x181
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_TTZRULE_ACTUALISEL_ENTRY=0x187
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]_TTZRULE_ACTUALISEL_EXIT=0x188
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]__E32MAIN_ENTRY=0xc9
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]__E32MAIN_EXIT=0xca
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]__RUNSERVERL=0xc7
+[[OBSOLETE]][TRACE]TRACE_FLOW_PARAM[0xE3]___RUNSERVERL_EXIT=0xc8

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/traces/trace.properties	Wed Oct 20 17:03:03 2010 +0300
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<trace_properties/>

author	hgs
	Wed, 20 Oct 2010 17:03:03 +0300
changeset 81	676b6116ca93
parent 78	175a0d824084

appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/apgrfx/APGCLI.CPP		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/apgrfx/apgstart.cpp		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/aplist/aplapplist.cpp		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/aplist/aplapplistitem.cpp		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/aplist/aplappregfinder.cpp		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/aplist/apsiconcaptionoverride.cpp		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/bwins/APFILEU.DEF		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/bwins/APSERVU.DEF		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/group/APFILE.MMP		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/group/APGRFX.MMP		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/group/APLIST.MMP		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/group/APPARC.MMP		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/group/APSERV.MMP		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/group/APSEXE.MMP		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/tef/tssaac/tssaac_emulator_ssma.rss		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/tef/tssaac/tssaac_tapp_emulator_ssma.rss		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/traces/OstTraceDefinitions.h		file \| annotate \| diff \| comparison \| revisions
appfw/apparchitecture/traces/fixed_id.definitions		file \| annotate \| diff \| comparison \| revisions
appfw/uiftestfw/resource/hardware/gsastartupcmdlist7_target.rss		file \| annotate \| diff \| comparison \| revisions
applaunchservices/aftermarketappstarter/test/tamastarter/resource/emulator/tamastarter_amaadder_ssma.rss		file \| annotate \| diff \| comparison \| revisions
applaunchservices/aftermarketappstarter/test/tamastarter/resource/hardware/tamastarter_amaadder_ssma.rss		file \| annotate \| diff \| comparison \| revisions
appsupport_plat/restore_factory_settings_api/inc/rfsHandler.h		file \| annotate \| diff \| comparison \| revisions
contenthandling/webrecognisers/Test/t_recweb/crecwebrecogtest.cpp		file \| annotate \| diff \| comparison \| revisions
contextframework/cfw/tsrc/public/basic/group/mt_cfsisupgrade.mmp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/group/bld.inf		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/group/rfs.mmp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/inc/rfsConnectionObserver.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/loc/rfs.loc		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/src/rfs.rss		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/src/rfsHandler.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/src/rfscontimer.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/tsrc/RfsTestModule/data/rfs_testscript0.txt		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/tsrc/RfsTestModule/group/RfsTestModule.mmp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/tsrc/RfsTestModule/group/bld.inf		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/tsrc/RfsTestModule/init/TestFramework.ini		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/Rfs/tsrc/RfsTestModule/rom/RfsTestModule.iby		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/SysAp.hrh		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/SysApAccessoryObserver.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/SysApAppUi.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/SysApEtelNetworkStatusNspsObserver.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/SysApFeatureManager.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/SysApLightsController.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/hbdevicepowermenusymbian.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/sysapbatteryinfocontroller.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Inc/sysapkeymanagement.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Src/SysApAccessoryObserver.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Src/SysApAppUi.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Src/Usb/SysApUsbIndicatorImpl.h		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Src/hbdevicepowermenusymbian.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/SysAp/Src/powersavemode/sysappsmcontroller.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/advancedtspcontroller/data/keyevent.rul		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/kefmapper/src/kefmapimpl.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/powersaveutilities/bsutil/group/bld.inf		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/powersaveutilities/bsutil/src/bsutil.cpp		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/powersaveutilities/conf/powersaveutilities.confml		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/powersaveutilities/conf/powersaveutilities_2000B5E3.crml		file \| annotate \| diff \| comparison \| revisions
coreapplicationuis/powersaveutilities/psmindicatorplugin/src/psmindicator.cpp		file \| annotate \| diff \| comparison \| revisions
filehandling/fileconverterfw/TSRC/W7ALLCHR.DOC.1		file \| annotate \| diff \| comparison \| revisions
filehandling/fileconverterfw/group/ConarcTest.iby		file \| annotate \| diff \| comparison \| revisions
filehandling/fileconverterfw/group/bld.inf		file \| annotate \| diff \| comparison \| revisions
filehandling/htmltorichtextconverter/test/group/bld.inf		file \| annotate \| diff \| comparison \| revisions
filehandling/htmltorichtextconverter/test/group/chtmltocrtconvertertest.iby		file \| annotate \| diff \| comparison \| revisions
startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp		file \| annotate \| diff \| comparison \| revisions
startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp		file \| annotate \| diff \| comparison \| revisions
sysresmonitoring/oodmonitor/oodmonitor2/src/outofdisknotifyobserver.cpp		file \| annotate \| diff \| comparison \| revisions
sysresmonitoring/oommonitor/inc/oomconfig.inl		file \| annotate \| diff \| comparison \| revisions
sysresmonitoring/oommonitor/src/oommemorymonitor.cpp		file \| annotate \| diff \| comparison \| revisions
systemsettings/accindicatorplugin/accindicatorsettings/accindicatorsettings.pro		file \| annotate \| diff \| comparison \| revisions
systemsettings/accindicatorplugin/accindicatorsettings/resources/headset.docml		file \| annotate \| diff \| comparison \| revisions
tzservices/tzdatabase/data/timezone_upgrade.pkg		file \| annotate \| diff \| comparison \| revisions
tzservices/tzloc/group/TimeZoneLocalization.mmp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzloc/src/TzLocalizationDbAccessor.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzloc/src/TzLocalizationResourceReader.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzloc/src/TzLocalizer.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzloc/traces/OstTraceDefinitions.h		file \| annotate \| diff \| comparison \| revisions
tzservices/tzloc/traces/fixed_id.definitions		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Client/Source/timezone.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Client/Source/timezoneconverter.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Client/Source/timezoneuserdata.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Client/Source/tzid.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Client/Source/tzlocalizedcityrecord.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Client/Source/tzlocalizedtimezonerecord.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Client/Source/vtzrules.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/DataProvider.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/MAIN.CPP		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/readonlytzdb.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/timezoneconfig.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/timezoneserver.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/timezonesession.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/tzdbentities.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/tzlocalizationdb.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/tzsystemdata.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/Server/Source/tzuserdata.cpp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/group/TimeZoneClient.mmp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/group/TimeZoneServer.mmp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/test/Unit/group/DstUnitTests.mmp		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/test/Unit/traces/OstTraceDefinitions.h		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/test/Unit/traces/fixed_id.definitions		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/traces/OstTraceDefinitions.h		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/traces/fixed_id.definitions		file \| annotate \| diff \| comparison \| revisions
tzservices/tzserver/traces/trace.properties		file \| annotate \| diff \| comparison \| revisions