# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701255 -10800 # Node ID ef2733361cdbe1834cdaf0d0582a08fe85dd91bd # Parent 875f413e6ce931841611c9a9882730aa11c72bd6 Revision: 201035 Kit: 201037 diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -37,3 +37,6 @@ LIBRARY euser.lib LIBRARY apmime.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp --- a/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -60,3 +60,6 @@ LIBRARY estor.lib // RMemWriteStream LIBRARY efsrv.lib // Rfs, RFile DEBUGLIBRARY flogger.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp --- a/connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -48,3 +48,6 @@ LIBRARY charconv.lib LIBRARY smlstoreformat.lib DEBUGLIBRARY flogger.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp --- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -58,3 +58,6 @@ LIBRARY bafl.lib DEBUGLIBRARY flogger.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp --- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -48,3 +48,6 @@ LIBRARY vcard.lib LIBRARY bafl.lib DEBUGLIBRARY flogger.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp --- a/connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -55,3 +55,6 @@ LIBRARY efsrv.lib LIBRARY bluetooth.lib LIBRARY esock.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -56,3 +56,6 @@ LIBRARY platformenv.lib LIBRARY irobex.lib LIBRARY hwrmhapticspacketizer.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp --- a/connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -61,3 +61,6 @@ LIBRARY apmime.lib LIBRARY bluetooth.lib LIBRARY esock.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp --- a/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -76,3 +76,6 @@ LIBRARY btengsettings.lib DEBUGLIBRARY flogger.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp --- a/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -59,3 +59,6 @@ LIBRARY nsmlchangefinder.lib LIBRARY smlstoreformat.lib LIBRARY charconv.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp --- a/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -75,3 +75,6 @@ LIBRARY sysversioninfo.lib LIBRARY etel3rdparty.lib LIBRARY platformver.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp --- a/connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -72,3 +72,6 @@ LIBRARY sysutil.lib LIBRARY centralrepository.lib DEBUGLIBRARY flogger.lib // For debug logging + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp --- a/connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -45,3 +45,6 @@ LIBRARY euser.lib LIBRARY wsaccountmanager.lib LIBRARY estor.lib // For RWriteStream + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp --- a/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -95,3 +95,6 @@ LIBRARY sif.lib DEBUGLIBRARY flogger.lib // End of file + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp --- a/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -54,3 +54,6 @@ LIBRARY euser.lib LIBRARY estor.lib DEBUGLIBRARY flogger.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb contentctrl_plat/ds_data_modification_api/tsrc/mt_cnsmldatamodbase/mt_cnsmldatamodbase.mmp --- a/contentctrl_plat/ds_data_modification_api/tsrc/mt_cnsmldatamodbase/mt_cnsmldatamodbase.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/contentctrl_plat/ds_data_modification_api/tsrc/mt_cnsmldatamodbase/mt_cnsmldatamodbase.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -65,3 +65,6 @@ LIBRARY nsmldatamod.lib LIBRARY smlstoreformat.lib LIBRARY bafl.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp --- a/dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -48,4 +48,6 @@ LIBRARY euser.lib ECom.lib efsrv.lib LIBRARY centralrepository.lib LIBRARY commonengine.lib -LIBRARY hbcore.lib hbwidgets.lib \ No newline at end of file +LIBRARY hbcore.lib hbwidgets.lib + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp --- a/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -68,3 +68,6 @@ LIBRARY nsmlchangefinder.lib wbxmllib.lib bafl.lib sysutil.lib LIBRARY CalInterimAPI.lib msgs.lib CalenImp.lib CalenInterimUtils2.lib LIBRARY versit.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp --- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Fri Sep 17 08:27:35 2010 +0300 @@ -1395,6 +1395,16 @@ Multiple items are not supported: END"); User::Leave( KErrNotSupported ); } + + // Check the validity of the calentry + CCalEntry* arrayentry = rdArray[0]; + if ( !arrayentry ) + { + CleanupStack::PopAndDestroy( 2 ); // rdArray, readStream + _DBG_FILE("CNSmlAgendaDataStore::DoCommitCreateItemL - \ + Invalid Calentry: END"); + User::Leave( KErrGeneral ); + } TInt err( KErrNone ); @@ -1595,6 +1605,16 @@ Multiple items are not supported: END"); User::Leave( KErrNotSupported ); } + + // Check the validity of the calentry + CCalEntry* arrayentry = rdArray[0]; + if ( !arrayentry ) + { + CleanupStack::PopAndDestroy( 2 ); // rdArray, readStream + _DBG_FILE("CNSmlAgendaDataStore::DoCommitCreateItemL - \ + Invalid Calentry: END"); + User::Leave( KErrGeneral ); + } TInt err( KErrNone ); diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/bookmark/group/bookmarkdataprovider.mmp --- a/omads/omadsextensions/adapters/bookmark/group/bookmarkdataprovider.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/bookmark/group/bookmarkdataprovider.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -73,4 +73,6 @@ LIBRARY sysutil.lib LIBRARY commonengine.lib // For resource reader LIBRARY FeedsServerClient.lib -LIBRARY hash.lib \ No newline at end of file +LIBRARY hash.lib + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp --- a/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -70,3 +70,6 @@ LIBRARY nsmldshostclient.lib LIBRARY nsmlcontactsdatastoreextension.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/contactsgroup/group/contactsgrpdataprovider.mmp --- a/omads/omadsextensions/adapters/contactsgroup/group/contactsgrpdataprovider.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/contactsgroup/group/contactsgrpdataprovider.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -69,3 +69,6 @@ LIBRARY cntmodel.lib LIBRARY vcard.lib LIBRARY versit.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/mediads/group/mediads.mmp --- a/omads/omadsextensions/adapters/mediads/group/mediads.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/mediads/group/mediads.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -76,3 +76,6 @@ LIBRARY platformenv.lib LIBRARY mdccommon.lib LIBRARY mdeclient.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/mms/group/mmsdataprovider.mmp --- a/omads/omadsextensions/adapters/mms/group/mmsdataprovider.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/mms/group/mmsdataprovider.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -66,3 +66,6 @@ LIBRARY nsmlchangefinder.lib LIBRARY SenXml.lib LIBRARY charconv.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp --- a/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -68,3 +68,6 @@ LIBRARY calinterimapi.lib caleninterimutils2.lib LIBRARY nsmldebug.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp --- a/omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp Fri Sep 17 08:27:35 2010 +0300 @@ -698,24 +698,24 @@ { _NOTEPAD_DBG_FILE("CNSmlNotepadDataStore::DoWriteItemL(): begin"); if ( iState == ENSmlItemCreating || iState == ENSmlItemUpdating ) - { - TInt totalSize = aData.Size() + iItemData->Size(); - if( SysUtil::DiskSpaceBelowCriticalLevelL( &iRfs, totalSize, iDrive ) ) - { - User::RequestComplete(iCallerStatus, KErrDiskFull); - return; - } + { if ( iItemData ) - { - if ( iWriterPosition == -1 ) - { + { + TInt totalSize = aData.Size() + iItemData->Size(); + if( SysUtil::DiskSpaceBelowCriticalLevelL( &iRfs, totalSize, iDrive ) ) + { + User::RequestComplete(iCallerStatus, KErrDiskFull); + return; + } + if ( iWriterPosition == -1 ) + { User::Leave( KErrEof ); - } - iItemData->InsertL( iWriterPosition , aData ); - iWriterPosition = aData.Size(); - return; - } + } + iItemData->InsertL( iWriterPosition , aData ); + iWriterPosition = aData.Size(); + return; } + } User::Leave( KErrNotReady ); _NOTEPAD_DBG_FILE("CNSmlNotepadDataStore::DoWriteItemL(): end"); } diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/notes/src/nsmlnotepadDatabase.cpp --- a/omads/omadsextensions/adapters/notes/src/nsmlnotepadDatabase.cpp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/notes/src/nsmlnotepadDatabase.cpp Fri Sep 17 08:27:35 2010 +0300 @@ -245,11 +245,6 @@ //CleanupStack::Pop(aItem); CleanupStack::PopAndDestroy(entryTobeFetched); } - else - { - delete entryTobeFetched; - entryTobeFetched = NULL; - } } _NOTEPAD_DBG_FILE("CNSmlNotepadDatabase::GetNoteL(): end"); diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/adapters/sms/group/smsdataprovider.mmp --- a/omads/omadsextensions/adapters/sms/group/smsdataprovider.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/adapters/sms/group/smsdataprovider.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -72,3 +72,6 @@ LIBRARY cntmodel.lib LIBRARY SenXml.lib LIBRARY charconv.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/datamod/bld/nsmldatamod.mmp --- a/omads/omadsextensions/datamod/bld/nsmldatamod.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/datamod/bld/nsmldatamod.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -47,3 +47,6 @@ LIBRARY bafl.lib LIBRARY smlstoreformat.lib LIBRARY nsmldebug.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/datamod/src/nsmldatamodbase.cpp --- a/omads/omadsextensions/datamod/src/nsmldatamodbase.cpp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/datamod/src/nsmldatamodbase.cpp Fri Sep 17 08:27:35 2010 +0300 @@ -112,7 +112,7 @@ EXPORT_C void CNSmlDataModBase::StripTxL( CBufBase& aItem ) { _DBG_FILE("CNSmlDataModBase::StripTxL(): begin"); - HBufC8* buf = HBufC8::NewLC(aItem.Size() * 2); + HBufC8* buf = HBufC8::NewLC(aItem.Size()); *buf = aItem.Ptr(0); TPtr8 ptrBuf = buf->Des(); @@ -285,7 +285,7 @@ for( TInt i = 0; i < allProps->Count(); ) // Variable i is not increased here because size of count might be changes during loop { const CParserProperty& ownProperty = *allProps->At( i ); - CParserPropertyValue* ownValue = ownProperty.Value(); + TBool removeMe( EFalse ); @@ -458,8 +458,7 @@ for( TInt i = 0; i < allProps->Count(); ) // Variable i is not increased here because size of count might be changes during loop { const CParserProperty& ownProperty = *allProps->At( i ); - CParserPropertyValue* ownValue = ownProperty.Value(); - + TBool removeMe( ETrue ); for( TInt i2 = 0; i2 < iRemoteStoreFormat->MimeFormat( iUsedRemoteMimeType ).PropertyCount(); i2++ ) diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp --- a/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp Fri Sep 17 08:27:35 2010 +0300 @@ -47,3 +47,6 @@ LIBRARY euser.lib InetProtUtil.lib + + +SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro --- a/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro Thu Sep 02 20:16:30 2010 +0300 +++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro Fri Sep 17 08:27:35 2010 +0300 @@ -58,4 +58,6 @@ TARGET.EPOCHEAPSIZE = "0x020000 0x800000" TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = CAP_GENERAL_DLL -} \ No newline at end of file +} + +symbian:MMP_RULES += SMPSAFE diff -r 875f413e6ce9 -r ef2733361cdb package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Fri Sep 17 08:27:35 2010 +0300 @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 875f413e6ce9 -r ef2733361cdb package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Sep 17 08:27:35 2010 +0300 @@ -0,0 +1,1 @@ +