--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 );
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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");
}
--- 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");
--- 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
--- 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
--- 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++ )
--- 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
--- 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
--- /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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="contentcontrol" name="Content Control Daemons" levels="plugin framework app">
+ <collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+ <component id="ds_contact_adapter_customization_api" name="DS Contact Adapter Customization API" class="api" filter="s60" introduced="^3">
+ <meta rel="Api" href="contentctrl_plat/ds_contact_adapter_customization_api/ds_contact_adapter_customization_api.metaxml"/>
+ <unit bldFile="contentctrl_plat/ds_contact_adapter_customization_api/group"/>
+ </component>
+ <component id="ds_contactsdatastoreextension_api" name="DS Contacts Data Store Extension API" class="api" filter="s60" introduced="^4">
+ <meta rel="Api" href="contentctrl_plat/ds_contactsdatastoreextension_api/ds_contactsdatastoreextension_api.metaxml"/>
+ <unit bldFile="contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
+ </component>
+ <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+ <meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
+ <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
+ </component>
+ </collection>
+ <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+ <component id="secon" filter="s60" name="Service Controllers">
+ <unit bldFile="connectivitymodules/secon/group"/>
+ </component>
+ </collection>
+ <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+ <!-- Component at wrong rank, should move down a directory -->
+ <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+ <unit bldFile="dsdcmoadapter/group"/>
+ </component>
+ </collection>
+ <collection id="omads" name="OMA Data Sync" level="app">
+ <component id="omads_build" filter="s60" name="OMA DS Build">
+ <unit bldFile="omads/group"/> <!-- need to remove #include and rename and OMA DS ROM -->
+ </component>
+ <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+ <unit bldFile="omads/omadsextensions/group"/>
+ </component>
+ <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
+ <unit bldFile="omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- /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 @@
+<PackageMap root="sf" layer="app"/>