# HG changeset patch # User Pat Downey # Date 1283340527 -3600 # Node ID a9c0808a10954079cd8b519a4ed97d7f75cf7ad8 # Parent 0b68a1b0c15ef7cfd255462aa9bd8157bc5be600 Revert incorrect RCL_3 drop: Revision: 201033 Kit: 201035 diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/group/bld.inf --- a/serviceproviders/group/bld.inf Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/group/bld.inf Wed Sep 01 12:28:47 2010 +0100 @@ -17,15 +17,15 @@ #include -//#include "../sapi_contacts_vpbk/group/bld.inf" +#include "../sapi_contacts_vpbk/group/bld.inf" #include "../sapi_location/group/bld.inf" #include "../sapi_mediamanagement/group/bld.inf" #include "../sapi_landmarks/group/bld.inf" //#include "../camera/group/bld.inf" -//#include "../sapi_messaging/group/bld.inf" +#include "../sapi_messaging/group/bld.inf" -//#include "../sapi_applicationmanager/group/bld.inf" -//#include "../sapi_calendar/group/bld.inf" +#include "../sapi_applicationmanager/group/bld.inf" +#include "../sapi_calendar/group/bld.inf" #include "../sapi_logging/group/bld.inf" #include "../sapi_sensor/group/bld.inf" #include "../sapi_sysinfo/group/bld.inf" diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/group/sapiincludes.mmpi --- a/serviceproviders/group/sapiincludes.mmpi Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/group/sapiincludes.mmpi Wed Sep 01 12:28:47 2010 +0100 @@ -12,8 +12,8 @@ * Contributors: * * Description: Sapi include path dependencies. -* %created_by: slathia % -* %date_created: Sat Oct 31 14:39:55 2009 % +* %created_by: shreedha % +* %date_created: Wed May 12 09:52:12 2010 % * Copyright © 2006-2007 Nokia. All rights reserved. * This material, including documentation and any related computer * programs, is protected by copyright controlled by Nokia. All @@ -32,7 +32,7 @@ #include SYSTEMINCLUDE /epoc32/include/icl SYSTEMINCLUDE /epoc32/include/libc - +SYSTEMINCLUDE /epoc32/include/mmf/common APP_LAYER_SYSTEMINCLUDE diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/jsapi/platformservices/src/framework.js --- a/serviceproviders/jsapi/platformservices/src/framework.js Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/jsapi/platformservices/src/framework.js Wed Sep 01 12:28:47 2010 +0100 @@ -85,9 +85,9 @@ nokia.device = { load: __device_service_load, listInterfaces: __device_service_interfaces, - getSystemProperties: __device_getSystemProperties, - getLibraryVersion: __device_getLibraryVersion, - version: 2.0 + getSystemProperties: __device_getSystemProperties, + getLibraryVersion: __device_getLibraryVersion, + version: 2.0 }; function __device_getLibraryVersion(){ diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/jsapi/platformservices/src/landmarks.js --- a/serviceproviders/jsapi/platformservices/src/landmarks.js Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/jsapi/platformservices/src/landmarks.js Wed Sep 01 12:28:47 2010 +0100 @@ -15,6 +15,8 @@ * */ +// Namepace: com.nokia.device.service + var __device_landmarks_service_entry = { "name": null, "version": null, diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/jsapi/platformservices/src/sensors.js --- a/serviceproviders/jsapi/platformservices/src/sensors.js Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/jsapi/platformservices/src/sensors.js Wed Sep 01 12:28:47 2010 +0100 @@ -15,6 +15,9 @@ * */ + +// sensors service interface + var __device_sensors_service_entry = {"name": null, "version": null, "proto": __device_sensors, diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/rom/serviceapi.iby --- a/serviceproviders/rom/serviceapi.iby Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/rom/serviceapi.iby Wed Sep 01 12:28:47 2010 +0100 @@ -39,8 +39,8 @@ file=ABI_DIR\BUILD_DIR\landmarkservice.dll SHARED_LIB_DIR\landmarkservice.dll ECOM_PLUGIN(landmarkprovider.dll, landmarkprovider.rsc) -//file=ABI_DIR\BUILD_DIR\messagingservice.dll SHARED_LIB_DIR\messagingservice.dll -//ECOM_PLUGIN(messagingprovider.dll, messagingprovider.rsc) +file=ABI_DIR\BUILD_DIR\messagingservice.dll SHARED_LIB_DIR\messagingservice.dll +ECOM_PLUGIN(messagingprovider.dll, messagingprovider.rsc) file=ABI_DIR\BUILD_DIR\mediamanagementservice.dll SHARED_LIB_DIR\mediamanagementservice.dll ECOM_PLUGIN(mediamanagementprovider.dll, mediamanagementprovider.rsc) @@ -48,16 +48,16 @@ //file=ABI_DIR\BUILD_DIR\cameraservice.dll SHARED_LIB_DIR\cameraservice.dll //ECOM_PLUGIN(cameraprovider.dll, cameraprovider.rsc) -//file=ABI_DIR\BUILD_DIR\contactservice.dll SHARED_LIB_DIR\contactservice.dll -//ECOM_PLUGIN(contactprovider.dll, contactprovider.rsc) +file=ABI_DIR\BUILD_DIR\contactservice.dll SHARED_LIB_DIR\contactservice.dll +ECOM_PLUGIN(contactprovider.dll, contactprovider.rsc) -//file=ABI_DIR\BUILD_DIR\appmanagerservice.dll SHARED_LIB_DIR\appmanagerservice.dll -//ECOM_PLUGIN(appmanagerprovider.dll, appmanagerprovider.rsc) +file=ABI_DIR\BUILD_DIR\appmanagerservice.dll SHARED_LIB_DIR\appmanagerservice.dll +ECOM_PLUGIN(appmanagerprovider.dll, appmanagerprovider.rsc) -//file=ABI_DIR\BUILD_DIR\calendarservice.dll SHARED_LIB_DIR\calendarservice.dll -//ECOM_PLUGIN(calendarprovider.dll, calendarprovider.rsc) +file=ABI_DIR\BUILD_DIR\calendarservice.dll SHARED_LIB_DIR\calendarservice.dll +ECOM_PLUGIN(calendarprovider.dll, calendarprovider.rsc) file=ABI_DIR\BUILD_DIR\loggingservice.dll SHARED_LIB_DIR\loggingservice.dll ECOM_PLUGIN(loggingprovider.dll, loggingprovider.rsc) diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/testappobserver.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/testappobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/testappobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -76,6 +76,7 @@ iWait->AsyncStop(); + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/conf/tappmanagertest.cfg --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/conf/tappmanagertest.cfg Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/conf/tappmanagertest.cfg Wed Sep 01 12:28:47 2010 +0100 @@ -43,7 +43,7 @@ title LaunchApp_correctUId_synch create tappmanagertest foobar //scheme uid commandline doc mode postion callback expectedresult -foobar launchApp s60uid: 0x101f4d90 NULL NULL NULL NULL NULL 0 +foobar launchApp s60uid: 0x200009ee NULL NULL NULL NULL NULL 0 delete foobar [Endtest] @@ -72,7 +72,7 @@ title LaunchApp_Image_commandline_synch create tappmanagertest foobar //scheme uid commandline doc mode postion callback expectedresult -foobar launchApp s60uid: 0x101f4d90 c:\Data\Images\AppTest1.jpg NULL NULL NULL NULL 0 +foobar launchApp s60uid: 0x200009ee c:\Data\Images\AppTest1.jpg NULL NULL NULL NULL 0 delete foobar [Endtest] @@ -81,7 +81,7 @@ title LaunchApp_Image_Document_synch create tappmanagertest foobar //scheme uid commandline doc mode postion callback expectedresult -foobar launchApp s60uid: 0x101f4d90 NULL c:\Data\Images\AppTest2.jpg NULL NULL NULL 0 +foobar launchApp s60uid: 0x200009ee NULL c:\Data\Images\AppTest2.jpg NULL NULL NULL 0 delete foobar [Endtest] @@ -99,7 +99,7 @@ title LaunchApp_Background_Manual create tappmanagertest foobar //scheme uid commandline doc mode postion callback expectedresult -foobar launchApp s60uid: 0x101f4d90 NULL c:\Data\Images\AppTest4.jpg NULL BackGround NULL 0 +foobar launchApp s60uid: 0x200009ee NULL c:\Data\Images\AppTest4.jpg NULL BackGround NULL 0 delete foobar [Endtest] @@ -178,7 +178,7 @@ title Get_ApplicationList_Postive create tappmanagertest foobar //content Document MimeType ExpectedResult FileName NoOfUids -foobar getlisttest Application NULL NULL 0 Result3 2 0x100059ef 0x10005955 +foobar getlisttest Application NULL NULL 0 Result3 2 0x101f8543 0x10005955 delete foobar [Endtest] diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertestobserver.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertestobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -74,6 +74,7 @@ User::Leave(KErrGeneral); iLeave = EFalse; } + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -186,5 +186,6 @@ return error; } + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -292,7 +292,7 @@ const TLiwGenericParam* p= NULL; - CLiwIterable* iter; + CLiwIterable* iter = NULL; TLiwVariant Map; const CLiwMap* infomap; TInt err= 0; @@ -1410,7 +1410,7 @@ const TLiwGenericParam* p= NULL; - CLiwIterable* iter; + CLiwIterable* iter = NULL; TLiwVariant Map; const CLiwMap* infomap; TInt err= 0; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/testappobserver.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/testappobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/testappobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -75,7 +75,7 @@ } - + return 0; } @@ -90,4 +90,6 @@ iWait = aWait; iReason = 10 ; //Reason of failure can be either 0 or some negative valuw which incater //error but it cant be greater than 0 - } \ No newline at end of file + } + + \ No newline at end of file diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/conf/tappmgrtest.cfg --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/conf/tappmgrtest.cfg Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/conf/tappmgrtest.cfg Wed Sep 01 12:28:47 2010 +0100 @@ -56,7 +56,7 @@ [Test] title LaunchApp_Image_viewer create tappmgrtest foobar -foobar launchApp s60uid: 0x101f4d90 NULL NULL NULL NULL NULL 0 +foobar launchApp s60uid: 0x200009ee NULL NULL NULL NULL NULL 0 delete foobar [Endtest] @@ -73,7 +73,7 @@ [Test] title LaunchApp_JarFile create tappmgrtest foobar -foobar launchJar s60uid: SpruceTennis NULL NULL NULL NULL NULL 0 +foobar launchJar s60uid: SpruceTennis NULL NULL NULL NULL NULL -2 delete foobar [Endtest] @@ -85,7 +85,7 @@ title LaunchApp_CancellaunchAppL_1 create tappmgrtest foobar // scheme uid commmandline doc mode postion callback expected -foobar CancellaunchAppL s60uid: 0x101f4d90 NULL NULL NULL NULL Callback 0 +foobar CancellaunchAppL s60uid: 0x200009ee NULL NULL NULL NULL Callback 0 delete foobar [Endtest] diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/calendarservice/src/calendarimport.cpp --- a/serviceproviders/sapi_calendar/calendarservice/src/calendarimport.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarimport.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -24,7 +24,7 @@ #include #include #include - +#include //User Include #include "calendarheader.h" #include "calendarconstants.h" @@ -147,6 +147,7 @@ // void CCalendarImport::ImportFromStreamL(RReadStream& aStream, RPointerArray& aOutputUIDArray ) { + CleanupResetAndDestroyPushL(aOutputUIDArray); RPointerArray outputCalEntryArray; CleanupStack::PushL( TCleanupItem(CleanupCCalEntryArray, &outputCalEntryArray) ); @@ -182,6 +183,7 @@ } CleanupStack::PopAndDestroy( &outputCalEntryArray ); + CleanupStack::Pop(&aOutputUIDArray); } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/tcalendaradditer3.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/tcalendaradditer3.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/tcalendaradditer3.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,10 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + + + TARGET tcalendaradditer3.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -185,7 +185,7 @@ { return KErrGeneral; } - if( errorcode = res ) + if( errorcode == res ) res = KErrNone; return res; @@ -225,7 +225,7 @@ // __UHEAP_MARKEND; - return result; + //return result; } TInt CTCalendarAddTest::AddApptWithWeeklyRepeat(CStifItemParser& /*aItem*/) { @@ -242,7 +242,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarAddTest::AddApptWithMonthlyRepeat(CStifItemParser& /*aItem*/) { @@ -259,7 +259,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarAddTest::AddApptWithAttendees(CStifItemParser& /*aItem*/) { @@ -276,7 +276,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarAddTest::AddNewAnniversary(CStifItemParser& /*aItem*/) { @@ -293,7 +293,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarAddTest::AddNewDayEvent(CStifItemParser& /*aItem*/) { @@ -310,7 +310,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarAddTest::AddNewReminder(CStifItemParser& /*aItem*/) { @@ -327,7 +327,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarAddTest::AddNewTodo(CStifItemParser& /*aItem*/) { @@ -344,7 +344,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarAddTest::AddAll(CStifItemParser& aItem) diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,7 @@ int UpdateInstanceWithRepeat(); int UpdateEntryWithRepeatAndExceptionDates(); int AddEntryWithVeryLongDescription(); - TDesC& GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC localuid, const TDesC& calname ); + TDesC GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC localuid, const TDesC& calname ); CTestSync(); ~CTestSync(); @@ -1304,7 +1304,7 @@ } -TDesC& CTestSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname) +TDesC CTestSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname) { inparam->Reset(); outparam->Reset(); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/tcalendarchangenotifyiter3.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/tcalendarchangenotifyiter3.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/tcalendarchangenotifyiter3.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendarchangenotifyiter3.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/tcalendardeleteiter3.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/tcalendardeleteiter3.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/tcalendardeleteiter3.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendardeleteiter3.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -59,7 +59,7 @@ CLiwGenericParamList& aEventParamList, const CLiwGenericParamList& aInParamList) { - TInt32 errCode; + TInt32 errCode = 0; TInt pos = 0; // Traiverse the List and Fill in the Log Files @@ -313,7 +313,7 @@ { TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam)); const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code - TInt errCode; + TInt errCode = 0; if( p ) { errCode = p->Value().AsTInt32(); @@ -387,6 +387,7 @@ iResult = errCode; return errCode; } + return 0; } @@ -567,7 +568,7 @@ filterMap->InsertL(KCalendarName,TLiwVariant(_L("C:Calendar"))); TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam/*, KLiwOptASyncronous, iCallback*/)); - TInt errCode; + TInt errCode = 0; const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code if( p ) { @@ -624,7 +625,7 @@ filterMap->InsertL(KCalendarName,TLiwVariant(_L("C:CalendarFileZ"))); TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam/*, KLiwOptASyncronous, iCallback*/)); - TInt errCode; + TInt errCode = 0; const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code if( p ) { diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -297,7 +297,7 @@ { TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam)); const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code - TInt errCode; + TInt errCode = 0; if( p ) { errCode = p->Value().AsTInt32(); @@ -373,9 +373,10 @@ CTestAsyncGuid* test = CTestAsyncGuid::NewL(); int res = test->Start(flag, async); delete test; + __UHEAP_MARKEND; return res; - __UHEAP_MARKEND; + } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -59,7 +59,7 @@ CLiwGenericParamList& aEventParamList, const CLiwGenericParamList& aInParamList) { - TInt32 errCode; + TInt32 errCode = 0; TInt pos = 0; // Traiverse the List and Fill in the Log Files @@ -305,7 +305,7 @@ { TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam)); const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code - TInt errCode; + TInt errCode = 0; if( p ) { errCode = p->Value().AsTInt32(); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/tcalendarexportiter3.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/tcalendarexportiter3.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/tcalendarexportiter3.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendarexportiter3.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/tcalendargenerictest.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/tcalendargenerictest.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/tcalendargenerictest.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -23,6 +23,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendargenerictest.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertestobserver.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertestobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -69,6 +69,7 @@ if(iWait) iWait->AsyncStop(); + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/tcalendargetlistiter3.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/tcalendargetlistiter3.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/tcalendargetlistiter3.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendargetlistiter3.dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -43,7 +43,7 @@ void GetLocalUid( const TDesC& aLocalUid, TCalLocalUid& aOutLocalUid ); void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid ); -TDesC& GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname); +TDesC GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname); class CCalGetListCallback : public MLiwNotifyCallback { @@ -1988,7 +1988,7 @@ aOutGlobalUid.Copy( aGlobalUid ); } -TDesC& GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname) +TDesC GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname) { inparam->Reset(); outparam->Reset(); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/tcalendarimportiter3.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/tcalendarimportiter3.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/tcalendarimportiter3.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendarimportiter3.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/tcalendarupdateiter3.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/tcalendarupdateiter3.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/tcalendarupdateiter3.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendarupdateiter3.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,7 @@ int UpdateTodoEntryWithGlobalIdL(); int UpdateAppointmentEntryWithNewTimeAndGlobalIdL(); - TDesC& GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname); + TDesC GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname); CTestUpdateSync(); ~CTestUpdateSync(); @@ -197,7 +197,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewTimeL(CStifItemParser& /*aItem*/) @@ -215,7 +215,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewAttendeesL(CStifItemParser& /*aItem*/) @@ -233,7 +233,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } @@ -252,7 +252,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarUpdateTest::UpdateDayEventL(CStifItemParser& /*aItem*/) @@ -270,7 +270,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarUpdateTest::UpdateReminderL(CStifItemParser& /*aItem*/) @@ -288,7 +288,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarUpdateTest::UpdateTodoEntryL(CStifItemParser& /*aItem*/) { @@ -305,7 +305,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewRepeatL(CStifItemParser& /*aItem*/) @@ -323,7 +323,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithGlobalIdL(CStifItemParser& /*aItem*/) { @@ -340,7 +340,7 @@ // __UHEAP_MARKEND; - return result; +// return result; } TInt CTCalendarUpdateTest::UpdateAnniversaryWithGlobalIdL(CStifItemParser& /*aItem*/) @@ -358,7 +358,7 @@ // __UHEAP_MARKEND; - return result; + //return result; } TInt CTCalendarUpdateTest::UpdateDayEventWithGlobalIdL(CStifItemParser& /*aItem*/) @@ -376,7 +376,7 @@ // __UHEAP_MARKEND; - return result; + //return result; } TInt CTCalendarUpdateTest::UpdateReminderWithGlobalIdL(CStifItemParser& /*aItem*/) @@ -394,7 +394,7 @@ // __UHEAP_MARKEND; - return result; + //return result; } TInt CTCalendarUpdateTest::UpdateTodoEntryWithGlobalIdL(CStifItemParser& /*aItem*/) { @@ -411,7 +411,7 @@ // __UHEAP_MARKEND; - return result; + //return result; } TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewTimeAndGlobalIdL(CStifItemParser& /*aItem*/) { @@ -428,7 +428,7 @@ // __UHEAP_MARKEND; - return result; + //return result; } TInt CTestUpdateSync::UpdateAppointmentEntryL() @@ -2655,7 +2655,7 @@ } -TDesC& CTestUpdateSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname) +TDesC CTestUpdateSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname) { inparam->Reset(); outparam->Reset(); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/tcalendaradditer1.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/tcalendaradditer1.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/tcalendaradditer1.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendaradditer1.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/tcalendarchangenotifyiter1.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/tcalendarchangenotifyiter1.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/tcalendarchangenotifyiter1.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendarchangenotifyiter1.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/tcalendardeleteiter1.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/tcalendardeleteiter1.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/tcalendardeleteiter1.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendardeleteiter1.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/tcalendarexportiter1.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/tcalendarexportiter1.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/tcalendarexportiter1.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendarexportiter1.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/tcalendargetlistiter1.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/tcalendargetlistiter1.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/tcalendargetlistiter1.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendargetlistiter1.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -180,7 +180,7 @@ } CCalGetlistTestCases::CCalGetlistTestCases( TInt& aResult, TBool aEntryArray) : CActive(EPriorityStandard), iResult(aResult), - iEntryArray(aEntryArray) + iEntryArray(aEntryArray),iTestCaseType(KGetlistGuidFilterAsync) { } @@ -194,9 +194,9 @@ _LIT(KSearchTexttest ,"Meeting"); void CCalGetlistTestCases::RunL() { - CCalendarFilter *filter; + CCalendarFilter *filter = NULL; - CEntryAttributes* entryObj; + CEntryAttributes* entryObj = NULL; RPointerArray arruids(5); TUIDSet* uids = NULL; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/tcalendarimportiter1.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/tcalendarimportiter1.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/tcalendarimportiter1.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendarimportiter1.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/tcalendarupdateiter1.mmp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/tcalendarupdateiter1.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/tcalendarupdateiter1.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -22,6 +22,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcalendarupdateiter1.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -39,6 +39,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcal_providertest.dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -3664,7 +3664,7 @@ TInt pos = 0 ; const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode")); - TInt32 err; + TInt32 err = 0; if(output) { err = output->Value().AsTInt32(); @@ -3707,7 +3707,7 @@ TInt pos = 0 ; const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode")); - TInt32 err; + TInt32 err = 0; if(output) { err = output->Value().AsTInt32(); @@ -3776,7 +3776,7 @@ const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode")); cells = User::CountAllocCells(); - TInt32 err; + TInt32 err = 0; if(output) { err = output->Value().AsTInt32(); @@ -3963,7 +3963,7 @@ const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode")); cells = User::CountAllocCells(); - TInt32 err; + TInt32 err = 0; if(output) { err = output->Value().AsTInt32(); @@ -4041,7 +4041,7 @@ const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode")); cells = User::CountAllocCells(); - TInt32 err; + TInt32 err = 0; if(output) { err = output->Value().AsTInt32(); @@ -4119,7 +4119,7 @@ const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode")); cells = User::CountAllocCells(); - TInt32 err; + TInt32 err = 0; if(output) { err = output->Value().AsTInt32(); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcal_add.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcal_changenotify.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -586,7 +586,8 @@ iWaitSchedular = new(ELeave) CActiveSchedulerWait(); } -CCalDelTestCases::CCalDelTestCases( TInt& aResult) : CActive(EPriorityStandard), iResult(aResult) +CCalDelTestCases::CCalDelTestCases( TInt& aResult) : CActive(EPriorityStandard), + iResult(aResult),iTestCaseType(KDeleteUsingGuidsAsync) { } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcal_export.dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -180,7 +180,7 @@ } CCalGetlistTestCases::CCalGetlistTestCases( TInt& aResult, TBool aEntryArray) : CActive(EPriorityStandard), iResult(aResult), - iEntryArray(aEntryArray) + iEntryArray(aEntryArray),iTestCaseType( KGetlistGuidFilterAsync ) { } @@ -194,9 +194,9 @@ _LIT(KSearchTexttest ,"Meeting"); void CCalGetlistTestCases::RunL() { - CCalendarFilter *filter; + CCalendarFilter *filter = NULL; - CEntryAttributes* entryObj; + CEntryAttributes* entryObj = NULL; RPointerArray arruids(5); TUIDSet* uids = NULL; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -199,7 +199,7 @@ // TInt Noofitems = allCalendarNames->Count(); - CCalendarService* service ; + CCalendarService* service = NULL; TRAPD(err_one,service = CCalendarService::NewL()); @@ -276,7 +276,7 @@ // CDesCArray* allCalendarNames; - CCalendarService* service ; + CCalendarService* service = NULL; TRAPD(err_one,service = CCalendarService::NewL()); @@ -370,7 +370,7 @@ // TInt Noofitems; - CCalendarService* service ; + CCalendarService* service = NULL; TRAPD(err_one,service = CCalendarService::NewL()); @@ -414,7 +414,7 @@ // CDesCArray* allCalendarNames; - CCalendarService* service ; + CCalendarService* service = NULL; TRAPD(err_one,service = CCalendarService::NewL()); @@ -521,7 +521,7 @@ CDesCArray *allCalendarNames = NULL; - CCalendarService* service ; + CCalendarService* service = NULL; TRAPD(err_one,service = CCalendarService::NewL()); @@ -575,7 +575,7 @@ { __UHEAP_MARK; TInt result = KErrNone; - TInt result_one; + TInt result_one = KErrNone; TInt result_two = KErrNone; TInt result_three = KErrNone; TInt result_four = KErrNone; @@ -595,7 +595,7 @@ RPointerArray entryArray(1); TUIDSet* uids = NULL; - CCalendarService* service ; + CCalendarService* service = NULL; TRAPD(err_one,service = CCalendarService::NewL()); RemoveCalendarFile( service, KTestCal1File ); @@ -653,7 +653,7 @@ result_two = err_three; - TRAPD( err_four, service->GetListL( KTestCal1File, -2000000, entryArray )); + TRAPD( err_four, service->GetListL( KTestCal1File, 2000000, entryArray )); if ( err_four == KErrNone ) { if(entryArray.Count()) diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcal_import.dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -796,7 +796,7 @@ // Import with invalid luid new_expParams->AddLocalUid( 10000 ); - new_expParams->AddLocalUid( -3000 ); + new_expParams->AddLocalUid( 3000 ); new_expParams->SetExportFileNameL(KVcalImportGuidsFile); delete buffer; buffer = NULL; @@ -1153,7 +1153,7 @@ } CCalImpTestCases::CCalImpTestCases( TInt& aResult, TInt aVCalOrICal): CActive(EPriorityStandard), iResult(aResult) , - iVCalOrICal(aVCalOrICal) + iVCalOrICal(aVCalOrICal) ,iTestCaseType (KImportGuidAsync) { } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tcal_update.dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group/tcalprovider_combined.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group/tcalprovider_combined.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group/tcalprovider_combined.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -30,7 +30,8 @@ * Description: ?Description * */ - +MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE #include "../../../../../group/sapiincludes.mmpi" TARGET tcalprovider_combined.dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontactfield.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontactfield.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontactfield.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -18,7 +18,7 @@ #include #include - +#include #include "singlecontact.h" #include "singlecontactfield.h" @@ -143,6 +143,7 @@ EXPORT_C void CSingleContactField::GetUriFieldParamL(RPointerArray& axspidArray) { + CleanupResetAndDestroyPushL(axspidArray); TInt count = iidArray.Count(); if(count != 0) { @@ -155,7 +156,8 @@ else { User::Leave(KErrNotFound); - } + } + CleanupStack::Pop(&axspidArray); } //Gets the Group Data and returns them as output parameters @@ -233,6 +235,7 @@ EXPORT_C void CSingleContactField::GetXspidDataL(RPointerArray& axspidArray) { + CleanupResetAndDestroyPushL(axspidArray); TInt count = iArrayValue.Count(); if(count != 0) { @@ -247,7 +250,8 @@ else { User::Leave(KErrNotFound); - } + } + CleanupStack::Pop(&axspidArray); } CSingleContactField::~CSingleContactField() { diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp --- a/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -406,7 +406,12 @@ //iDburi = HBufC::NewL(VPbkContactStoreUris::DefaultCntDbUri().Length()); //set the DBUri to the default value. //iDburi->Des().Copy(VPbkContactStoreUris::DefaultCntDbUri()); - iDburi = GetDefaultDBUri().AllocLC(); + if(iDburi) + { + delete iDburi; + iDburi=NULL; + } + iDburi = GetDefaultDBUri().AllocL(); //get the number of entries in the map TInt keyCount = aMap->Count(); @@ -1778,7 +1783,7 @@ User::Leave(err); } } - CleanupStack::Pop(); + //CleanupStack::Pop(); CleanupStack::Pop(contact); } //end of if pMap else diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -295,7 +295,7 @@ if(iCase == EModifyContactComplete) { //call the get list once again to check whether the contact is modified - CStifItemParser* stiff; + CStifItemParser* stiff = NULL; iCase = EModifyContactVerify; //this time call the getlist with the contact id to get only the modified contact GetContactALL(*stiff); @@ -576,7 +576,7 @@ else if(aEventId == KLiwEventCompleted && code == KErrNone ) { iCase = EVerifyGroupAdd; - CStifItemParser* stiff; + CStifItemParser* stiff = NULL; iIdArrayList.ResetAndDestroy(); GetGroup(*stiff); } @@ -610,7 +610,7 @@ else if(aEventId == KLiwEventCompleted && code == KErrNone ) { iCase = EVerifyImport; - CStifItemParser* stiff; + CStifItemParser* stiff = NULL; GetContactALL(*stiff); } else @@ -623,7 +623,7 @@ if(aEventId == KLiwEventCompleted && code == KErrNone ) { iCase = EVerifyOrganizeDelete; - CStifItemParser* stiff; + CStifItemParser* stiff = NULL; iIdArrayList.ResetAndDestroy(); GetGroup(*stiff); } @@ -714,7 +714,7 @@ if(firstName.CompareF(_L("Barbie")) != 0) { iResult = KErrGeneral; - return; + return 0; } if(map->FindL(KSecondName,mapfield)) @@ -725,7 +725,7 @@ if(secName.CompareF(_L("Doll")) != 0) { iResult = KErrGeneral; - return; + return 0; } if(map->FindL(KCallerObjImg,mapfield)) @@ -736,7 +736,7 @@ if(callerObjImg.CompareF(_L("C:\\data\\images\\pic.jpg")) != 0) { iResult = KErrGeneral; - return; + return 0; } if(map->FindL(KNote,mapfield)) mapField = mapfield.AsMap(); @@ -746,7 +746,7 @@ if(Note.CompareF(_L("Lead role in Barbie, the island princess")) != 0) { iResult = KErrGeneral; - return; + return 0; } if(map->FindL(KXSPID,mapfield)) @@ -763,7 +763,7 @@ if(ptrVal.CompareF(_L("Yahoo:Barbie@yahoo.co.in")) != 0 && ptrVal.CompareF(_L("Google:Barbie@gmail.com")) != 0) { iResult = KErrGeneral; - return; + return 0; } } } @@ -775,6 +775,7 @@ iResult = code; } } + return 0; } void CTestProvider::LoadService() @@ -1400,7 +1401,7 @@ } TInt CTestProvider :: ModifyGroup(CStifItemParser& /*aItem*/) - { + { return 0; } TInt CTestProvider :: ExportL( CStifItemParser& aItem ) @@ -1995,14 +1996,14 @@ */ TInt CTestProvider :: ModifyContactPosBased(CStifItemParser& /*aItem*/) { - + return 0; } /** * Math operation BearingTo Test */ TInt CTestProvider ::ModifyGroupPosBased(CStifItemParser& /*aItem*/) - { + { return 0; } TInt CTestProvider :: ExportPosBased(CStifItemParser& aItem) diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -23,7 +23,7 @@ #include #include #include - +#include #include #include #include @@ -112,7 +112,11 @@ } void CContactsUT::HandleReturnId( const TInt& aError, HBufC8* acntId, TInt aTransId ) { + delete acntId; CActiveScheduler::Stop(); + if(aError == KErrNone) + iErr = KErrNone; + } void CContactsUT::HandleReturnArray(const TInt& aError, RPointerArray& aArray, TInt aTransId ) @@ -203,10 +207,11 @@ iLog->Log(_L("Phone Contact Field modified \n")); __UHEAP_MARK; iServiceHandle->AddL(this,0,singleContact); + __UHEAP_MARKEND; + iLog->Log(_L("AddL called\n")); iLog->Log(_L("Start Active Scheduler\n")); CActiveScheduler::Start(); - __UHEAP_MARKEND; break; } } @@ -660,7 +665,7 @@ iErr = KErrNone; - __UHEAP_MARK; + // __UHEAP_MARK; iOp = iContactManager->MatchPhoneNumberL( KPhoneNumber, KPhoneNumber().Length(), *this ); CActiveScheduler::Start(); @@ -686,7 +691,7 @@ iContactToDelete = NULL; - __UHEAP_MARKEND; + // __UHEAP_MARKEND; } //Add 1 contact @@ -740,7 +745,8 @@ //Check for contact void CContactsUT::CheckContactsL(TInt& aCount,RPointerArray& aIdArray) - { + { + CleanupResetAndDestroyPushL(aIdArray); // Print to UI _LIT( KContactsTest, "ContactsUT" ); _LIT( KExample, "In CheckContactsL" ); @@ -766,7 +772,8 @@ } delete iFindResults; iFindResults = NULL; - // __UHEAP_MARKENDC(aCount); + // __UHEAP_MARKENDC(aCount); + CleanupStack::Pop(&aIdArray); } // ----------------------------------------------------------------------------- @@ -3154,7 +3161,7 @@ { while(count) { - //__UHEAP_MARK; + __UHEAP_MARK; iBuffer = (const_cast(iFindResults->At(--count))).PackLC(); CleanupStack::Pop();//iBuffer iServiceHandle = CContactService::NewL(); @@ -3169,7 +3176,7 @@ delete iServiceHandle;//serviceHandle iServiceHandle = NULL; iLog->Log( KServiceClose ); - //__UHEAP_MARKEND; + __UHEAP_MARKEND; } } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -23,7 +23,7 @@ #include #include #include - +#include #include #include #include @@ -582,7 +582,8 @@ //Check for contact void CContactsUT::CheckContactsL(TInt& aCount,RPointerArray& aIdArray) - { + { + CleanupResetAndDestroyPushL(aIdArray); // Print to UI _LIT( KContactsTest, "ContactsUT" ); _LIT( KExample, "In CheckContactsL" ); @@ -608,7 +609,8 @@ } delete iFindResults; iFindResults = NULL; - // __UHEAP_MARKENDC(aCount); + // __UHEAP_MARKENDC(aCount); + CleanupStack::Pop(&aIdArray); } // ----------------------------------------------------------------------------- diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -168,6 +168,7 @@ User::Leave(KErrNotFound); } } */ + return 0; } TInt Ctcontactsgetidsprovidertest::AddL( CStifItemParser& aItem ) { diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -417,7 +417,7 @@ file.Flush(); file.Close(); CleanupStack::PopAndDestroy(); - + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_observer.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_observer.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_observer.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -73,7 +73,7 @@ } - + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -158,7 +158,7 @@ TPtrC value(KNullDesC); //CContactCallback* callbk=new(ELeave) CContactCallback; TPtr8 cntIdPtrVal(acntId->Des()); - CContactIter* iterVal; + CContactIter* iterVal = NULL; TRAPD(err, iterVal = cntservice->GetListL(EContacts,cntIdPtrVal)); if(err != KErrNone) { @@ -967,7 +967,7 @@ aItem.GetNextInt(count) ; /*Add group1 to phonebook */ - TInt err1; + TInt err1 = 0; TRAPD(err,icontactservice->AddL(icallback,0,singleContact,KNullDesC8,KGroup)); if(err || err1) { @@ -1361,7 +1361,7 @@ icontactservice=CContactService::NewL(); /* Add the contactitem */ - HBufC8* cntId; + HBufC8* cntId = NULL; TRAPD(error,cntId= icontactservice->AddL(singleContact)); @@ -1441,7 +1441,7 @@ // Print to log file iLog->Log( KExample ); - HBufC8* grpId; + HBufC8* grpId = NULL; TInt count; /* Group1 to add to phonebook */ diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -909,7 +909,8 @@ CleanupClosePushL(idArray); //idArray.AppendL(contactId); - TInt err1,err2; + TInt err1 = 0; + TInt err2 = 0; TRAP(err1,icontactservice->DeleteL(icallback,0,idArray)); if (err1 || err2) { @@ -962,7 +963,8 @@ CleanupClosePushL(idArray); //idArray.AppendL(contactId); - TInt err1,err2; + TInt err1 = 0; + TInt err2 = 0; TRAP(err1,icontactservice->DeleteL(icallback,0,idArray)); if(err1 || err2) { diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -197,7 +197,8 @@ TInt flag=0,cnt=0; /*call getlist to get the contactid for export */ \ - TInt err1, err2; + TInt err1 = 0; + TInt err2 = 0; TRAP(err1,icontactservice->GetListL(icallback,1,EContacts,KNullDesC8)); CActiveScheduler::Start(); @@ -212,10 +213,11 @@ /* verify whther export returns the expected error */ aItem.GetNextInt(flag) ; if(icallback->iError) - return KErrNone; + return KErrNone; if(icallback->iError == flag) - return KErrNone; + return KErrNone; + return 0; } /* exporting 2 contacts */ diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -365,11 +365,11 @@ delete icontactservice; __UHEAP_MARKEND; return KErrNone ; - delete icallback; - delete icontactservice; - __UHEAP_MARKEND; + // delete icallback; + //delete icontactservice; + //__UHEAP_MARKEND; - return KErrGeneral; + //return KErrGeneral; } @@ -619,10 +619,6 @@ CContactIter* iter = CContactIter::NewL(); icontactservice->GetListL(*iter); - delete iter; - delete icallback; - delete icontactservice; - __UHEAP_MARKEND; TPtrC buf(_L("")); iter->NextL(buf); @@ -631,16 +627,15 @@ { count++; iter->NextL(buf); } - if(count==2) - { + delete iter; + delete icallback; + delete icontactservice; + __UHEAP_MARKEND; + if(count==2) return KErrNone ; - } -delete iter; - delete icallback; - delete icontactservice; - //__UHEAP_MARKEND; - return KErrGeneral; + else + return KErrGeneral; } /* get all contacts from the phonebook ie contacts.cdb,manual*/ @@ -734,7 +729,7 @@ _LIT( KLog4, "before calling add" ); iLog->Log( KLog4 ); /* Add the contactitem */ - HBufC8* cntId; + HBufC8* cntId = NULL; TRAPD(err,cntId= icontactservice->AddL(singleContact)); TPtr8 cntIdPtrVal(cntId->Des()); @@ -919,7 +914,7 @@ // aItem.GetNextInt(count) ; /* Add the contactitem */ - HBufC8* cntId; + HBufC8* cntId = NULL; TRAPD(err,cntId= icontactservice->AddL(singleContact)); TPtr8 cntIdPtrVal(cntId->Des()); @@ -941,7 +936,7 @@ return KErrGeneral ; } newFields = ETrue; - CContactIter* iterVal; + CContactIter* iterVal = NULL; TPtr8 cntIdPtr(cntId->Des()); TRAPD(error, iterVal = icontactservice->GetListL(EContacts,cntIdPtr)); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkdummyao.cpp --- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkdummyao.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkdummyao.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -74,20 +74,20 @@ } else*/ //{ - switch(iCmd) - { - case EAdd: TRAP_IGNORE(iObserver->HandleAddItemsL(iId,iTransactionId,iStatus.Int())); - break; - case EUpdate: - case ERemove: TRAP_IGNORE(iObserver->HandleItemsL(iTransactionId,iStatus.Int())); - break; - default: - break; - } - - if (!iManageObjects->IsActive()) - { - iManageObjects->Start(); + switch(iCmd) + { + case EAdd: TRAP_IGNORE(iObserver->HandleAddItemsL(iId,iTransactionId,iStatus.Int())); + break; + case EUpdate: + case ERemove: TRAP_IGNORE(iObserver->HandleItemsL(iTransactionId,iStatus.Int())); + break; + default: + break; + } + + if (!iManageObjects->IsActive()) + { + iManageObjects->Start(); } // } } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_landmarks/src/landmarkinterface.cpp --- a/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -946,11 +946,12 @@ landmarkIdArray.AppendL (lmid ); } } - TPtrC dbUri; + TBuf<256> dbUri; + if (ValidateParamL (KExport, KDbUri, exportData, LIW::EVariantTypeDesC, EFalse, variant ) ) { - dbUri.Set (variant.AsDes ( ) ); + dbUri.Append(variant.AsDes ( ) ); } ValidateParamL (KExport, KMimeType, exportData, LIW::EVariantTypeDesC, ETrue, variant ); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/src/landmarks_inputparamsblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/src/landmarks_inputparamsblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/src/landmarks_inputparamsblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -1220,7 +1220,7 @@ variant.Reset(); var.Reset(); } - + return 0; } TInt Clandmarks_inputparams::CheckDescending(TType aType, CLiwIterable* aIter) @@ -1253,7 +1253,7 @@ variant.Reset(); var.Reset(); } - + return 0; } // ========================== OTHER EXPORTED FUNCTIONS ========================= // None diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -94,6 +94,7 @@ { iWaitSchedular->AsyncStop(); } + return 0; } CTestAsync* CTestAsync::NewL(TInt type) diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -4256,7 +4256,7 @@ TLiwGenericParam param; TInt index = 0; - CActiveSchedulerWait* WaitSchedular; + CActiveSchedulerWait* WaitSchedular = NULL; CLiwMap* landmarkMap = CLiwDefaultMap::NewL(); TInt32 test_val = KErrGeneral; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tprovidertestobserver.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tprovidertestobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -76,6 +76,7 @@ if(iWait) iWait->AsyncStop(); + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp --- a/serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -172,7 +172,7 @@ // If position server could not get position // In two minutes it will terminate the position request - //updateopts.SetUpdateTimeOut(TTimeIntervalMicroSeconds(KSUpdateTimeOut)); + // updateopts.SetUpdateTimeOut(TTimeIntervalMicroSeconds(KSUpdateTimeOut)); // Positions which have time stamp below KMaxAge can be reused updateopts.SetMaxUpdateAge(TTimeIntervalMicroSeconds(KSMaxAge)); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -218,7 +218,7 @@ { CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt Val ; + TInt Val = 0; //Install a new active scheduler to this thread TRAPD(err ,( Val = TraceTOL()) ); delete cleanup ; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -2200,7 +2200,7 @@ outputlist->Reset() ; inputlist->Reset() ; - ASyncLocCBF* callBack ; + ASyncLocCBF* callBack = NULL; locinterface->ExecuteCmdL(CmdBuf , *inputlist , *outputlist,KLiwOptASyncronous, callBack); @@ -2958,9 +2958,9 @@ _LIT8(KService, "Service.Location"); _LIT8(KIDataSource,"ILocation"); - + __UHEAP_MARKEND ; return KErrNone ; //Manual test case - CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL(); + /*CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL(); // Input and output parameter list CLiwGenericParamList* inputlist = &(ServiceHandler->InParamListL()); @@ -3041,9 +3041,9 @@ delete ServiceHandler ; a.ResetAndDestroy() ; - // delete OutParmList ; - __UHEAP_MARKEND ; - return result ; + // delete OutParmList ;*/ + + //return result ; } @@ -3063,7 +3063,7 @@ iLog->Log(KTLocTest) ; return KErrNone ; //Manual test case - TRequestStatus Status = KRequestPending ; + /*TRequestStatus Status = KRequestPending ; RThread FunctionThread ; TInt ret = FunctionThread.Create(_L("ServiceFailed Thread") , ServiceFailedTest ,KDefaultStackSize , @@ -3091,7 +3091,7 @@ } - return ret; + return ret; */ } @@ -3229,7 +3229,7 @@ } return KErrNone ; - return KErrGeneral; + //return KErrGeneral; } @@ -3575,7 +3575,7 @@ iLog->Log(KTLocTest) ; return KErrNone ; //This is a manul test case - CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL(); + /*CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL(); // Input and output parameter list CLiwGenericParamList* inputlist = &(ServiceHandler->InParamListL()); @@ -3658,7 +3658,7 @@ _LIT(Kerr , "Time out value not set correctly") ; return KErrNone ; - + */ } /** @@ -6511,7 +6511,7 @@ outputlist->Reset() ; inputlist->Reset() ; - ASyncLocCBF* callBack ; + ASyncLocCBF* callBack = NULL; locinterface->ExecuteCmdL(CmdBuf , *inputlist , *outputlist,KLiwOptASyncronous, callBack); @@ -6795,7 +6795,7 @@ TInt CTestProvider::GetLocPosBasedWrongVal1(CStifItemParser& /*aItem*/) { //currently not needed - + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -173,7 +173,7 @@ { CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt Val ; + TInt Val = 0; //Install a new active scheduler to this thread TRAPD(err ,( Val = ConcurrentGetLocCallsL()) ); delete cleanup ; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -299,7 +299,7 @@ { CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt Val ; + TInt Val = 0; TInt *flag = static_cast(aFlag); TInt err; //Install a new active scheduler to this thread diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -700,7 +700,7 @@ //TInt start = User::CountAllocCells(); ASyncLocCB MyUpdates ; - TInt errRet; + TInt errRet = 0; _LIT8(KService, "Service.Location"); _LIT8(KIDataSource,"ILocation"); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -39,7 +39,7 @@ CLiwGenericParamList& aEventParamList, const CLiwGenericParamList& aInParamList) { - + return 0; } GetLoctionCancel() : iRetStatus(KErrGeneral) //Default constructor @@ -151,7 +151,7 @@ { // __UHEAP_MARK; CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt val ; + TInt val = 0; TRAPD(err , (val = GetLocCancelL() ) ) ; delete cleanup ; // __UHEAP_MARKEND; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -38,7 +38,7 @@ CLiwGenericParamList& aEventParamList, const CLiwGenericParamList& aInParamList) { - + return 0; } WrongNotificationGetLoc() : iRetStatus(KErrGeneral) //Default constructor @@ -153,7 +153,7 @@ { // __UHEAP_MARK; CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt val ; + TInt val = 0; TRAPD(err , (val = GetLocWrongCancelL() ) ) ; delete cleanup ; // __UHEAP_MARKEND; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -56,7 +56,7 @@ TInt Index = 0 ; const TLiwGenericParam *GenericParam = aEventParamList.FindFirst(Index , KErrorCode ); - TInt error ; + TInt error = 0; if(GenericParam) { diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -291,9 +291,9 @@ { return err ; } - + else return val ; - return 0 ; + } \ No newline at end of file diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -206,7 +206,7 @@ { CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt Val ; + TInt Val = 0; //Install a new active scheduler to this thread TRAPD(err ,( Val = TraceConcurrentCallsL()) ); delete cleanup ; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -38,7 +38,7 @@ CLiwGenericParamList& aEventParamList, const CLiwGenericParamList& aInParamList) { - + return 0; } TraceLoctionCancel() : iRetStatus(KErrGeneral) //Default constructor @@ -150,7 +150,7 @@ { // __UHEAP_MARK; CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt val ; + TInt val = 0; TRAPD(err , (val = TraceLocCancelL() ) ) ; delete cleanup ; // __UHEAP_MARKEND; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -38,7 +38,7 @@ CLiwGenericParamList& aEventParamList, const CLiwGenericParamList& aInParamList) { - + return 0; } WrongNotificationTraceLoc() : iRetStatus(KErrGeneral) //Default constructor @@ -158,7 +158,7 @@ { // __UHEAP_MARK; CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt val ; + TInt val = 0; TRAPD(err , (val = TraceLocWrongCancelL() ) ) ; delete cleanup ; // __UHEAP_MARKEND; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -350,7 +350,7 @@ TInt ServiceFailedTest(TAny */*Arg*/) { - TInt errRet; + TInt errRet = 0; CTrapCleanup* cleanup = CTrapCleanup::New(); TRAPD(err , errRet = ServiceFailedFunctionL()) ; delete cleanup ; @@ -394,7 +394,7 @@ { CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt Val ; + TInt Val = 0; //Install a new active scheduler to this thread TRAPD(err ,( Val = ConcurrentGetLocCallsL()) ); delete cleanup ; @@ -450,7 +450,7 @@ { CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt Val ; + TInt Val = 0; //Install a new active scheduler to this thread TRAPD(err ,( Val = ConcurrentTraceCallsL()) ); delete cleanup ; @@ -468,7 +468,7 @@ { CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt Val ; + TInt Val = 0; //Install a new active scheduler to this thread TRAPD(err ,( Val = TraceTimeOutFuncL()) ); delete cleanup ; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -814,6 +814,7 @@ delete CoreObj; __UHEAP_MARKEND ; + return error; } TInt CTLocTest :: EmptyCancelLocAsynch(CStifItemParser& /*aItem*/) diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tstraysignaltest.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tstraysignaltest.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tstraysignaltest.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -122,7 +122,7 @@ TInt StrayTest(TAny */*Arg*/) { - TInt errval; + TInt errval = 0; CTrapCleanup* cleanup = CTrapCleanup::New(); //Install a new active scheduler to this thread TRAPD(err , errval = StrayTestL()) ; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp --- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -3229,7 +3229,7 @@ TInt iRequestType; public : TInt HandleNotifyL(HPositionGenericInfo* aOutPos , TInt aError) ; - TraceLCallBackOpts3(TInt transId,TInt req) :iCount(0) , iRetStatus(KErrGeneral){+ + TraceLCallBackOpts3(TInt transId,TInt req) :iCount(0) , iRetStatus(KErrGeneral){ iTransactionId = transId; iRequestType = req; } @@ -3785,7 +3785,7 @@ // TInt CSAPILocTest::GetPositionOpts1( CStifItemParser& /*aItem*/ ) { - TInt ret; + TInt ret = 0; TPositionInfo currPos; TPositionUpdateOptions options; TTimeIntervalMicroSeconds aTimeOut = 0; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/inc/loggingcallback.h --- a/serviceproviders/sapi_logging/inc/loggingcallback.h Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/inc/loggingcallback.h Wed Sep 01 12:28:47 2010 +0100 @@ -81,9 +81,10 @@ * Implementation of CancelNotifyL method, derived from MLoggingCB * * @param aTransid, Transaction id + * @param aFlag, Flag for notification to LiwBinding */ - void CancelNotifyL( TUint aTransid ); + void CancelNotifyL( TUint aTransid , TBool aFlag ); /** * GetRequestType diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/loggingservice/inc/loggingasyncservice.h --- a/serviceproviders/sapi_logging/loggingservice/inc/loggingasyncservice.h Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/loggingservice/inc/loggingasyncservice.h Wed Sep 01 12:28:47 2010 +0100 @@ -132,7 +132,14 @@ { iInterval = aInterval ; } - + /** + * Sets the boolean flag iFlagCancel + */ + inline void SetCancelFlag(TBool aValue) + { + iFlagCancel = aValue; + } + /** * Default Desturctor */ @@ -195,6 +202,7 @@ TTimeIntervalMicroSeconds32 iInterval ; CLogViewEvent* iLogViewEvent; CLogFilter* iFilter; + TBool iFlagCancel; }; @@ -230,9 +238,10 @@ * methods * * @param aTransId , Transaction id + * @param aFlag, Flag for notification to LiwBinding */ - virtual void CancelNotifyL(TUint aTransid) = 0 ; + virtual void CancelNotifyL(TUint aTransid ,TBool aFlag) = 0 ; /** * Default Desturctor diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/loggingservice/src/loggingasyncservice.cpp --- a/serviceproviders/sapi_logging/loggingservice/src/loggingasyncservice.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/loggingservice/src/loggingasyncservice.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -112,6 +112,7 @@ CLogAsyncService :: CLogAsyncService(): CActive(EPriorityStandard) { iTransId=0; + iFlagCancel=ETrue; } /** @@ -308,7 +309,9 @@ } } - iCallback->CancelNotifyL( iTransId ); + + iCallback->CancelNotifyL( iTransId, iFlagCancel ); + if(iUpdatedEvent) { diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/loggingservice/src/loggingservice.cpp --- a/serviceproviders/sapi_logging/loggingservice/src/loggingservice.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/loggingservice/src/loggingservice.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -47,6 +47,7 @@ */ for(TInt iter = 0 ; iter < iRegTable.Count() ; ++iter) { + iRegTable[iter]->GetActiveObj()->SetCancelFlag(EFalse); delete iRegTable[iter] ; } delete iLogService; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/src/loggingcallback.cpp --- a/serviceproviders/sapi_logging/src/loggingcallback.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/src/loggingcallback.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -427,17 +427,20 @@ } - void LoggingInterfaceCB :: CancelNotifyL( TUint aTransid ) + void LoggingInterfaceCB :: CancelNotifyL( TUint aTransid ,TBool aFlag ) { - CleanupStack :: PushL( this ) ; - CLiwGenericParamList *OutParm = CLiwGenericParamList :: NewL() ; - CleanupStack :: PushL( OutParm ) ; - CLiwGenericParamList *InParm = CLiwGenericParamList :: NewL() ; - CleanupStack :: PushL( InParm ) ; - OutParm->AppendL( TLiwGenericParam( KErrCode , TLiwVariant( ( TInt32 )SErrNone ) ) ) ; - iCallBack->HandleNotifyL( aTransid, KLiwEventCanceled, *OutParm, *InParm ) ; - CleanupStack::PopAndDestroy( InParm ); - CleanupStack::PopAndDestroy( OutParm ); - CleanupStack :: Pop( this ) ; + if(aFlag) + { + CleanupStack :: PushL( this ) ; + CLiwGenericParamList *OutParm = CLiwGenericParamList :: NewL() ; + CleanupStack :: PushL( OutParm ) ; + CLiwGenericParamList *InParm = CLiwGenericParamList :: NewL() ; + CleanupStack :: PushL( InParm ) ; + OutParm->AppendL( TLiwGenericParam( KErrCode , TLiwVariant( ( TInt32 )SErrNone ) ) ) ; + iCallBack->HandleNotifyL( aTransid, KLiwEventCanceled, *OutParm, *InParm ) ; + CleanupStack::PopAndDestroy( InParm ); + CleanupStack::PopAndDestroy( OutParm ); + CleanupStack :: Pop( this ) ; + } delete this; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -39,6 +39,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tloggingprovidertest.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -98,6 +98,6 @@ } iRetVal = KErrNone ; - + return 0; } \ No newline at end of file diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tloggingservice.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -87,10 +87,14 @@ iter = LogService->GetListL(filter) ; - while (aEvent = iter->NextL()) - { + while (1){ + aEvent = iter->NextL(); + if(aEvent){ LogService->DeleteEventL(aEvent->Id()) ; delete aEvent ; + } + else + break; } delete iter ; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -87,9 +87,12 @@ CLogIter *iter = LogService->GetListL(filter) ; CLogsEvent *iterevents ; - while(iterevents = iter->NextL()) - { + while(1){ + iterevents = iter->NextL(); + if(iterevents) delete iterevents ; + else + break; } delete updatedEvent ; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -83,9 +83,12 @@ CLogIter *iter = LogService->GetListL(filter) ; - while (events = iter->NextL()) - { + while(1){ + events = iter->NextL(); + if(events) delete events ; + else + break; } delete event ; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -489,9 +489,12 @@ CLogsEvent *aEvent ; - while(aEvent = iter->NextL()) - { + while(1){ + aEvent = iter->NextL(); + if(aEvent) delete aEvent ; + else + break; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/group/tlogtypeidtest.mmp --- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/group/tlogtypeidtest.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/group/tlogtypeidtest.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -23,6 +23,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tlogtypeidtest.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertestobserver.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertestobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -68,6 +68,7 @@ if(iWait) iWait->AsyncStop(); + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp --- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,8 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + TARGET tloggingservicetest.dll TARGETTYPE dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tgetlist.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tgetlist.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tgetlist.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -183,10 +183,14 @@ iter = iLoggingService->GetListL(filter) ; CLogsEvent *iterevents ; - while (iterevents = iter->NextL()) - { + while (1){ + iterevents = iter->NextL(); + if(iterevents){ iLoggingService->DeleteEventL(iterevents->Id()) ; delete iterevents ; + } + else + break; } iter->DoCancel(); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -38,6 +38,9 @@ #include MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE + + TARGET tlogprovidertest.dll diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -208,7 +208,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } @@ -401,7 +401,7 @@ - + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -95,6 +95,6 @@ } iRetVal = KErrNone ; - + return 0; } \ No newline at end of file diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -300,7 +300,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } @@ -568,7 +568,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -256,7 +256,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } @@ -514,7 +514,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } @@ -742,7 +742,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -278,7 +278,7 @@ a.ResetAndDestroy() ; a.Close() ; - + return 0; } @@ -505,7 +505,7 @@ a.ResetAndDestroy() ; a.Close() ; - + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -1364,6 +1364,7 @@ __UHEAP_MARKEND; if(ret == KErrArgument) return KErrNone; + return ret; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -161,7 +161,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } @@ -297,7 +297,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } @@ -408,7 +408,7 @@ a.ResetAndDestroy(); a.Close(); - + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -19,6 +19,7 @@ #include #include "mgpostfilter.h" +#include const TInt32 KLargestSigned32 = 0x7fffffff; const TInt64 KLargestSigned64 = 0x7fffffffffffffff; @@ -55,6 +56,7 @@ RPointerArray& aFilteredItemList ) { // It will filter the Items + CleanupResetAndDestroyPushL(aFilteredItemList); MCLFItem* item = NULL; for( TInt i = 0 ; i < aItemList.Count() ; ++i ) @@ -67,6 +69,7 @@ aFilteredItemList.AppendL( item ); } } + CleanupStack::Pop(&aFilteredItemList); } // ----------------------------------------------------------------------------- diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -244,13 +244,6 @@ output->AppendL( responseTypeParam ); } - else - { - delete aListModel; - aListModel = NULL; - delete aOperationObserver; - aOperationObserver = NULL; - } // call callback of consumer @@ -435,7 +428,7 @@ CActiveScheduler :: Stop() ; return KErrNone; } - + return KErrNone; } // ----------------------------------------------------------------------------- @@ -448,7 +441,7 @@ // Creating the Cleanup stack for this new thread CTrapCleanup* cleanup = CTrapCleanup::New(); struct ParamPass* arg1 = (ParamPass*) a; - TInt errorCode; + TInt errorCode = KErrNone; TInt error = KErrNone; TRAP(error, errorCode = GetFilesAsynchL(a)); delete cleanup; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/src/mgpostfilter.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/src/mgpostfilter.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/src/mgpostfilter.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -20,7 +20,7 @@ #include #include "mgpostfilter.h" - +#include const TInt32 KLargestSigned32 = 0x7fffffff; const TInt64 KLargestSigned64 = 0x7fffffffffffffff; @@ -55,6 +55,7 @@ void CPostFilter::FilterItemsL( const TArray& aItemList, RPointerArray& aFilteredItemList ) { + CleanupResetAndDestroyPushL(aFilteredItemList); // It will filter the Items MCLFItem* item = NULL; @@ -68,6 +69,7 @@ aFilteredItemList.AppendL( item ); } } + CleanupStack::Pop(&aFilteredItemList); } // ----------------------------------------------------------------------------- diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tprovidertestobserver.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tprovidertestobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -74,6 +74,7 @@ if(iWait) iWait->AsyncStop(); + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -692,5 +692,5 @@ iFile.Write(_L8("End of observer")); - + return KErrNone; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -123,6 +123,7 @@ User::Leave(KErrNotFound); } } + return KErrNone; } /* -------------------------------------------------------------------------- diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -489,6 +489,7 @@ TInt expRes = expValue.AsTInt32(); TInt resRes = resValue.AsTInt32(); + expIntStr.AppendNum(expRes); resIntStr.AppendNum(resRes); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp --- a/serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -59,7 +59,7 @@ LIBRARY smcm.lib LIBRARY charconv.lib LIBRARY mtur.lib - +LIBRARY gsmu.lib paged diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_messaging/messagingservice/inc/sendmessage.h --- a/serviceproviders/sapi_messaging/messagingservice/inc/sendmessage.h Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_messaging/messagingservice/inc/sendmessage.h Wed Sep 01 12:28:47 2010 +0100 @@ -21,10 +21,12 @@ #include #include +#include class CMsvAttachment; class CRecipientList; class CMsgCallbackBase; +class CSmsMessage; /** * This class provides functionality for sending SMS/MMS messages. diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp --- a/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -675,7 +675,20 @@ CSmsHeader& smsHdr = clientMtm->SmsHeader(); CSmsSettings* smsSetting = CSmsSettings::NewLC(); smsSetting->CopyL(clientMtm->ServiceSettings()); + TInt pdus; + TInt numberOfUnconvertedChars; + TInt numberOfDowngradedChars; + TInt freeUDUnitsInLastPDU; + CSmsMessage& smsMsg = smsHdr.Message(); + smsMsg.GetEncodingInfoL(pdus, numberOfUnconvertedChars, numberOfDowngradedChars, freeUDUnitsInLastPDU ); + if( numberOfUnconvertedChars || numberOfDowngradedChars ) + { smsSetting->SetCharacterSet(TSmsDataCodingScheme::ESmsAlphabetUCS2); + } + else + { + smsSetting->SetCharacterSet(TSmsDataCodingScheme::ESmsAlphabet7Bit); + } smsHdr.SetSmsSettingsL(*smsSetting); CleanupStack::PopAndDestroy(smsSetting); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -130,6 +130,7 @@ { iWaitSchedular->AsyncStop(); } + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -139,6 +139,7 @@ ++i; i++; //CActiveScheduler::Stop(); + return 0; } }; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertestobserver.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertestobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -68,6 +68,7 @@ if(iWait) iWait->AsyncStop(); + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -260,7 +260,7 @@ else iResult= KErrGeneral; - + return 0; } // ----------------------------------------------------------------------------- diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -197,5 +197,5 @@ - return 0; +// return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertestobserver.cpp --- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertestobserver.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -68,6 +68,7 @@ if(iWait) iWait->AsyncStop(); + return 0; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg --- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Wed Sep 01 12:28:47 2010 +0100 @@ -1,7 +1,7 @@ [Test] title GetContactDataList create tserviceregistrytest testModule -testModule GetMetaDataListL 0 0 InputStart ServiceName Service.Logging InterfaceName IDataSource MinimumVersion 1.0 MaximumVersion 5.0 InputEnd ExpectedStart StartMap ServiceName Service.Logging InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd +testModule GetMetaDataListL 0 0 InputStart ServiceName Service.Contact InterfaceName IDataSource MinimumVersion 1.0 MaximumVersion 5.0 InputEnd ExpectedStart StartMap ServiceName Service.Contact InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd delete testModule [Endtest] @@ -9,7 +9,7 @@ [Test] title GetAllDataList create tserviceregistrytest testModule -testModule GetMetaDataListL 0 0 ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService MinimumVersion 1.0 EndMap StartMap ServiceName Service.Logging InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd +testModule GetMetaDataListL 0 0 ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService MinimumVersion 1.1 EndMap StartMap ServiceName Service.contact InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd delete testModule [Endtest] diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp --- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -135,7 +135,7 @@ if(code != iExpectedError) { iResult = KErrGeneral; - return; + return 0; } } @@ -151,7 +151,7 @@ iResult = KErrNone; } } - + return 0; } TInt CIServiceTestModule::LoadProviderTest(CStifItemParser& aItem) @@ -513,6 +513,7 @@ Delete(); __UHEAP_MARKEND; + return 0; } @@ -843,8 +844,8 @@ TLiwVariant resValue; TBool equal = EFalse; - TReal expValueReal; - TReal resValueReal; + TReal expValueReal = 0; + TReal resValueReal = 0; if(!aExpectedMap->FindL(aKey, expValue)) { diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/inc/sysinfoaiwparams.hrh --- a/serviceproviders/sapi_sysinfo/inc/sysinfoaiwparams.hrh Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/inc/sysinfoaiwparams.hrh Wed Sep 01 12:28:47 2010 +0100 @@ -145,6 +145,13 @@ _LIT8(KCamResList,"ResolutionList"); _LIT8(KCamMimeTypesList,"MimeTypeList"); + +_LIT8(KCapability, "capability"); +_LIT8(KDecManufacturer, "manufacturer"); +_LIT8(KIdentifier, "identifier"); +_LIT8(KAccelerated, "accelerated"); +_LIT8(KMaxBitrate, "maxBitrate"); +_LIT8(KVersion, "version"); } -#endif //__SYSINFO_AIWPARAMS_HRH_ \ No newline at end of file +#endif //__SYSINFO_AIWPARAMS_HRH_ diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp --- a/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -876,7 +876,40 @@ CleanupStack::PopAndDestroy( camResList ); } break; - + case CSysData::EVideoDecList: + { + CLiwList* decResList = CLiwDefaultList::NewL(); + CleanupClosePushL( *decResList ); + const CVideoDecDataList* declist = ((CVideoDecDataList*) aInSysData); + count = declist->Count(); + CVideoDecDataList::CVideoDecData * decinfo = NULL; + + for ( int index=0; indexManufacturer)); + TPtrC temp1; + temp1.Set(*(decinfo->Identifier)); + + resMap->InsertL( KDecManufacturer, temp ); + resMap->InsertL( KIdentifier, temp1 ); + resMap->InsertL( KMaxBitrate, (TInt32)decinfo->MaxBitrate ); + resMap->InsertL( KAccelerated, (TBool)decinfo->Accelerated ); + resMap->InsertL( KVersion, decinfo->Version ); + + decResList->AppendL( resMap ); + CleanupStack::Pop( resMap ); + resMap->Close(); + } + aOutMapParam->InsertL( KCapability, decResList ); + CleanupStack::PopAndDestroy( decResList ); + //aOutMapParam->InsertL( KCapability, 1 ); + } + break; default: User::Leave(KErrArgument); } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/sysinfoservice/bwins/sysinfoserviceu.def --- a/serviceproviders/sapi_sysinfo/sysinfoservice/bwins/sysinfoserviceu.def Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/bwins/sysinfoserviceu.def Wed Sep 01 12:28:47 2010 +0100 @@ -60,4 +60,6 @@ ?Count@CCameraResolutionList@@QBEHXZ @ 59 NONAME ; int CCameraResolutionList::Count(void) const ?MimeTypesList@CCameraInfo@@QBEPAVCStringList@@XZ @ 60 NONAME ; class CStringList * CCameraInfo::MimeTypesList(void) const ?ResolutionList@CCameraInfo@@QBEPAVCCameraResolutionList@@XZ @ 61 NONAME ; class CCameraResolutionList * CCameraInfo::ResolutionList(void) const + ??ACVideoDecDataList@@QBEPAUCVideoDecData@0@H@Z @ 62 NONAME ; struct CVideoDecDataList::CVideoDecData * CVideoDecDataList::operator[](int) const + ?Count@CVideoDecDataList@@QBEHXZ @ 63 NONAME ; int CVideoDecDataList::Count(void) const diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/sysinfoservice/eabi/sysinfoserviceu.def --- a/serviceproviders/sapi_sysinfo/sysinfoservice/eabi/sysinfoserviceu.def Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/eabi/sysinfoserviceu.def Wed Sep 01 12:28:47 2010 +0100 @@ -60,4 +60,6 @@ _ZNK21CCameraResolutionList2AtEiiRi @ 59 NONAME _ZNK21CCameraResolutionList5CountEv @ 60 NONAME _ZNK21CCameraResolutionListixEi @ 61 NONAME + _ZNK17CVideoDecDataList5CountEv @ 62 NONAME + _ZNK17CVideoDecDataListixEi @ 63 NONAME diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp Wed Sep 01 12:28:47 2010 +0100 @@ -66,7 +66,7 @@ LIBRARY PlatformEnv.lib LIBRARY ImagingConfigManager.lib LIBRARY Avkon.lib // PhoneLanguage -LIBRARY estlib.lib //strlen function +LIBRARY estlib.lib devvideo.lib //strlen function paged diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h --- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h Wed Sep 01 12:28:47 2010 +0100 @@ -62,7 +62,7 @@ _LIT(KActiveConnections,"ActiveConnections"); _LIT(KConnectionStatus, "ConnectionStatus"); _LIT(KWLanMacAddress, "WLanMacAddress"); - +_LIT(KWirelessConnSupport, "WirelessConnSupport"); _LIT(KCamera, "Camera"); _LIT(KMemoryCard, "MemoryCard"); @@ -75,7 +75,14 @@ _LIT(KCoverUI, "CoverUI"); _LIT(KSideVolumeKeys, "SideVolumeKeys"); _LIT(KVibra, "Vibra"); +_LIT(KVideoDecoder, "VideoDecoder"); +_LIT(KBT, "Bluetooth"); +_LIT(KIrda, "Irda"); +_LIT(KWlan, "Wlan"); +_LIT(KGsm, "Gsm"); +_LIT(KWcdma, "Wcdma"); +_LIT(KCdma, "Cdma"); _LIT(KBrightness, "Brightness"); _LIT(KPowerSaverTimeOut,"PowerSaverTimeOut"); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h --- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h Wed Sep 01 12:28:47 2010 +0100 @@ -53,7 +53,8 @@ EResolution, EStringList, EStringData, - ECameraInfo + ECameraInfo, + EVideoDecList }; public: /** @@ -922,5 +923,65 @@ CCameraResolutionList* iResList; CStringList* iMimeTypesList; }; +/** +* @ref CVideoDecDataList +* +* @lib sysinfoservice.lib +* @since S60 3.2 +*/ +NONSHARABLE_CLASS(CVideoDecDataList) : public CSysData + { + public: + struct CVideoDecData + { + CVideoDecData(const TDesC &iManufacturer,const TDesC &iIdentifier,TInt iMaxBitrate,TBool iAccelerated,const TDesC &iVersion) + :MaxBitrate(iMaxBitrate),Accelerated(iAccelerated) + { + Manufacturer = iManufacturer.AllocL(); + Identifier = iIdentifier.AllocL(); + Version=iVersion.AllocL(); + } + + TInt MaxBitrate; + TBool Accelerated; + HBufC* Manufacturer; + HBufC* Identifier; + HBufC* Version; + }; + public: + /** + * Two-phased constructor. + * + * @return A new instance of this class. + */ + static CVideoDecDataList* NewL(); + /** + * @return drive number. + */ + void AppendL(CVideoDecData *entry); + IMPORT_C CVideoDecData *operator[](TInt aIndex) const; + /** + * @return number of drives. + */ + IMPORT_C TInt Count() const; + /** + * Destructor. + */ + ~CVideoDecDataList(); + + private: + /** + * C++ default constructor. + */ + CVideoDecDataList(); + /** + * Symbian 2nd phase constructor. + */ + void ConstructL(); + + private: + RArray iDecData; + TInt iCount; +}; #endif __SYSINFO_H__ diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h --- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h Wed Sep 01 12:28:47 2010 +0100 @@ -23,6 +23,7 @@ #include "sysinfo.h" #include "sysrequest.h" #include "imagingconfigmanager.h" +#include // FORWORD CLASS DECLARATION class CSysData; @@ -292,6 +293,47 @@ CDeviceInfo* iDeviceInfo; }; +/** +* @ref MMMFDevVideoPlayObserverImpl is used as video observer +* +* @lib sysinfoservice +* @since S60 9.2 +* @version $Revision: 1.0 $ +*/ +class MMMFDevVideoPlayObserverImpl : public MMMFDevVideoPlayObserver + { + public: + + /* Dummy implementation for virtual function */ + virtual void MdvpoNewBuffers() {} + /* Dummy implementation for virtual function */ + virtual void MdvpoReturnPicture(TVideoPicture* ) {} + /* Dummy implementation for virtual function */ + virtual void MdvpoSupplementalInformation(const TDesC8& , + const TTimeIntervalMicroSeconds& , + const TPictureId& ) {} + /* Dummy implementation for virtual function */ + virtual void MdvpoPictureLoss() {} + /* Dummy implementation for virtual function */ + virtual void MdvpoPictureLoss(const TArray& ) {} + /* Dummy implementation for virtual function */ + virtual void MdvpoSliceLoss(TUint , TUint , const TPictureId& ){} + /* Dummy implementation for virtual function */ + virtual void MdvpoReferencePictureSelection(const TDesC8& ){} + /* Dummy implementation for virtual function */ + virtual void MdvpoTimedSnapshotComplete(TInt , + TPictureData* , + const TTimeIntervalMicroSeconds& , + const TPictureId& ){} + /* Dummy implementation for virtual function */ + virtual void MdvpoNewPictures() {} + /* Dummy implementation for virtual function */ + virtual void MdvpoFatalError(TInt ) {} + /* Dummy implementation for virtual function */ + virtual void MdvpoInitComplete(TInt ) {} + /* Dummy implementation for virtual function */ + virtual void MdvpoStreamEnd() {} + }; #endif __CSYSINFOSERVICE_H__ diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/sysinfoservice/src/activestore.cpp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/activestore.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/activestore.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -100,10 +100,12 @@ aActiveObj = CPubSubNotifier::NewL(aSysRequest, CPubSubNotifier::EInfraRed); - else if( (!Key.CompareF(SysInfo::KConnectionStatus)) - || (!Key.CompareF(SysInfo::KActiveConnections))) + else if( (!Key.CompareF(SysInfo::KActiveConnections)) && (aSysRequest.RequestType() == TSysRequest::EASyncONESHOT) ) aActiveObj = CConnection::NewL(aSysRequest); + else if( (!Key.CompareF(SysInfo::KConnectionStatus)) && (aSysRequest.RequestType() == TSysRequest::ENotification) ) + aActiveObj = CConnection::NewL(aSysRequest); + else User::Leave(KErrNotFound); } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -1386,5 +1386,75 @@ { return iMimeTypesList; } - + +// -------------------------------------------------------------------- +// CVideoDecDataList::CVideoDecDataList() +// Constructor. +// -------------------------------------------------------------------- +// +CVideoDecDataList::CVideoDecDataList():CSysData(EVideoDecList) + { + } + +// -------------------------------------------------------------------- +// CDriveList::~CDriveList() +// Destructor +// -------------------------------------------------------------------- +// +CVideoDecDataList::~CVideoDecDataList() + { + for(int i=0;iConstructL(); + CleanupStack::Pop(self); + return self; + } + +// -------------------------------------------------------------------- +// CDriveList::ConstructL() +// 2nd phase construtor +// -------------------------------------------------------------------- +// +void CVideoDecDataList::ConstructL() + { + } + +void CVideoDecDataList::AppendL(CVideoDecData *entry) + { + iDecData.AppendL(entry); + } +// -------------------------------------------------------------------- +// CDriveList::[] +// gets drive number at specified index. +// -------------------------------------------------------------------- +// +EXPORT_C CVideoDecDataList::CVideoDecData *CVideoDecDataList::operator[](TInt aIndex) const + { + if(0 <= aIndex && aIndex aDecoders; + CMMFDevVideoPlay *videoPlay=CMMFDevVideoPlay::NewL(obsImpl); + //place object on cleanupstack. + CleanupStack::PushL(videoPlay); + + videoPlay->GetDecoderListL(aDecoders); + CVideoDecDataList *decDataList=CVideoDecDataList::NewL(); + for(int i=0;iVideoDecoderInfoLC(aDecoders[i]); + CVideoDecDataList::CVideoDecData *data=new CVideoDecDataList::CVideoDecData(decoderInfo->Manufacturer(),decoderInfo->Identifier(),decoderInfo->MaxBitrate(),decoderInfo->Accelerated(),decoderInfo->Version().Name()); + decDataList->AppendL(data); + CleanupStack::PopAndDestroy(decoderInfo); + } + + aSysData = decDataList; + CleanupStack::PopAndDestroy(videoPlay); + return; + } else User::Leave(KErrNotFound); @@ -667,6 +689,48 @@ } aSysData = CStringData::NewL(FormatedMacAddress); } + else if( !aKey.CompareF(KWirelessConnSupport) ) + { + CDesCArray* connTypesDesArray; + connTypesDesArray = new (ELeave) CDesCArrayFlat(4); + CleanupStack::PushL(connTypesDesArray); + + //Initialize the feature manager if not already done. + if (!iFeatureManagerInitialized) + { + FeatureManager::InitializeLibL(); + iFeatureManagerInitialized = ETrue; + } + + if(FeatureManager::FeatureSupported(KFeatureIdBt)) + { + connTypesDesArray->AppendL(KBT); + } + if(FeatureManager::FeatureSupported(KFeatureIdIrda)) + { + connTypesDesArray->AppendL(KIrda); + } + if(FeatureManager::FeatureSupported(KFeatureIdProtocolWlan)) + { + connTypesDesArray->AppendL(KWlan); + } + if(FeatureManager::FeatureSupported(KFeatureIdProtocolGsm)) + { + connTypesDesArray->AppendL(KGsm); + } + if(FeatureManager::FeatureSupported(KFeatureIdProtocolWcdma)) + { + connTypesDesArray->AppendL(KWcdma); + } + if(FeatureManager::FeatureSupported(KFeatureIdProtocolCdma)) + { + connTypesDesArray->AppendL(KCdma); + } + + //connTypesDesArray ownership passed to CStringList. + aSysData = CStringList::NewL(connTypesDesArray); + CleanupStack::Pop(connTypesDesArray); + } else User::Leave(KErrNotFound); } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -1723,9 +1723,8 @@ interface->Close(); CleanupStack::PopAndDestroy(iServiceHandler); - + __UHEAP_MARKEND; return result; - __UHEAP_MARKEND; } else { @@ -2039,9 +2038,10 @@ CleanupStack::PopAndDestroy( iServiceHandler ); + __UHEAP_MARKEND; return result; - __UHEAP_MARKEND; + } @@ -3803,7 +3803,7 @@ // TInt Ctsysinfoprovidertests::GetCameraInfoTestNegative(CStifItemParser& aItem) { - TInt retcode; + TInt retcode = 0; iLog->Log(_L("GetCameraInfoTest - Negative Test") ); __UHEAP_MARK; @@ -3976,7 +3976,7 @@ TInt Ctsysinfoprovidertests::GetCameraInfoNegEntity(CStifItemParser& aItem) { _LIT8(KEntity1, "Entity1"); - TInt retcode; + TInt retcode = 0; iLog->Log(_L("GetCameraInfoNegEntity - Negative Test") ); __UHEAP_MARK; @@ -4136,7 +4136,7 @@ TInt Ctsysinfoprovidertests::GetCameraInfoNegKey(CStifItemParser& aItem) { _LIT8(KKey1, "Key1"); - TInt retcode; + TInt retcode = 0; iLog->Log(_L("GetCameraInfoNegKey - Negative Test") ); __UHEAP_MARK; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -363,8 +363,8 @@ test->Start(); TInt retval = test->Result(); delete test; + __UHEAP_MARKEND; return retval; - __UHEAP_MARKEND; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -372,8 +372,8 @@ aLog->Log(_L("after test->Result() Vibra:")); delete test; + __UHEAP_MARKEND; return retval; - __UHEAP_MARKEND; } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -195,7 +195,8 @@ TRAPD(err1, interface->ExecuteCmdL(KGetNotification,*inparam,*outparam,KLiwOptASyncronous,this)); iResult = err1; iLog->Log(_L("after getnotification vibra Active:")); - TInt pos = 0, transactionid ; + TInt pos = 0; + TInt transactionid = 0; const TLiwGenericParam* output2 = outparam->FindFirst( pos,KTransactionId ); iLog->Log(_L("after FindFirst vibra Active:")); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -160,7 +160,7 @@ else { const CLiwMap* outmap = ret_val->Value().AsMap(); - const CLiwList* drvlist; + const CLiwList* drvlist = NULL; TLiwVariant variant_drvlist; if( outmap->FindL(KDriveList,variant_drvlist) ) @@ -251,7 +251,7 @@ else { const CLiwMap* outmap = ret_val->Value().AsMap(); - const CLiwList* drvlist; + const CLiwList* drvlist = NULL; TLiwVariant variant_drvlist; if( outmap->FindL(KDriveList,variant_drvlist) ) @@ -2718,9 +2718,9 @@ interface->Close(); CleanupStack::PopAndDestroy(iServiceHandler); - + __UHEAP_MARKEND; return result; - __UHEAP_MARKEND; + } else { @@ -3015,10 +3015,10 @@ interface->Close(); CleanupStack::PopAndDestroy( iServiceHandler ); - + __UHEAP_MARKEND; return result; - __UHEAP_MARKEND; + } @@ -3324,7 +3324,7 @@ // TInt Ctsysinfoprovidertests::GetCameraInfoTest(CStifItemParser& aItem) { - TInt retcode; + TInt retcode = 0; iLog->Log(_L("GetCameraInfoTest - Positive Test") ); __UHEAP_MARK; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -325,8 +325,9 @@ test->Start(); TInt retval = test->Result(); delete test; + __UHEAP_MARKEND; return retval; - __UHEAP_MARKEND; + } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfoflipstatus.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfoflipstatus.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfoflipstatus.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -124,12 +124,18 @@ CSysData* data1 = NULL; TRAPD(err2,iSysInfoService->GetInfoL(KGeneral,KFlipStatus,data1)); + iResult = err2; + if(err2 != KErrNone) + return; flipstatus = ((CStatus*)data1)->Status(); CStatus* data2 = CStatus::NewL(!flipstatus); TRAPD(err3,iSysInfoService->SetInfoL(KGeneral,KFlipStatus,data2)); + iResult = err3; + if( err3 != KErrNone ) + return; delete data1; delete data2; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogripstatus.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogripstatus.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogripstatus.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -125,12 +125,17 @@ CSysData* data1 = NULL; TRAPD(err2,iSysInfoService->GetInfoL(KGeneral,KGripStatus,data1)); - + iResult = err2; + if( err2 != KErrNone ) + return; gripstatus = ((CStatus*)data1)->Status(); CStatus* data2 = CStatus::NewL(!gripstatus); TRAPD(err3,iSysInfoService->SetInfoL(KGeneral,KGripStatus,data2)); + iResult = err3; + if( err3 != KErrNone ) + return; delete data1; delete data2; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tuseractivitynotifier.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tuseractivitynotifier.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tuseractivitynotifier.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -55,8 +55,8 @@ CTestUserActivity::CTestUserActivity(CStifLogger* aLog,TInt aTimeOut, Test_Type aType) : CActive(EPriorityStandard), + iInactivityTimeOut(aTimeOut), iLog(aLog), - iInactivityTimeOut(aTimeOut), iTestType(aType) { } diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidasync.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidasync.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidasync.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CCellidAsync::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(60000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 333; TRAPD(err ,iSysInfoService->GetInfoL(KNetwork,KCellID,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidnotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidnotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidnotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CCellidNotify::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 444; TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCellID,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworkasync.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworkasync.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworkasync.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CCurrentNetAsync::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 5555; TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KCurrentNetwork,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworknotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworknotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworknotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CCurrentNetNotify::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 6666; TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCurrentNetwork,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworkasync.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworkasync.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworkasync.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CHomeNwAsync::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 1; TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KHomeNetwork,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworknotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworknotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworknotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CHomeNetworkNotify::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 222; TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCurrentNetwork,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacasync.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacasync.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacasync.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CLacAsync::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 7777; TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KLocationArea,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacnotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacnotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacnotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CLacNotify::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 8888; TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KLocationArea,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworkmodenotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworkmodenotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworkmodenotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CNetModeNotify::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KNetworkMode,111,this)); iResult = err; iTimer->After(OneMinute); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinforegstatusnotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinforegstatusnotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinforegstatusnotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CRegStatusNotify::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); TRAPD(err ,iSysInfoService->GetNotificationL(KNetwork,KRegistrationStatus,9999,this)); iResult = err ; iTimer->After(OneMinute); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelasync.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelasync.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelasync.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CSigLevelAsync::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 3333; TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KSignalLevel,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelnotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelnotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelnotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CSigLevelNotify::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); iTransId = 4444; TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KSignalLevel,iTransId,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthasyn.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthasyn.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthasyn.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CSignalStrAsync::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KSignalStrength,1111,this)); iResult = err; iTimer->After(OneMinute); diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthnotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthnotify.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthnotify.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -81,7 +81,8 @@ void CSignalStrNotify::TestFuncL() { - const TTimeIntervalMicroSeconds32 OneMinute(6000000000); + TInt64 x = 6000000000; + const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x); TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KSignalStrength,2222,this)); iResult = err; diff -r 0b68a1b0c15e -r a9c0808a1095 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp Tue Aug 31 16:06:03 2010 +0300 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp Wed Sep 01 12:28:47 2010 +0100 @@ -2366,7 +2366,7 @@ { TInt result = KErrNone; - TInt newDisplayLang; + TInt newDisplayLang = 0; __UHEAP_MARK; diff -r 0b68a1b0c15e -r a9c0808a1095 tsrc/group/bld.inf --- a/tsrc/group/bld.inf Tue Aug 31 16:06:03 2010 +0300 +++ b/tsrc/group/bld.inf Wed Sep 01 12:28:47 2010 +0100 @@ -19,15 +19,15 @@ // *****************mediagallery related testapps*********************** #include "../../serviceproviders/sapi_landmarks/tsrc/group/bld.inf" -//#include "../../serviceproviders/sapi_applicationmanager/tsrc/group/bld.inf" +#include "../../serviceproviders/sapi_applicationmanager/tsrc/group/bld.inf" #include "../../serviceproviders/sapi_mediamanagement/tsrc/group/bld.inf" #include "../../serviceproviders/sapi_location/tsrc/group/bld.inf" #include "../../serviceproviders/sapi_logging/tsrc/group/bld.inf" -//#include "../../serviceproviders/sapi_contacts_vpbk/tsrc/group/bld.inf" +#include "../../serviceproviders/sapi_contacts_vpbk/tsrc/group/bld.inf" #include "../../serviceproviders/sapi_sysinfo/tsrc/group/bld.inf" -//#include "../../serviceproviders/sapi_calendar/tsrc/group/bld.inf" +#include "../../serviceproviders/sapi_calendar/tsrc/group/bld.inf" #include "../../serviceproviders/sapi_sensor/tsrc/group/bld.inf" -//#include "../../serviceproviders/sapi_messaging/tsrc/group/bld.inf" +#include "../../serviceproviders/sapi_messaging/tsrc/group/bld.inf" #include "../../serviceproviders/sapi_serviceregistry/tsrc/group/bld.inf"