# HG changeset patch # User hgs # Date 1287469746 -19800 # Node ID 6c34d0baa0b1cf73c7e409a7c3ccf9d750f34951 # Parent 6f4453afd00652c24360d527920911daeece14e0 201041 diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/biomsgfw/BIFU/bld.inf --- a/messagingfw/biomsgfw/BIFU/bld.inf Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/biomsgfw/BIFU/bld.inf Tue Oct 19 11:59:06 2010 +0530 @@ -19,7 +19,7 @@ PRJ_EXPORTS ../BIFUINC/BIF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bif.h) -../BIFUINC/bifbase.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(bifbase.h) +../BIFUINC/bifbase.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bifbase.h) #ifdef SYMBIAN_OLD_EXPORT_LOCATION ../BIFUINC/cbifentry.h /epoc32/include/cbifentry.h #endif diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/biomsgfw/BIFUINC/BIF.H --- a/messagingfw/biomsgfw/BIFUINC/BIF.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/biomsgfw/BIFUINC/BIF.H Tue Oct 19 11:59:06 2010 +0530 @@ -26,6 +26,7 @@ #include class CBifEntry; +class CBioInfoFile; /** * Maximum length of ID text field. diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/biomsgfw/BITSSRC/BioTestUtils.cpp --- a/messagingfw/biomsgfw/BITSSRC/BioTestUtils.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/biomsgfw/BITSSRC/BioTestUtils.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -905,7 +905,10 @@ // client side __ASSERT_ALWAYS(iMsvSession, User::Panic(BIOTEST_PANIC, KErrBIONotOnClientSide)); if(iClientMtmRegistry) - delete iClientMtmRegistry; + { + delete iClientMtmRegistry; + iClientMtmRegistry = NULL; + } iClientMtmRegistry = CClientMtmRegistry::NewL(*iMsvSession); iBioClientMtm = (CBIOClientMtm*) iClientMtmRegistry->NewMtmL(KUidMsgTypeSmartMessage); } @@ -995,7 +998,10 @@ // Set the session path for the RFs SetSessionPath(aFileDirectory); if (iDir) - delete iDir; + { + delete iDir; + iDir = NULL; + } User::LeaveIfError(iFs.GetDir(_L("*.txt"), KEntryAttNormal, ESortByName, iDir)); TInt count = iDir->Count(); if(count == 0) @@ -1187,6 +1193,7 @@ TInt messageLength = richText->DocumentLength(); delete iMessageBody; + iMessageBody = NULL; iMessageBody = HBufC::NewL(messageLength); TPtr messDes = iMessageBody->Des(); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/biomsgfw/BIUTINC/REGPSDLL.H --- a/messagingfw/biomsgfw/BIUTINC/REGPSDLL.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/biomsgfw/BIUTINC/REGPSDLL.H Tue Oct 19 11:59:06 2010 +0530 @@ -52,9 +52,9 @@ IMPORT_C ~CRegisteredParserDll(); - inline TInt DllRefCount() const; - inline TUidType UidType() const; - inline void SetUidType(const TUidType& aUidType); + inline TInt DllRefCount() const{return iDllRefCount;}; + inline TUidType UidType() const {return iUidType;}; + inline void SetUidType(const TUidType& aUidType){iUidType= aUidType;}; IMPORT_C TInt GetLibrary(RFs& aFs,RLibrary& aDllLibrary); // Increments reference count if successful or returns error IMPORT_C void ReleaseLibrary(); // Decrements access count @@ -75,6 +75,4 @@ void RunL(); enum { KReleaseLibraryTimeout = 30000000 }; }; - -#include #endif diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/biomsgfw/IACPTSRC/T_iacp.cpp --- a/messagingfw/biomsgfw/IACPTSRC/T_iacp.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/biomsgfw/IACPTSRC/T_iacp.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -269,6 +269,7 @@ case EReparse: { delete iParser; + iParser = NULL; CreateParserL(); iBioTestUtils->Printf(_L("Re-parsing...\n")); iBioTestUtils->SetEntryL(iEntryId); //clients have to set the right context before calling CommitL() @@ -281,6 +282,7 @@ case EReProcess: { delete iParser; + iParser = NULL; CreateParserL(); iBioTestUtils->Printf(_L("Re-Processing...\n")); iBioTestUtils->SetEntryL(iEntryId); //clients have to set the right context before calling CommitL() diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/biomsgfw/T_BIOMSG/SRC/harness.cpp --- a/messagingfw/biomsgfw/T_BIOMSG/SRC/harness.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/biomsgfw/T_BIOMSG/SRC/harness.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -269,6 +269,7 @@ { InstantiateClientMtmL(); delete iSmsSettings; + iSmsSettings = NULL; CSmsAccount* account = CSmsAccount::NewLC(); iSmsSettings = CSmsSettings::NewL(); account->LoadSettingsL(*iSmsSettings); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/biomsgfw/T_BIOMSG/SRC/t_biomsg.cpp --- a/messagingfw/biomsgfw/T_BIOMSG/SRC/t_biomsg.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/biomsgfw/T_BIOMSG/SRC/t_biomsg.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -222,7 +222,7 @@ // Create the test object which we'll use for output etc. RTest test(KBioTestName); - g_rfs.Connect(); + User::LeaveIfError( g_rfs.Connect() ); // Start a new active scheduler. CActiveScheduler* scheduler = new (ELeave) CActiveScheduler; diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/biomsgfw/gfptsrc/t_gfp.cpp --- a/messagingfw/biomsgfw/gfptsrc/t_gfp.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/biomsgfw/gfptsrc/t_gfp.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -153,10 +153,13 @@ test.Printf(_L("Parsing...\n")); iBioTestUtils->TestStart(iTestCtr,_L("Parsing")); delete iMsgBuffer; + iMsgBuffer = NULL; // create the parser if(iParser) + { delete iParser; - + iParser = NULL; + } while(!finished) { __UHEAP_FAILNEXT(failCount++); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/T_performance/src/t_msv_performancecu.cpp --- a/messagingfw/msgsrvnstore/server/T_performance/src/t_msv_performancecu.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/T_performance/src/t_msv_performancecu.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -74,8 +74,9 @@ INFO_PRINTF1(KFunction); delete iTestUtils; - iTestUtils = 0; + iTestUtils = NULL; delete iTestActive; + iTestActive = NULL; } void CTestPerformanceCU::TestCopyAndUpdateEntry() diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/group/bld.inf --- a/messagingfw/msgsrvnstore/server/group/bld.inf Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/group/bld.inf Tue Oct 19 11:59:06 2010 +0530 @@ -20,7 +20,7 @@ PRJ_EXPORTS ../inc/MSVSTD.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvstd.h) -../inc/MSVSTD.INL SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msvstd.inl) +../inc/MSVSTD.INL SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvstd.inl) ../inc/MSVSTORE.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvstore.h) ../inc/MSVIPC.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msvipc.h) ../inc/MSVIPC.INL SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msvipc.inl) @@ -30,10 +30,10 @@ ../inc/MSVREGIP.H /epoc32/include/msvregip.h #endif ../inc/MSVSTD.HRH /epoc32/include/msvstd.hrh -../inc/MENTACT.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(mentact.h) +../inc/MENTACT.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mentact.h) ../inc/MSVRCPT.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvrcpt.h) ../inc/MSVRCPT.INL SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msvrcpt.inl) -../inc/MSVARRAY.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msvarray.h) +../inc/MSVARRAY.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvarray.h) ../inc/MSVIDS.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvids.h) ../inc/MSVUIDS.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvuids.h) ../inc/MSVRUIDS.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvruids.h) @@ -41,7 +41,7 @@ ../inc/MSVENTRY.INL SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msventry.inl) ../inc/MTSR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mtsr.h) ../inc/MSVAPI.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvapi.h) -../inc/MSVAPI.INL SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msvapi.inl) +../inc/MSVAPI.INL SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(msvapi.inl) ../inc/MCLIENT.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(mclient.h) ../inc/MTCLBASE.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mtclbase.h) ../inc/MTCLREG.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mtclreg.h) @@ -66,7 +66,7 @@ ../inc/TMsvPackedNotifierRequest.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tmsvpackednotifierrequest.h) ../inc/cmsvtechnologytypedefaultmtmsettings.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cmsvtechnologytypedefaultmtmsettings.h) ../inc/tmsvsystemprogress.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tmsvsystemprogress.h) -../inc/tnonoperationmtmdata.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tnonoperationmtmdata.h) +../inc/tnonoperationmtmdata.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tnonoperationmtmdata.h) ../inc/msgerr.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msgerr.h) ../inc/msvsearchsortquery.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(msvsearchsortquery.h) diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/inc/MENTACT.H --- a/messagingfw/msgsrvnstore/server/inc/MENTACT.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/inc/MENTACT.H Tue Oct 19 11:59:06 2010 +0530 @@ -23,7 +23,7 @@ class CMsgActive : public CActive /** -@internalTechnology +@@publishedAll @released */ { diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/inc/MSVAPI.H --- a/messagingfw/msgsrvnstore/server/inc/MSVAPI.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/inc/MSVAPI.H Tue Oct 19 11:59:06 2010 +0530 @@ -39,7 +39,6 @@ #include #include -#include #include #include #include diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/inc/MSVARRAY.H --- a/messagingfw/msgsrvnstore/server/inc/MSVARRAY.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/inc/MSVARRAY.H Tue Oct 19 11:59:06 2010 +0530 @@ -29,7 +29,7 @@ // Generic Key class for sorting arrays of pointers in flat arrays. // /** -@internalComponent +@publishedAll @released */ { @@ -51,7 +51,7 @@ class CMsvEntryArray : public CArrayPtrFlat /** -@internalComponent +@publishedAll @released */ { diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/inc/MSVENTRY.H --- a/messagingfw/msgsrvnstore/server/inc/MSVENTRY.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/inc/MSVENTRY.H Tue Oct 19 11:59:06 2010 +0530 @@ -74,7 +74,7 @@ // // Set and get the current context IMPORT_C TInt SetEntry(TMsvId aId); - inline const TMsvEntry& Entry() const; + inline const TMsvEntry& Entry() const{return iEntry;}; IMPORT_C TMsvId OwningService() const; // // current entry only functions @@ -105,9 +105,9 @@ IMPORT_C CMsvStore* EditStoreL(); // // List the children of the context - inline const TMsvSelectionOrdering& Sort(); - inline void SetSort(TMsvSelectionOrdering& aOrdering); - inline void SetMtm(TUid aMtm); + inline const TMsvSelectionOrdering& Sort(){return iOrdering;}; + inline void SetSort(TMsvSelectionOrdering& aOrdering){iOrdering=aOrdering;}; + inline void SetMtm(TUid aMtm){iMtm=aMtm;}; IMPORT_C TInt GetChildren(CMsvEntrySelection& aSelection); // IMPORT_C TInt GetChildrenWithService(TMsvId aServiceId, CMsvEntrySelection& aSelection); @@ -177,6 +177,6 @@ }; -#include + #endif // __MSVENTRY_H__ diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/inc/MSVFIND.H --- a/messagingfw/msgsrvnstore/server/inc/MSVFIND.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/inc/MSVFIND.H Tue Oct 19 11:59:06 2010 +0530 @@ -153,7 +153,7 @@ IMPORT_C const TDesC8& ProgressL(); IMPORT_C const TDesC8& FinalProgress(); // - inline const CMsvFindResultSelection& GetFindResult() const; + inline const CMsvFindResultSelection& GetFindResult() const{return *iFindResultSel;}; // protected: IMPORT_C CMsvFindOperation(CMsvSession& aSession, const TDesC& aTextToFind, TMsvPartList aPartList, TRequestStatus& aObserverRequestStatus); @@ -187,7 +187,7 @@ TMsvEntry iEntry; }; -#include + #endif diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/inc/MSVFTEXT.H --- a/messagingfw/msgsrvnstore/server/inc/MSVFTEXT.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/inc/MSVFTEXT.H Tue Oct 19 11:59:06 2010 +0530 @@ -46,7 +46,7 @@ IMPORT_C TBool FindTextL(const TDesC& aFind, const TDesC& aSource, TMsvPartList aFlags); IMPORT_C TBool FindRichTextL(const TDesC& aFind, const CRichText& aSource, TMsvPartList aFlags); // - inline TBool FoundText() const; + inline TBool FoundText() const{return iFoundText;}; // private: CMsvFindText(TInt aPriority); @@ -74,6 +74,6 @@ TBool iFoundText; }; -#include + #endif diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/inc/MSVRCPT.H --- a/messagingfw/msgsrvnstore/server/inc/MSVRCPT.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/inc/MSVRCPT.H Tue Oct 19 11:59:06 2010 +0530 @@ -46,18 +46,18 @@ EFailedToSend=2}; IMPORT_C virtual void InternalizeL(RReadStream& aStream); IMPORT_C virtual void ExternalizeL(RWriteStream& aStream) const; - inline TRecipientStatus Status() const; - inline void SetStatus(TRecipientStatus aStatus); - inline TInt Error() const; - inline void SetError(TInt aError); - inline const TTime& Time() const; - inline TTime& Time(); - inline TInt Retries() const; - inline void IncreaseRetries(); - inline void ResetRetries(); + inline TRecipientStatus Status() const{return iStatus;}; + inline void SetStatus(TRecipientStatus aStatus){iStatus=aStatus;}; + inline TInt Error() const{return iError;}; + inline void SetError(TInt aError){iError=aError;}; + inline const TTime& Time() const{return iTime;}; + inline TTime& Time(){return iTime;}; + inline TInt Retries() const{return iRetries;}; + inline void IncreaseRetries(){iRetries++;}; + inline void ResetRetries(){iRetries=0;}; #if (defined SYMBIAN_MESSAGESTORE_HEADER_BODY_USING_SQLDB) - inline void SetRetries(TInt aRetries); - inline void SetTimeValue(TInt64 aTime); + inline void SetRetries(TInt aRetries){iRetries = aRetries;}; + inline void SetTimeValue(TInt64 aTime){iTime = aTime;}; #endif protected: IMPORT_C CMsvRecipient(); @@ -68,6 +68,6 @@ TTime iTime; }; -#include + #endif diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/inc/MSVREG.H --- a/messagingfw/msgsrvnstore/server/inc/MSVREG.H Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/inc/MSVREG.H Tue Oct 19 11:59:06 2010 +0530 @@ -55,7 +55,7 @@ IMPORT_C static CMtmDllInfo* NewL(RReadStream& aStream); IMPORT_C ~CMtmDllInfo(); IMPORT_C void SetHumanReadableNameL(const TDesC& aHumanReadableName); - inline TPtrC HumanReadableName() const; + inline TPtrC HumanReadableName() const{return iHumanReadableName->Des();}; IMPORT_C void InternalizeL(RReadStream& aStream); IMPORT_C void ExternalizeL(RWriteStream& aStream) const; // not used but as it is exported it has been kept IMPORT_C TBool operator==(const CMtmDllInfo& aMtmDllInfo) const; @@ -129,8 +129,8 @@ IMPORT_C ~CMtmGroupData(); IMPORT_C void InternalizeL(RReadStream& aStream); IMPORT_C void ExternalizeL(RWriteStream& aStream) const; // not used but as it is exported it has been kept - inline TUid MtmTypeUid() const; - inline TUid TechnologyTypeUid() const; + inline TUid MtmTypeUid() const{return iMtmTypeUid;}; + inline TUid TechnologyTypeUid() const{return iTechnologyTypeUid;}; IMPORT_C const CMtmDllInfoArray& MtmDllInfoArray() const; IMPORT_C const TCapabilitySet& GetMtmRequiredCapabilities() const; IMPORT_C TBool operator==(const CMtmGroupData& aMtmGroupData) const; @@ -175,11 +175,11 @@ IMPORT_C static CRegisteredMtmDll* NewL(TUid aMtmTypeUid,TUid aTechnologyTypeUid,const CMtmDllInfo& aMtmDllInfo,const TTimeIntervalMicroSeconds32 aTimeoutMicroSeconds32,MRegisteredMtmDllObserver& aRegisteredMtmDllObserver); IMPORT_C ~CRegisteredMtmDll(); - inline TUid MtmTypeUid() const; - inline TUid TechnologyTypeUid() const; - inline const CMtmDllInfo& MtmDllInfo() const; + inline TUid MtmTypeUid() const{return iMtmTypeUid;}; + inline TUid TechnologyTypeUid() const{return iTechnologyTypeUid;}; + inline const CMtmDllInfo& MtmDllInfo() const{return *iMtmDllInfo;}; - inline TInt MtmDllRefCount() const; + inline TInt MtmDllRefCount() const{return iMtmDllRefCount;}; IMPORT_C TInt GetLibrary(RFs& aFs,RLibrary& aMtmDllLibrary); // Increments reference count if successful or returns error IMPORT_C void ReleaseLibrary(); // Decrements access count @@ -233,7 +233,7 @@ public: IMPORT_C ~CMtmDllRegistry(); - inline TInt NumRegisteredMtmDlls() const; + inline TInt NumRegisteredMtmDlls() const{return iRegisteredMtmDllArray.Count();}; IMPORT_C TUid MtmTypeUid(TInt anIndex) const; inline TBool IsPresent(TUid aMtmTypeUid) const; @@ -262,6 +262,16 @@ }; -#include +inline TBool CMtmDllRegistry::IsPresent(TUid aMtmTypeUid) const +/** Tests if the MTM with the specified UID is registered. + +@param aMtmTypeUid UID of MTM to check +@return ETrue if the specified MTM in registered, else EFalse */ + { + return MtmTypeUidToIndex(aMtmTypeUid)AddObserverL(*iEntryObserver); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/email/pefromance/src/T_Performance421Client.cpp --- a/messagingfw/msgtest/integration/email/pefromance/src/T_Performance421Client.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/email/pefromance/src/T_Performance421Client.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -95,7 +95,7 @@ imap4GetMailInfo.iGetMailBodyParts = EGetImap4EmailBodyTextAndAttachments; iPackage=imap4GetMailInfo; - iSocketServ.Connect(); + User::LeaveIfError(iSocketServ.Connect()); User::LeaveIfError(iConnection.Open(iSocketServ)); } diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/email/src/Emailsmoke.cpp --- a/messagingfw/msgtest/integration/email/src/Emailsmoke.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/email/src/Emailsmoke.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -131,7 +131,10 @@ HBufC* errorText=NULL; TRAPD(ret,errorText= debugInfo.TestFailedStringLC(aError)); if (ret!=KErrNone) + { + CleanupStack::Pop(); return ret; + } TRAP(ret,LogComment(*errorText)); //LogComentL doesn't leave although it has L. TestConsole().Printf(*errorText); TestConsole().Printf(_L("\r")); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/email/src/sms.cpp --- a/messagingfw/msgtest/integration/email/src/sms.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/email/src/sms.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -447,21 +447,24 @@ CheckNumberOfArgumentsL(3); } RFs fs; - fs.Connect(); - TParse fileName; - ResolveFile(fs, (*iArgumentList)[0], (*iArgumentList)[1], fileName); - fs.Close(); - TMsvId folder; - TPtrC folderName = (*iArgumentList)[2]; - if (folderName == _L("inbox")) - folder = KMsvGlobalInBoxIndexEntryId; - else if (folderName == _L("outbox")) - folder = KMsvGlobalOutBoxIndexEntryId; - else if (folderName == _L("sent")) - folder = KMsvSentEntryId; - else - folder = KMsvDraftEntryId; - iSmsTest.AddStateL(new (ELeave) CCreateSmsMessage(folder, iSmsTest.iCurrentServiceId, fileName.FullName(), iSmsTest.SmsTestUtils(),howMany), iDebugInfo); + User::LeaveIfError(fs.Connect()); + TParse fileName; + ResolveFile(fs, (*iArgumentList)[0], (*iArgumentList)[1], fileName); + fs.Close(); + TMsvId folder; + TPtrC folderName = (*iArgumentList)[2]; + if (folderName == _L("inbox")) + folder = KMsvGlobalInBoxIndexEntryId; + else if (folderName == _L("outbox")) + folder = KMsvGlobalOutBoxIndexEntryId; + else if (folderName == _L("sent")) + folder = KMsvSentEntryId; + else + folder = KMsvDraftEntryId; + iSmsTest.AddStateL(new (ELeave) CCreateSmsMessage(folder, + iSmsTest.iCurrentServiceId, fileName.FullName(), + iSmsTest.SmsTestUtils(), howMany), iDebugInfo); + } else if ((*iCurrentCommand) == KCommandSmsEnd) { diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/email/src/t_email.cpp --- a/messagingfw/msgtest/integration/email/src/t_email.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/email/src/t_email.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -120,8 +120,7 @@ { RTest test(_L("Email smoke tests")); RFs fs; - fs.Connect(); - + User::LeaveIfError( fs.Connect() ); // Load the serial comms device drivers. If this is not done, // connecting via NT-RAS returns KErrNotFound (-1). TInt driverErr; diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/sms/3GppR6Support/Steps/src/CCreateReplyTestStep.cpp --- a/messagingfw/msgtest/integration/sms/3GppR6Support/Steps/src/CCreateReplyTestStep.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/sms/3GppR6Support/Steps/src/CCreateReplyTestStep.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -126,7 +126,7 @@ CleanupStack::PopAndDestroy(3,smsMtm); //op, waiter, smsMtm delete iMtmRegistry; - + iMtmRegistry = NULL; CleanupStack::PopAndDestroy(entry); //End of Reply Creation diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/sms/3GppR6Support/Utils/src/CConfigFileParserUtils.cpp --- a/messagingfw/msgtest/integration/sms/3GppR6Support/Utils/src/CConfigFileParserUtils.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/sms/3GppR6Support/Utils/src/CConfigFileParserUtils.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -53,8 +53,7 @@ { RFs fs; - - fs.Connect(); + User::LeaveIfError( fs.Connect() ); RFile file; User::LeaveIfError(file.Open(fs,aFileName,EFileRead)); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/sms/src/T_SmsEnum.cpp --- a/messagingfw/msgtest/integration/sms/src/T_SmsEnum.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/sms/src/T_SmsEnum.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -29,12 +29,14 @@ MsvEntry().SetEntryL(iSmsTest.iProgress.iEnumerateFolder); delete iSelection; + iSelection = NULL; iSelection = MsvEntry().ChildrenL(); iSelection->InsertL(0,iSmsTest.iSmsServiceId); TPckgBuf pkg(KMsvGlobalInBoxIndexEntryId); delete iOperation; + iOperation = NULL; iOperation = Session().TransferCommandL(*iSelection, ESmsMtmCommandCopyFromPhoneStore, pkg, iStatus); SetActive(); CActiveScheduler::Start(); @@ -48,12 +50,14 @@ MsvEntry().SetEntryL(iSmsTest.iProgress.iEnumerateFolder); delete iSelection; + iSelection = NULL; iSelection = MsvEntry().ChildrenL(); iSelection->InsertL(0,iSmsTest.iSmsServiceId); TPckgBuf pkg(KMsvGlobalInBoxIndexEntryId); delete iOperation; + iOperation = NULL; iOperation = Session().TransferCommandL(*iSelection, ESmsMtmCommandMoveFromPhoneStore, pkg, iStatus); SetActive(); CActiveScheduler::Start(); @@ -67,10 +71,12 @@ MsvEntry().SetEntryL(iSmsTest.iProgress.iEnumerateFolder); delete iSelection; + iSelection = NULL; iSelection = MsvEntry().ChildrenL(); iSelection->InsertL(0,iSmsTest.iSmsServiceId); delete iOperation; + iOperation = NULL; iOperation = Session().TransferCommandL(*iSelection, ESmsMtmCommandDeleteFromPhoneStore, TPtrC8(), iStatus); SetActive(); CActiveScheduler::Start(); @@ -92,6 +98,7 @@ iSmsTest(iSelection->Count()); delete iOperation; + iOperation = NULL; iOperation = Session().TransferCommandL(*iSelection, ESmsMtmCommandCopyToPhoneStore, TPtrC8(), iStatus); SetActive(); CActiveScheduler::Start(); @@ -106,6 +113,7 @@ iSelection->AppendL(iSmsTest.iSmsServiceId); delete iOperation; + iOperation = NULL; iOperation = Session().TransferCommandL(*iSelection, ESmsMtmCommandEnumeratePhoneStores, TPtrC8(), iStatus); SetActive(); CActiveScheduler::Start(); @@ -325,6 +333,7 @@ { MsvEntry().SetEntryL(iSmsTest.iProgress.iEnumerateFolder); delete iSelection; + iSelection = NULL; iSelection = MsvEntry().ChildrenL(); iSmsTest.Printf(_L("%d message(s) on SIM. %d message(s) now contained in folder %d.\n"), iSmsTest.iProgress.iMsgCount, iSelection->Count(), iSmsTest.iProgress.iEnumerateFolder); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/sms/src/T_SmsSc.cpp --- a/messagingfw/msgtest/integration/sms/src/T_SmsSc.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/sms/src/T_SmsSc.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -34,6 +34,7 @@ iSmsTest.Test().Next(_L("Read Service Centres from Sim Params")); iState = EStateReadingSimParams; delete iOperation; + iOperation = NULL; iOperation = Client().ReadSimParamsL(iStatus); SetActive(); CActiveScheduler::Start(); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/integration/sms/src/T_smut.cpp --- a/messagingfw/msgtest/integration/sms/src/T_smut.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/integration/sms/src/T_smut.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -862,6 +862,7 @@ // Type ESmsCommand delete iSmsHeader; // deleting previous + iSmsHeader = NULL; iSmsHeader=CSmsHeader::NewL(CSmsPDU::ESmsCommand,*iRichText); iSmsTest(iSmsHeader->Type()==CSmsPDU::ESmsCommand); @@ -873,6 +874,7 @@ // Type ESmsStatusReport delete iSmsHeader; // deleting the previous one + iSmsHeader = NULL; iSmsHeader=CSmsHeader::NewL(CSmsPDU::ESmsStatusReport,*iRichText); iSmsTest(iSmsHeader->Type()==CSmsPDU::ESmsStatusReport); @@ -884,6 +886,7 @@ // Type ESmsSubmit delete iSmsHeader; // deleting the previous one + iSmsHeader = NULL; iSmsHeader=CSmsHeader::NewL(CSmsPDU::ESmsSubmit,*iRichText); iSmsTest(iSmsHeader->Type()==CSmsPDU::ESmsSubmit); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtest/testutils/sms/src/SmsTestBase.cpp --- a/messagingfw/msgtest/testutils/sms/src/SmsTestBase.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtest/testutils/sms/src/SmsTestBase.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -187,7 +187,7 @@ iSmsTest.SetEntryL(KMsvGlobalOutBoxIndexEntryId); delete iOperation; - + iOperation = NULL; // Send the message, by copying it to the SMS Service. if (aMove) { diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActionUtils/src/CMtfTestActionUtilsConfigFileParser.cpp --- a/messagingfw/msgtestfw/TestActionUtils/src/CMtfTestActionUtilsConfigFileParser.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActionUtils/src/CMtfTestActionUtilsConfigFileParser.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -52,8 +52,7 @@ void CMtfTestActionUtilsConfigFileParser::ConstructL(const TDesC& aFileName) { RFs fs; - fs.Connect(); - + User::LeaveIfError( fs.Connect() ); RFile file; User::LeaveIfError(file.Open(fs,aFileName,EFileRead)); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/corruption/src/CMtfTestActionCorruptFile.cpp --- a/messagingfw/msgtestfw/TestActions/Base/corruption/src/CMtfTestActionCorruptFile.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/corruption/src/CMtfTestActionCorruptFile.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -107,7 +107,8 @@ *paramFilePath = aFilePath; RFs aFs; - aFs.Connect(); + TInt err = aFs.Connect(); + User::LeaveIfError(err); CleanupClosePushL(aFs); // corrupt the file diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCopyEntry.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCopyEntry.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCopyEntry.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -89,7 +89,7 @@ TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; - + iOperation = NULL; User::LeaveIfError(err); TestCase().INFO_PRINTF2(_L("Test Action %S completed."), &KTestActionCopyEntry ); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCopySelection.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCopySelection.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCopySelection.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -95,7 +95,7 @@ TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; - + iOperation = NULL; User::LeaveIfError(err); TestCase().INFO_PRINTF2(_L("Test Action %S completed."), &KTestActionCopySelection); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateEntry.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateEntry.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateEntry.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -142,6 +142,7 @@ { TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; + iOperation = NULL; User::LeaveIfError(err); TMsvId paramEntryId; diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateFolder.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateFolder.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateFolder.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -138,6 +138,7 @@ { TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; + iOperation = NULL; User::LeaveIfError(err); TMsvId paramFolderId; diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateMessage.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateMessage.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionCreateMessage.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -138,6 +138,7 @@ { TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; + iOperation = NULL; User::LeaveIfError(err); TMsvId paramMessageId; diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteChildren.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteChildren.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteChildren.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -82,7 +82,7 @@ { TInt undeleted = iDeleteAllChildren->Undeleted(); delete iDeleteAllChildren; - + iDeleteAllChildren = NULL; User::LeaveIfError(iStatus.Int() || undeleted); TestCase().INFO_PRINTF2(_L("Test Action %S completed."), &KTestActionDeleteChildren); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteFolder.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteFolder.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteFolder.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -96,6 +96,7 @@ { TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; + iOperation = NULL; User::LeaveIfError(err); DeleteParameterL(TestCase(),ActionParameters().Parameter(1)); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteMessage.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteMessage.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteMessage.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -97,6 +97,7 @@ { TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; + iOperation = NULL; User::LeaveIfError(err); DeleteParameterL(TestCase(),ActionParameters().Parameter(1)); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteMessageStore.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteMessageStore.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionDeleteMessageStore.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -63,7 +63,8 @@ TPtrC Store = paramStorePath->Des(); RFs fs; - fs.Connect(); + TInt err = fs.Connect(); + User::LeaveIfError(err); CDictionaryFileStore* store = CDictionaryFileStore::SystemLC(fs); const TUid KUidMsvMessageDriveStream = {0x1000163E}; if (store->IsPresentL(KUidMsvMessageDriveStream)) diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionExecuteMtmCommand.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionExecuteMtmCommand.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionExecuteMtmCommand.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -98,6 +98,7 @@ { TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; + iOperation = NULL; User::LeaveIfError(err); TestCase().ActionCompletedL(*this); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionFindFile.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionFindFile.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionFindFile.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -105,7 +105,8 @@ } RMessagingTestUtilityServer ts; - ts.Connect(); + TInt err = ts.Connect(); + User::LeaveIfError(err); CleanupClosePushL(ts); TBool flagFileExists = ts.FileExists(*autoSendFileName); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionInsertMedia.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionInsertMedia.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionInsertMedia.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -66,7 +66,8 @@ TInt drive = ObtainValueParameterL(TestCase(),ActionParameters().Parameter(0)); - fs.Connect(); + TInt err = fs.Connect(); + User::LeaveIfError(err); server.Connect(fs); // This tells the server to pretend that its media is missing next time it gets a disk notification diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionMoveEntry.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionMoveEntry.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionMoveEntry.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -89,7 +89,7 @@ TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; - + iOperation = NULL; User::LeaveIfError(err); TestCase().ActionCompletedL(*this); } diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionMoveSelection.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionMoveSelection.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionMoveSelection.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -95,7 +95,7 @@ TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; - + iOperation = NULL; User::LeaveIfError(err); TestCase().ActionCompletedL(*this); } diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionRemoveMedia.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionRemoveMedia.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionRemoveMedia.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -63,7 +63,7 @@ TInt drive = ObtainValueParameterL(TestCase(),ActionParameters().Parameter(0)); - fs.Connect(); + User::LeaveIfError( fs.Connect() ); server.Connect(fs); // This tells the server to pretend that its media is missing next time it gets a disk notification diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionResetMessageStore.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionResetMessageStore.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionResetMessageStore.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -95,7 +95,7 @@ { TInt undeleted = iDeleteAllChildren->Undeleted(); delete iDeleteAllChildren; - + iDeleteAllChildren = NULL; User::LeaveIfError(iStatus.Int()); RFs fs; diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionSleep.cpp --- a/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionSleep.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Base/src/CMtfTestActionSleep.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -77,7 +77,7 @@ void CMtfTestActionSleep::RunL() { delete iTimer; - + iTimer = NULL; User::LeaveIfError(iStatus.Int()); TestCase().ActionCompletedL(*this); } diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Drm/src/CMtfTestActionSmtpSendEmail.cpp --- a/messagingfw/msgtestfw/TestActions/Drm/src/CMtfTestActionSmtpSendEmail.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Drm/src/CMtfTestActionSmtpSendEmail.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -129,7 +129,7 @@ HBufC* mailFile = ObtainParameterReferenceL(TestCase(), ActionParameters().Parameter(2)); - iFs.Connect(); + User::LeaveIfError( iFs.Connect() ); iFile.Open(iFs, *mailFile, EFileShareAny|EFileRead); iImSocket = CImTextServerSession::NewL(); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Email/Imap4/src/CMtfTestActionConnectAndSyncImap4Server.cpp --- a/messagingfw/msgtestfw/TestActions/Email/Imap4/src/CMtfTestActionConnectAndSyncImap4Server.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Email/Imap4/src/CMtfTestActionConnectAndSyncImap4Server.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -92,7 +92,7 @@ TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; - + iOperation = NULL; User::LeaveIfError(err); TestCase().INFO_PRINTF2(_L("Test Action %S completed."), &KTestActionConnectAndSyncImap4Server); TestCase().ActionCompletedL(*this); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Email/Imap4/src/CMtfTestActionConnectImap4Server.cpp --- a/messagingfw/msgtestfw/TestActions/Email/Imap4/src/CMtfTestActionConnectImap4Server.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Email/Imap4/src/CMtfTestActionConnectImap4Server.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -102,7 +102,7 @@ TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; - + iOperation = NULL; User::LeaveIfError(err); TestCase().INFO_PRINTF2(_L("Test Action %S completed."), &KTestActionConnectImap4Server); TestCase().ActionCompletedL(*this); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Email/Pop3/src/CMtfTestActionConnectPop3Server.cpp --- a/messagingfw/msgtestfw/TestActions/Email/Pop3/src/CMtfTestActionConnectPop3Server.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Email/Pop3/src/CMtfTestActionConnectPop3Server.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -91,7 +91,7 @@ TInt err = MtfTestActionUtilsUser::FinalProgressStatus(*iOperation,iStatus); delete iOperation; - + iOperation = NULL; User::LeaveIfError(err); TestCase().ActionCompletedL(*this); } diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageFromEmailFile.cpp --- a/messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageFromEmailFile.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageFromEmailFile.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -142,8 +142,7 @@ entry->SetEntryL(paramFolderId); RFs fs; - fs.Connect(); - + User::LeaveIfError( fs.Connect() ); CImCltRecvConvert* recvConvert = CImCltRecvConvert::NewLC(fs,entry,KUidMsgTypeSMTP, paramServiceId); recvConvert->SetMsvId(paramFolderId); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageFromParamEmailFile.cpp --- a/messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageFromParamEmailFile.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageFromParamEmailFile.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -105,7 +105,7 @@ // RFs fs; - fs.Connect(); + User::LeaveIfError( fs.Connect() ); RFile file; mailInfo.GetFileName(); User::LeaveIfError( file.Open(fs, mailInfo.GetFileName(), EFileRead ) ); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageVariable.cpp --- a/messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageVariable.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Email/Smtp/src/CMtfTestActionCreateSmtpMessageVariable.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -103,7 +103,7 @@ entry->SetEntryL(paramServiceId); RFs fs; - fs.Connect(); + User::LeaveIfError( fs.Connect() ); CImCltRecvConvert* recvConvert = CImCltRecvConvert::NewLC(fs,entry,entry->Entry().iMtm,paramServiceId); recvConvert->SetMsvId(paramFolderId); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Mms/src/CMtfTestActionCreateMmsMessageFromSmilFile.cpp --- a/messagingfw/msgtestfw/TestActions/Mms/src/CMtfTestActionCreateMmsMessageFromSmilFile.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Mms/src/CMtfTestActionCreateMmsMessageFromSmilFile.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -146,8 +146,7 @@ TInt paramConfigIndexSmilFile = ObtainValueParameterL(TestCase(),ActionParameters().Parameter(3),0); TPtrC SmilFileName = TestCase().GetConfigurationFileL(CMtfConfigurationType::EMtfSmilFile,paramConfigIndexSmilFile); - iFs.Connect(); - + User::LeaveIfError( iFs.Connect() ); iStatus = KRequestPending; iSmilDtd = CSMILDtd::NewL(); iParserObserver = new(ELeave) XmlParserObserver(&iStatus); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Performance/Src/CMtfTestActionSetHeapFailure.cpp --- a/messagingfw/msgtestfw/TestActions/Performance/Src/CMtfTestActionSetHeapFailure.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Performance/Src/CMtfTestActionSetHeapFailure.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -57,8 +57,7 @@ TestCase().INFO_PRINTF2(_L("Test Action %S start..."), &KTestActionSetHeapFailure); RFs fs; RMsvServerSession server; - - fs.Connect(); + UserLeaveIfError( fs.Connect() ); server.Connect(fs); server.SetFailure(EHeapFailure, RHeap::ETrueRandom); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestfw/TestActions/Sms/src/CMtfTestActionReceiveSmsMessages2.cpp --- a/messagingfw/msgtestfw/TestActions/Sms/src/CMtfTestActionReceiveSmsMessages2.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestfw/TestActions/Sms/src/CMtfTestActionReceiveSmsMessages2.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -64,6 +64,7 @@ //Cancel(); iMsventry->RemoveObserver(*this); delete iMsventry; + iMsventry = NULL; } diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestproduct/email/imap/src/T_InsertMedia.cpp --- a/messagingfw/msgtestproduct/email/imap/src/T_InsertMedia.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestproduct/email/imap/src/T_InsertMedia.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -98,7 +98,7 @@ TInt drive = 0; GetIntFromConfig(ConfigSection(), KDrive, drive); - fs.Connect(); + User::LeaveIfError( fs.Connect() ); server.Connect(fs); // This tells the server to pretend that its media is missing next time it gets a disk notification diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestproduct/email/imap/src/T_RemoveMedia.cpp --- a/messagingfw/msgtestproduct/email/imap/src/T_RemoveMedia.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestproduct/email/imap/src/T_RemoveMedia.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -96,7 +96,7 @@ TInt drive = 0; GetIntFromConfig(ConfigSection(), KDrive, drive); - fs.Connect(); + User::LeaveIfError( fs.Connect() ); server.Connect(fs); // This tells the server to pretend that its media is missing next time it gets a disk notification diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestproduct/email/smtp/src/T_UtilsSendEmail.cpp --- a/messagingfw/msgtestproduct/email/smtp/src/T_UtilsSendEmail.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestproduct/email/smtp/src/T_UtilsSendEmail.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -103,7 +103,7 @@ iReceipient.Set(aReceipient); // Connects the client to the file server. - iFs.Connect(); + User::LeaveIfError( iFs.Connect() ); // Opens an existing file reading and a share mode // If the file does not already exist, an error is returned. diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestproduct/media/src/t_setsubsttestwrapper.cpp --- a/messagingfw/msgtestproduct/media/src/t_setsubsttestwrapper.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestproduct/media/src/t_setsubsttestwrapper.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -78,7 +78,7 @@ void CT_SetSubstTestWrapper::ConstructL() { iObject = new (ELeave) TInt; - iFs.Connect(); + User::LeaveIfError( iFs.Connect() ); } /** diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestproduct/testutils/src/T_UtilsConfigFileParserUtility.cpp --- a/messagingfw/msgtestproduct/testutils/src/T_UtilsConfigFileParserUtility.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestproduct/testutils/src/T_UtilsConfigFileParserUtility.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -84,7 +84,7 @@ { RFs fileServerSession; - fileServerSession.Connect(); + User::LeaveIfError( fileServerSession.Connect() ); RFile file; User::LeaveIfError(file.Open(fileServerSession, aFileName, EFileRead)); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgtestproduct/testutils/upssupport/refdialogcreator/source/refdialogcreator.cpp --- a/messagingfw/msgtestproduct/testutils/upssupport/refdialogcreator/source/refdialogcreator.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/msgtestproduct/testutils/upssupport/refdialogcreator/source/refdialogcreator.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -185,11 +185,11 @@ RFs fileServerSession; - fileServerSession.Connect(); + User::LeaveIfError( fileServerSession.Connect() ); RFile file; - file.Open(fileServerSession,KUserResPonseFile,EFileRead); + User::LeaveIfError( file.Open(fileServerSession,KUserResPonseFile,EFileRead) ); TBuf8<8> userResponse; file.Read(userResponse); file.Close(); diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvScheduleSend.h --- a/messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvScheduleSend.h Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvScheduleSend.h Tue Oct 19 11:59:06 2010 +0530 @@ -80,10 +80,10 @@ IMPORT_C void SendingCompleteL(const CMsvEntrySelection& aSelection); - inline CMsvOffPeakTimes& OffPeakTimes() const; - inline CMsvScheduleSettings& ScheduleSettings() const; - inline CMsvSendErrorActions& SendErrorActions() const; - inline CMsvSysAgentActions& AgentActions() const; + inline CMsvOffPeakTimes& OffPeakTimes() const{return *iOffPeakTimes;}; + inline CMsvScheduleSettings& ScheduleSettings() const{return *iSettings;}; + inline CMsvSendErrorActions& SendErrorActions() const{return *iErrorActions;}; + inline CMsvSysAgentActions& AgentActions() const{return *iAgentActions;}; IMPORT_C static void CreateScheduleL(RScheduler& aScheduler, const CMsvScheduleSettings& aSettings, const TTime& aStartTime, const TTimeIntervalMinutes& aValidityPeriod, TSchedulerItemRef& aRef); IMPORT_C static void CreateScheduleL(RScheduler& aScheduler, const CArrayFixFlat& aConditions, const TTime& aTimeout, TSchedulerItemRef& aRef); @@ -187,6 +187,4 @@ CArrayFixFlat* iSchTaskInfo; }; -#include - #endif diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvScheduledEntry.h --- a/messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvScheduledEntry.h Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvScheduledEntry.h Tue Oct 19 11:59:06 2010 +0530 @@ -108,26 +108,26 @@ */ virtual void RecipientsRestoreL(CMsvStore& aStore) = 0; - inline const TTime& ScheduleDate() const; - inline void SetScheduleDate(const TTime& aDate); + inline const TTime& ScheduleDate() const{return iEntry.iDate;}; + inline void SetScheduleDate(const TTime& aDate){iEntry.iDate = aDate;}; - inline const TBool Scheduled() const; - inline void SetScheduled(const TBool aScheduled); + inline const TBool Scheduled() const{return iEntry.Scheduled();}; + inline void SetScheduled(const TBool aScheduled){iEntry.SetScheduled(aScheduled);}; - inline const TInt SendingState() const; - inline void SetSendingState(TInt aState); + inline const TInt SendingState() const{return iEntry.SendingState();}; + inline void SetSendingState(TInt aState){iEntry.SetSendingState(aState);}; - inline const TInt Error() const; - inline const TMsvId Id() const; - inline const TBool OffPeak() const; + inline const TInt Error() const{return iEntry.iError;}; + inline const TMsvId Id() const{return iEntry.Id();}; + inline const TBool OffPeak() const{return iEntry.OffPeak();}; - inline void SetFailed(const TBool aFail); - inline const TBool Failed() const; + inline void SetFailed(const TBool aFail){iEntry.SetFailed(aFail);}; + inline const TBool Failed() const{return iEntry.Failed();}; IMPORT_C TBool PendingConditions() const; IMPORT_C void SetPendingConditions(TBool aPendingConditions); - inline const TUid Mtm() const; + inline const TUid Mtm() const{return iEntry.iMtm;}; IMPORT_C void Entry(TMsvEntry& aEntry) const; @@ -153,6 +153,5 @@ */ typedef CArrayPtrFlat CMsvScheduledEntries; -#include #endif diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/wappushfw/SISLPushMsgUtils/src/SISLPushMsgUtils.cpp --- a/messagingfw/wappushfw/SISLPushMsgUtils/src/SISLPushMsgUtils.cpp Tue Oct 05 13:50:47 2010 +0530 +++ b/messagingfw/wappushfw/SISLPushMsgUtils/src/SISLPushMsgUtils.cpp Tue Oct 19 11:59:06 2010 +0530 @@ -275,9 +275,12 @@ pushMsg = CSLPushMsgEntry::NewL(); } - CleanupStack::PushL(pushMsg); - pushMsg->RetrieveL(Session(), iMsvEntry->EntryId()); - CleanupStack::Pop(pushMsg); + if(pushMsg) + { + CleanupStack::PushL(pushMsg); + pushMsg->RetrieveL(Session(), iMsvEntry->EntryId()); + CleanupStack::Pop(pushMsg); + } return pushMsg; } @@ -527,16 +530,18 @@ iMsvEntry->SetEntryL(aId); CPushMsgEntryBase* pushEntry = GetPushMsgEntryL(aPushType); - - if (aPushType == KUidWapPushMsgSI) - { - date = STATIC_CAST(CSIPushMsgEntry*, pushEntry) ->Created(); - } - else if (aPushType == KUidWapPushMsgSL) - { - date = STATIC_CAST(CSLPushMsgEntry*, pushEntry) ->TimeSent(); - } - delete pushEntry; + if(pushEntry) + { + if (aPushType == KUidWapPushMsgSI) + { + date = STATIC_CAST(CSIPushMsgEntry*, pushEntry) ->Created(); + } + else if (aPushType == KUidWapPushMsgSL) + { + date = STATIC_CAST(CSLPushMsgEntry*, pushEntry) ->TimeSent(); + } + delete pushEntry; + } return date; }