# HG changeset patch # User Pat Downey # Date 1277383978 -3600 # Node ID 2fee514510e56ea56f38907a0e4c02c8ec4424ed # Parent c4c0b2d3d4ad69a4d9c218674030f2a6e24cd048# Parent a4d95d2c2540f3c492ea666eceef6002df73586a Merge heads. diff -r a4d95d2c2540 -r 2fee514510e5 Distribution.Policy.S60 --- a/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/ServiceRegistry/distribution.policy.s60 --- a/appfw/apparchitecture/ServiceRegistry/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp --- a/appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -18,18 +18,53 @@ // INCLUDE FILES #include #include // RFs -#include -#include -#include #include #include #include // For RApaLsSession +#include +#include -// Resource file name. -_LIT(KCEResourceFile, "z:\\resource\\apps\\apfmimecontentpolicy.rsc"); -// This is needed for resource reading. -const TInt KCCMask(0x00000fff); +/* Closed content and extension information is stored in central repository with UID 0x10003A3F. + * Keys of the Closed Content and Extension information repository is divided into two parts. + * Most significant byte is used for identifying the type,i.e. whether it is Mimetype or extension, + * and the least significant 3 bytes are used for uniquely identifying the entry within that type. + * + * |-------------------- Key (32-bits) ---------------------| + * -------------------------------------------------------- + * | type (8-bits) | sequence number(24-bits) | + * -------------------------------------------------------- + * + * The type part is used for differentiating Content type and extension keys. + * The value can be + * 0x0 - For content type key + * 0x1 - For extension key + * + * Sequence number part is used to uniquely identifying the entry within that type. + * + * Examples: + * + * 0x00000000 - Content type key with sequence number 0x0 + * 0x00000001 - Content type key with sequence number 0x1 + * 0x01000000 - Extension type key with sequence number 0x0 + * 0x01000001 - Extension type key with sequence number 0x1 + * 0x01000002 - Extension type key with sequence number 0x2 + */ + + + +//Partial key for finding MIME type keys in the repository +const TUint32 KClosedContentTypePartialKey=0x0; + +//Partial key for finding extension type keys in the repository +const TUint32 KClosedExtensionTypePartialKey=0x01000000; + +//Mask for finding the type (MIME or extension)of a key +const TUint32 KClosedTypeKeyMask=0xFF000000; + + +//Closed content and extension information repository UID +const TUid KClosedContentAndExtensionInfoRepositoryUID={0x10003A3F}; NONSHARABLE_CLASS(CApfMimeContentPolicyImpl) : public CBase @@ -52,8 +87,9 @@ void ConstructL(); void ConstructL(RFs& aFs); TBool IsClosedFileL(RFile& aFileHandle, const TDesC& aFileName) const; - void ReadResourcesL(RFs& aFs); - + void ReadResourcesL(); + TBool IsValidExtension(TDesC& extension); + TBool IsValidMimeType(TDesC& extension); private: CDesCArrayFlat* iCcl; // Closed content list. CDesCArrayFlat* iExtList; // Closed extensions list. @@ -249,7 +285,7 @@ iFsConnected = ETrue; User::LeaveIfError(iFs.ShareProtected()); - ReadResourcesL(iFs); + ReadResourcesL(); } /** @@ -260,7 +296,7 @@ { iFsConnected = EFalse; iFs = aFs; - ReadResourcesL(iFs); + ReadResourcesL(); } /** @@ -490,31 +526,56 @@ Called by constructor. @param aFs A handle to a shared file server session. */ -void CApfMimeContentPolicyImpl::ReadResourcesL(RFs& aFs) +void CApfMimeContentPolicyImpl::ReadResourcesL() { - TResourceReader reader; + ASSERT(!iCcl); + ASSERT(!iExtList); + + CRepository *cenrep=CRepository::NewL(KClosedContentAndExtensionInfoRepositoryUID); + CleanupStack::PushL(cenrep); + + RArray keyArray; + CleanupClosePushL(keyArray); + + TBuf keyData; + //Find the extenstion type keys in the repository + cenrep->FindL(KClosedExtensionTypePartialKey, KClosedTypeKeyMask, keyArray); + int keyCount=keyArray.Count(); - // Resource reading is done without coe & eikon env. - RResourceFile rsFile; - rsFile.OpenL(aFs, KCEResourceFile); - CleanupClosePushL(rsFile); + iExtList=new (ELeave) CDesCArrayFlat(keyCount); - // Read closed content list. - // Remove offset from id - HBufC8* rBuffer = rsFile.AllocReadLC(R_COMMONENG_CLOSED_CONTENT_LIST & KCCMask); - reader.SetBuffer(rBuffer); - ASSERT(!iCcl); - iCcl = reader.ReadDesCArrayL(); - CleanupStack::PopAndDestroy(rBuffer); // rBuffer - - // Read closed extensions list. - // Remove offset from id - rBuffer = rsFile.AllocReadLC(R_COMMONENG_CLOSED_EXTENSIONS_LIST & KCCMask); - reader.SetBuffer(rBuffer); - ASSERT(!iExtList); - iExtList = reader.ReadDesCArrayL(); - CleanupStack::PopAndDestroy(2); // rBuffer, rsFile - + TInt valid; + TInt index; + //Get each extension type key value and store in iExtList array + for(index=0; indexGet(keyArray[index], keyData); + //Check validity of the extension. If its invalid it will not be added to list. + valid=IsValidExtension(keyData); + if(valid) + iExtList->AppendL(keyData); + } + + keyArray.Reset(); + + //Find the content type keys in the repository + cenrep->FindL(KClosedContentTypePartialKey, KClosedTypeKeyMask, keyArray); + keyCount=keyArray.Count(); + + iCcl=new (ELeave) CDesCArrayFlat(keyCount); + + //Get each content type key value and store in iCcl array + for(index=0; indexGet(keyArray[index], keyData); + //Check validity of the mime type. If its invalid it will not be added to list. + valid=IsValidMimeType(keyData); + if(valid) + iCcl->AppendL(keyData); + } + + CleanupStack::PopAndDestroy(2, cenrep); + // Sort lists to enable binary find iCcl->Sort(); iExtList->Sort(); @@ -524,3 +585,55 @@ User::LeaveIfError(iLs.Connect()); } + +//Checks the given extension is valid or invalid. The extension should start with a ".". +TBool CApfMimeContentPolicyImpl::IsValidExtension(TDesC& extension) + { + TChar dot='.'; + //Check whether extension should start with "." + return(extension.Locate(dot)==0); + } + +//Checks the given mime type is valid or not. +//The mime type will be in the following format type/subtype. Ex: "application/vnd.oma.drm.message" +//Mime type should posses the following properties. Otherewise those are considered as invalid. +//1. Only one front slash should exist. That should be followed by the type field. +//2. There should not be any backslashes. + +TBool CApfMimeContentPolicyImpl::IsValidMimeType(TDesC& mimeType) + { + TChar backslash='\\'; + TChar forwardslash='/'; + + //Check any backslash is used + TBool found=mimeType.Locate(backslash); + if(found!=KErrNotFound) + return(EFalse); + + //Locate forward slash position + found=mimeType.Locate(forwardslash); + + //There should be at least one forward slash + if(found==KErrNotFound) + { + return EFalse; + } + else + { + //Forward slash position should not at first or last position of the mime type + if(found==0||(found==mimeType.Length()-1)) + return EFalse; + + //There should not be more than one forward slash + found=mimeType.Mid(found+1).Locate(forwardslash); + if(found!=KErrNotFound) + { + return(EFalse); + } + else + { + //MIME format is valid + return(ETrue); + } + } + } diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apfile/apfmimecontentpolicy.rss --- a/appfw/apparchitecture/apfile/apfmimecontentpolicy.rss Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). -// All rights reserved. -// This component and the accompanying materials are made available -// under the terms of "Eclipse Public License v1.0" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// - - - -NAME CCLS - -#include - -RESOURCE RSS_SIGNATURE { } - -RESOURCE TBUF { buf=""; } - -//---------------------------------------------------- -// r_commoneng_closed_content_list -// Contains all MIME types in closed content list. -//---------------------------------------------------- -// -RESOURCE ARRAY r_commoneng_closed_content_list - { - items= - { - LBUF { txt="application/vnd.oma.drm.message"; }, - LBUF { txt="application/vnd.oma.drm.rights+xml"; }, - LBUF { txt="application/vnd.oma.drm.rights+wbxml"; }, - LBUF { txt="application/vnd.nokia.ringing-tone"; }, - LBUF { txt="audio/amr-wb"; }, - LBUF { txt="audio/sp-midi"; }, - LBUF { txt="image/vnd.nok.3Dscreensaver"; }, - LBUF { txt="image/vnd.nok-wallpaper"; }, - LBUF { txt="image/vnd.nok-oplogo"; }, - LBUF { txt="image/vnd.nok-oplogo-color"; }, - LBUF { txt="application/java"; }, - LBUF { txt="application/java-archive"; }, - LBUF { txt="application/x-java-archive"; }, - LBUF { txt="text/vnd.sun.j2me.app-descriptor"; }, - LBUF { txt="application/x-NokiaGameData"; }, - LBUF { txt="application/vnd.symbian.install"; }, - LBUF { txt="x-epoc/x-sisx-app"; } - }; - } - -//---------------------------------------------------- -// r_commoneng_closed_extensions_list -// List of closed file extensions. -//---------------------------------------------------- -// -RESOURCE ARRAY r_commoneng_closed_extensions_list - { - items= - { - LBUF { txt=".dm"; }, - LBUF { txt=".dr"; }, - LBUF { txt=".drc"; }, - LBUF { txt=".ott"; }, - LBUF { txt=".awb"; }, - LBUF { txt=".mid"; }, - LBUF { txt=".c3d"; }, - LBUF { txt=".jar"; }, - LBUF { txt=".ngd"; }, - LBUF { txt=".sis"; }, - LBUF { txt=".sisx"; } - }; - } - - -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apfile/distribution.policy.s60 --- a/appfw/apparchitecture/apfile/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apgrfx/APGCLI.CPP --- a/appfw/apparchitecture/apgrfx/APGCLI.CPP Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/apgrfx/APGCLI.CPP Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -17,6 +17,10 @@ #include "../apserv/APSCLSV.H" #include "../apserv/apsserv.h" +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include "../apgrfx/apgcommonutils.h" +#endif + #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #if !defined(__APA_INTERNAL_H__) #include "apainternal.h" @@ -1547,25 +1551,41 @@ /** @publishedPartner */ EXPORT_C void RApaLsSession::RegisterNonNativeApplicationTypeL(TUid aApplicationType, const TDesC& aNativeExecutable) { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK User::LeaveIfError(SendReceiveWithReconnect(EAppListServRegisterNonNativeApplicationType, TIpcArgs(aApplicationType.iUid, &aNativeExecutable))); +#else + (void)aApplicationType; //to make compiler happy + (void)aNativeExecutable; + User::Leave(KErrNotSupported); +#endif } //lint !e1762 Suppress member function could be made const /** @publishedPartner */ EXPORT_C void RApaLsSession::DeregisterNonNativeApplicationTypeL(TUid aApplicationType) { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK User::LeaveIfError(SendReceiveWithReconnect(EAppListServDeregisterNonNativeApplicationType, TIpcArgs(aApplicationType.iUid))); +#else + (void)aApplicationType; //to make compiler happy + User::Leave(KErrNotSupported); +#endif } //lint !e1762 Suppress member function could be made const /** @publishedPartner */ EXPORT_C void RApaLsSession::PrepareNonNativeApplicationsUpdatesL() { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK TIpcArgs ipcArgs(0, 0, 0, 0); User::LeaveIfError(SendReceiveWithReconnect(EAppListServPrepareNonNativeApplicationsUpdates, ipcArgs)); +#else + User::Leave(KErrNotSupported); +#endif } //lint !e1762 Suppress member function could be made const /** @publishedPartner */ EXPORT_C void RApaLsSession::RegisterNonNativeApplicationL(TUid aApplicationType, const TDriveUnit& aDrive, CApaRegistrationResourceFileWriter& aRegistrationResourceFile, CApaLocalisableResourceFileWriter* aLocalisableResourceFile, const RFile* aIconFile) { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK TIpcArgs ipcArgs(0, 0, 0, 0); RBuf8 ipcParameter0; CleanupClosePushL(ipcParameter0); @@ -1616,12 +1636,26 @@ User::LeaveIfError(SendReceiveWithReconnect(EAppListServRegisterNonNativeApplication, ipcArgs)); CleanupStack::PopAndDestroy(2, &ipcParameter0); +#else + (void) aApplicationType; //to make compiler happy + (void) aDrive; + (void) aRegistrationResourceFile; + (void) aRegistrationResourceFile; + (void) aLocalisableResourceFile; + (void) aIconFile; + User::Leave(KErrNotSupported); +#endif } //lint !e1762 Suppress member function could be made const /** @publishedPartner */ EXPORT_C void RApaLsSession::DeregisterNonNativeApplicationL(TUid aApplication) { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK User::LeaveIfError(SendReceiveWithReconnect(EAppListServDeregisterNonNativeApplication, TIpcArgs(aApplication.iUid))); +#else + (void) aApplication; + User::Leave(KErrNotSupported); +#endif } //lint !e1762 Suppress member function could be made const /** @@ -1635,8 +1669,12 @@ EXPORT_C void RApaLsSession::CommitNonNativeApplicationsUpdatesL() { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK TIpcArgs ipcArgs(EFalse, 0, 0, 0); User::LeaveIfError(SendReceiveWithReconnect(EAppListServCommitNonNativeApplications, ipcArgs)); +#else + User::Leave(KErrNotSupported); +#endif } //lint !e1762 Suppress member function could be made const @@ -1653,8 +1691,12 @@ EXPORT_C void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL() { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK TIpcArgs ipcArgs(ETrue, 0, 0, 0); User::LeaveIfError(SendReceiveWithReconnect(EAppListServCommitNonNativeApplications, ipcArgs)); +#else + User::Leave(KErrNotSupported); +#endif } /** @@ -1668,8 +1710,12 @@ */ EXPORT_C TInt RApaLsSession::RollbackNonNativeApplicationsUpdates() { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK TIpcArgs ipcArgs(0, 0, 0, 0); return SendReceiveWithReconnect(EAppListServRollbackNonNativeApplications, ipcArgs); +#else + return KErrNotSupported; +#endif } //lint !e1762 Suppress member function could be made const /** @@ -1724,6 +1770,7 @@ */ EXPORT_C TInt RApaLsSession::ForceRegistration(const RPointerArray& aRegFiles) { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK CBufFlat* buffer = 0; TRAPD(err, buffer = CreateRegFilesBufferL(aRegFiles)); if (err) @@ -1733,6 +1780,10 @@ const TInt returnValue=SendReceiveWithReconnect(EAppListServForceRegistration,TIpcArgs(&ptr)); delete buffer; return returnValue; +#else + (void) aRegFiles; + return KErrNotSupported; +#endif } //lint !e1762 Suppress member function could be made const @@ -1840,7 +1891,7 @@ SendReceive(ECancelNotifyOnDataMappingChange,TIpcArgs()); } //lint !e1762 Suppress member function could be made const - +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK CBufFlat* RApaLsSession::CreateRegFilesBufferL(const RPointerArray& aRegFiles) { // Serialize the array @@ -1873,3 +1924,211 @@ CleanupStack::Pop(buffer); return buffer; } +#endif + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + +/* This function is only for use by Installers. + +Installers can provide the information about installed, uninstaleld and upgraded applications using this function. +The function takes list of TApaAppUpdateInfo objects. TApaAppUpdateInfo object contains the application uid and +corresponding action done on that application like installed, uninstalled and upgraded. + +Apparc updates the application list based on the information provided in the list. + +UpdateAppListL initiates applist update. It will not wait till the applist update completed. + +@param aAppUpdateInfo List of TApaAppUpdateInfo objects, which contains application uid and corresponding action information + like installed, uninstalled and changed. +@return A standard error code. +@publishedAll +@released +*/ + +EXPORT_C TInt RApaLsSession::UpdateAppListL(RArray& aAppUpdateInfo) + { + //Create a buffer with the application UID and corresponding action information. + CBufFlat* buffer = 0; + TRAPD(err, buffer = CreateAppUpdateInfoBufferL(aAppUpdateInfo)); + if (err) + return err; + + TPtr8 ptr = buffer->Ptr(0); + const TInt returnValue=SendReceiveWithReconnect(EAppListServUpdateAppList,TIpcArgs(&ptr)); + delete buffer; + return returnValue; + } + + +/** +This function is only for use by Software Install. + +ForceRegistration allows Software Install to provide a list of application information that need to be +included in apparc's application list even if they have not been marked as installed in the SISRegistry. +The force registered applications will be removed from application list once Software Install notifies +the end of the installation by calling UpdateApplist. + + +@param aAppsData The list of application information needs to be added to application list. Apparc don't take the + ownership of this array. +@return A standard error code. +@publishedAll +@released +*/ + +EXPORT_C TInt RApaLsSession::ForceRegistration(const RPointerArray& aForceRegAppsInfo) +{ + //If there are no applications to update, just return. + if(aForceRegAppsInfo.Count()==0) + return(KErrNone); + + //Create a buffer with the application uid and corresponding action information. + CBufFlat* buffer = 0; + TRAPD(err, buffer = CreateForceRegAppInfoBufferL(aForceRegAppsInfo)); + if (err) + return err; + + TPtr8 ptr = buffer->Ptr(0); + const TInt returnValue=SendReceiveWithReconnect(EAppListServForceRegistration,TIpcArgs(&ptr)); + delete buffer; + return returnValue; +} + + +/* + * Creates a buffer for applications uids and action information. + */ +CBufFlat* RApaLsSession::CreateAppUpdateInfoBufferL(RArray& aAppUpdateInfo) + { + TInt count=aAppUpdateInfo.Count(); + TInt requiredBufferSize=sizeof(TInt32)+(count*sizeof(TApaAppUpdateInfo)); //Size of count + size of TApaAppUpdateInfo objects + + CBufFlat* const buffer = CBufFlat::NewL(requiredBufferSize); + CleanupStack::PushL(buffer); + buffer->ExpandL(0,requiredBufferSize); + RBufWriteStream writeStream; + writeStream.Open(*buffer); + CleanupClosePushL(writeStream); + + //Write number of TApaAppUpdateInfo objects to stream. + writeStream.WriteUint32L(count); + + for(TInt index=0;index& aForceRegAppsInfo) + { + TInt count=aForceRegAppsInfo.Count(); + TInt requiredBufferSize=sizeof(TInt32); //For count + + for(TInt index=0; indexExpandL(0,requiredBufferSize); + + RBufWriteStream writeStream; + writeStream.Open(*buffer); + CleanupClosePushL(writeStream); + + //Write count to stream. + writeStream.WriteUint32L(count); + + for(TInt index=0;index& aUpdatedAppsInfo) + { + const TInt KDefaultUpdateAppEntries=10; + + //Create a buffer with default size + TInt sizeRequired=(KDefaultUpdateAppEntries * sizeof(TApaAppUpdateInfo)) + 2; + CBufFlat* buffer=CBufFlat::NewL(sizeRequired); + CleanupStack::PushL(buffer); + buffer->ExpandL(0, sizeRequired); + TPtr8 ptr = buffer->Ptr(0); + + TPckgBuf pckg(sizeRequired); + + //pass the buffer and size of the buffer. + TInt returnValue=SendReceiveWithReconnect(EAppListUpdatedAppsInfo,TIpcArgs(&ptr, &pckg)); + + //If the size of the buffer is not enough expand it to required size and pass it again. + if(returnValue==KErrOverflow) + { + buffer->ExpandL(0, sizeRequired); + returnValue=SendReceiveWithReconnect(EAppListUpdatedAppsInfo,TIpcArgs(&ptr, &pckg)); + } + + if(returnValue==KErrNone) + { + RBufReadStream readStream; + readStream.Open(*buffer); + + //Read count from the stream + TInt count=readStream.ReadUint32L(); + + //Read updated applications information and add it to array + for(TInt index=0; index>appUpdateInfo; + aUpdatedAppsInfo.AppendL(appUpdateInfo); + } + } + + CleanupStack::PopAndDestroy(buffer); + return returnValue; + } + +#endif + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apgrfx/APGWGNAM.CPP --- a/appfw/apparchitecture/apgrfx/APGWGNAM.CPP Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/apgrfx/APGWGNAM.CPP Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -9,6 +9,7 @@ // Nokia Corporation - initial contribution. // // Contributors: +// NTT DOCOMO, INC. -- Fix CApaWindowGroupName::AppUid() cannot handle UID with 0 prefix // // Description: // @@ -513,7 +514,7 @@ { start++; TInt end=FindDelimiter(EEndUid); - if ((end-start) == KUidBufLength) + if (0 uidBuf=iBuf->Mid(start, end-start); TLex lex(uidBuf); diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apgrfx/apgcommonutils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/apgrfx/apgcommonutils.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,96 @@ +// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __APGCOMMONUTILS_H__ +#define __APGCOMMONUTILS_H__ + +#include +#include +#include +#include + + +/** +Implementation of the MStreamBuf interface that throws away all +data written to it but keeps track of how many bytes have been +written to it. It does not support reading. +*/ +class TNullBuf : public MStreamBuf + { +public: + inline TNullBuf(); + inline TUint BytesWritten(); +private: + inline virtual void DoWriteL(const TAny* aPtr,TInt aLength); +private: + TUint iBytesWritten; + }; + +/** +A write stream that throws away all its input, but keeps track of how many +bytes have been written to it. It is used for determining the amount of +memory needed to store externalised objects. +*/ +class RNullWriteStream : public RWriteStream + { +public: + inline RNullWriteStream(); + inline TUint BytesWritten(); +private: + TNullBuf iSink; + }; + +inline TNullBuf::TNullBuf() : iBytesWritten(0) + { + } + +inline TUint TNullBuf::BytesWritten() + { + return iBytesWritten; + } + +inline void TNullBuf::DoWriteL(const TAny*,TInt aLength) + { + iBytesWritten += aLength; + } + +inline RNullWriteStream::RNullWriteStream() + { + Attach(&iSink); + } + +inline TUint RNullWriteStream::BytesWritten() + { + return iSink.BytesWritten(); + } + +template +TInt GetObjectSizeL(T* aObject) + { + TInt size(0); + if(aObject) + { + RNullWriteStream nullstream; + CleanupClosePushL(nullstream); + nullstream << *aObject; + nullstream.CommitL(); + size = nullstream.BytesWritten(); + CleanupStack::PopAndDestroy(&nullstream); + return size; + } + return -1; + } + +#endif //__APGCOMMONUTILS_H__ diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apgrfx/apgupdate.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/apgrfx/apgupdate.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,50 @@ +// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// apgupdate.cpp +// + +#include "apgupdate.h" + +/** + * Default Constructor. + */ +EXPORT_C TApaAppUpdateInfo::TApaAppUpdateInfo() + { + + } + +/** + * Constructor for TApaAppUpdateInfo. + * @param aAppUid Application UID. + * @param aAction Action performed by installer on the application. + */ +EXPORT_C TApaAppUpdateInfo::TApaAppUpdateInfo(TUid aAppUid, TApaAppUpdateInfo::TApaAppAction aAction): + iAppUid(aAppUid), + iAction(aAction) + { + + } + +EXPORT_C void TApaAppUpdateInfo::InternalizeL(RReadStream& aReadStream) + { + iAppUid.iUid=aReadStream.ReadInt32L(); + iAction=TApaAppAction(aReadStream.ReadInt32L()); + } + +EXPORT_C void TApaAppUpdateInfo::ExternalizeL(RWriteStream& aWriteStream) const + { + aWriteStream.WriteInt32L(iAppUid.iUid); + aWriteStream.WriteInt32L(iAction); + } + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apgrfx/distribution.policy.s60 --- a/appfw/apparchitecture/apgrfx/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/aplist/aplappinforeader.cpp --- a/appfw/apparchitecture/aplist/aplappinforeader.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/aplist/aplappinforeader.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). + // Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -28,6 +28,8 @@ #include "../apgrfx/APGSTD.H" // EPanicNullPointer #include "../apgrfx/apsecutils.h" // CApaSecurityUtils + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK const TUint KResourceOffsetMask = 0xFFFFF000; _LIT(KAppBinaryPathAndExtension, "\\sys\\bin\\.exe"); @@ -35,6 +37,9 @@ // The 2nd UID that defines a resource file as being an application registration resource file. const TUid KUidAppRegistrationFile = {0x101F8021}; +#endif + + // // Local functions @@ -42,14 +47,16 @@ extern void CleanupServiceArray(TAny* aServiceArray); // Implemented in AplAppList.cpp + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK // ApaUtils TBool ApaUtils::TypeUidIsForRegistrationFile(const TUidType& aUidType) - { // static - return (aUidType[1].iUid==KUidAppRegistrationFile.iUid || - aUidType[0].iUid==KUidPrefixedNonNativeRegistrationResourceFile); - } - + { // static + return (aUidType[1].iUid==KUidAppRegistrationFile.iUid || + aUidType[0].iUid==KUidPrefixedNonNativeRegistrationResourceFile); + } +#endif // // CApaAppInfoReader @@ -63,29 +70,6 @@ // instead of having to copy the object (copying could be expensive for the methods // of this class that need to return arrays). - -CApaAppInfoReader* CApaAppInfoReader::NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid) - { - CApaAppInfoReader* self = new(ELeave) CApaAppInfoReader(aFs, aRegistrationFileName, aAppUid); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - return self; - } - -CApaAppInfoReader::CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid) : - iFs(aFs), - iAppUid(aAppUid), - iTimeStamp(0), - iDefaultScreenNumber(0), - iNonMbmIconFile(EFalse), - iLocalisableResourceFileTimeStamp(0), - iApplicationLanguage(ELangNone), - iIndexOfFirstOpenService(KErrNotFound), - iRegistrationFileName(aRegistrationFileName) - { - } - void CApaAppInfoReader::ConstructL() { iIconLoader = CApaIconLoader::NewL(iFs); @@ -103,7 +87,9 @@ delete iViewDataArray; delete iOwnedFileArray; delete iIconFileName; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK delete iLocalisableResourceFileName; +#endif if (iServiceArray) { @@ -127,16 +113,6 @@ return iAppBinaryUidType; } -TTime CApaAppInfoReader::TimeStamp() const - { - return iTimeStamp; - } - -TTime CApaAppInfoReader::IconFileTimeStamp() const - { - return iIconFileTimeStamp; - } - void CApaAppInfoReader::Capability(TDes8& aCapabilityBuf) const { TApaAppCapabilityBuf buf(iCapability); @@ -200,18 +176,7 @@ return iNonMbmIconFile; } -HBufC* CApaAppInfoReader::LocalisableResourceFileName() - { - HBufC* localisableResourceFileName = iLocalisableResourceFileName; - iLocalisableResourceFileName = NULL; // ownership transferred to caller - return localisableResourceFileName; - } -TTime CApaAppInfoReader::LocalisableResourceFileTimeStamp() const - { - return iLocalisableResourceFileTimeStamp; - } - TLanguage CApaAppInfoReader::AppLanguage() const { return iApplicationLanguage; @@ -239,6 +204,518 @@ return iconLoader; } +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + +CApaAppInfoReader::CApaAppInfoReader(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr) : + iFs(aFs), + iDefaultScreenNumber(0), + iNonMbmIconFile(EFalse), + iApplicationLanguage(ELangNone), + iIndexOfFirstOpenService(KErrNotFound), + iAppInfo(aAppInfo), + iScr(aScr) + { + } + +CApaAppInfoReader* CApaAppInfoReader::NewL(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr) + { + CApaAppInfoReader* self = new(ELeave) CApaAppInfoReader(aFs, aAppInfo, aScr); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +/* + * Reads the application information from SCR. + */ +TBool CApaAppInfoReader::ReadL() + { + ReadAppRegistrationInfoL(); + ReadLocalisationInfoL(); +#ifdef _DEBUG + DisplayAppInfo(); +#endif + return ETrue; + } + +#ifdef _DEBUG +void CApaAppInfoReader::DisplayAppInfo() + { + RDebug::Print(_L("[Apparc] Application UID: %X"), iAppUid.iUid); + if(iAppBinaryFullName) + RDebug::Print(_L("[Apparc] AppBinary Name: %S"), iAppBinaryFullName); + + RDebug::Print(_L("[Apparc] Embeddability: %d"), iCapability.iEmbeddability); + RDebug::Print(_L("[Apparc] Hidden: %d"), iCapability.iAppIsHidden); + RDebug::Print(_L("[Apparc] NewFile: %d"), iCapability.iSupportsNewFile); + RDebug::Print(_L("[Apparc] Launch in Foreground: %d"), iCapability.iLaunchInBackground); + RDebug::Print(_L("[Apparc] Attributes: %X"), iCapability.iAttributes); + RDebug::Print(_L("[Apparc] Group Name: %S"), &iCapability.iGroupName); + + RDebug::Print(_L("[Apparc] Default Screen Number: %d"), iDefaultScreenNumber); + RDebug::Print(_L("[Apparc] Application Language: %d"), iApplicationLanguage); + + if(iCaption) + RDebug::Print(_L("[Apparc] Short Cpation: %S"), iCaption); + + if(iShortCaption) + RDebug::Print(_L("[Apparc] Caption: %S"), iShortCaption); + + if(iServiceArray) + { + for(TInt index=0;indexCount();index++) + { + TApaAppServiceInfo serviceInfo=(*iServiceArray)[index]; + RDebug::Print(_L("[Apparc] Service Uid: %X"), serviceInfo.Uid().iUid); + + for(TInt j=0;jCount();index++) + { + CApaAppViewData* view= (*iViewDataArray)[index]; + RDebug::Print(_L("[Apparc] ViewID: %X"), view->Uid().iUid); + //RDebug::Print(_L("[Apparc] View Caption: %s"), view->Caption()); + //RDebug::Print(_L("[Apparc] View Icon File: %s"), view->IconFileName()); + if(view->NonMbmIconFile()) + RDebug::Print(_L("[Apparc] Its Non MBM icon file")); + RDebug::Print(_L("[Apparc] Screen Mode: %d"), view->ScreenMode()); + } + } + } + +#endif + + +void CApaAppInfoReader::ReadAppRegistrationInfoL() + { + //Get 3rd UID of the application + iAppUid=iAppInfo.AppUid(); + + iCapability.iAttributes=iAppInfo.Attributes(); + TUid firstUid(KExecutableImageUid); + TUid middleUid(KUidApp); + + //If the application is non-native, first UID should be Null UID and second uid is the non-native application type(i.e type ID of java, widget etc.). + if (iCapability.iAttributes & TApaAppCapability::ENonNative) + { + firstUid=KNullUid; + middleUid.iUid=iAppInfo.TypeId(); + } + else if (iCapability.iAttributes & TApaAppCapability::EBuiltAsDll) + { + User::Leave(KErrNotSupported); // legacy dll-style app + } + + iAppBinaryUidType=TUidType(firstUid, middleUid, iAppUid); + + //If executable file name is not given then just leave. + if(iAppInfo.AppFile().Length() ==0 ) + User::Leave(KErrGeneral); + + //Absolute path of the executable file is stored in iAppBinaryFullName + iAppBinaryFullName=iAppInfo.AppFile().AllocL(); + +// //Check whether the binary exists. + /*RLibrary::TInfoBuf infoBuf; + TInt ret = RLibrary::GetInfo(*iAppBinaryFullName, infoBuf); + User::LeaveIfError(ret); + + if(infoBuf().iUids[2]!=iAppUid && iAppBinaryUidType[1]==KUidApp) + User::Leave(KErrNotFound);*/ + + iCapability.iAppIsHidden=iAppInfo.Hidden(); + iCapability.iEmbeddability = static_cast(iAppInfo.Embeddability()); + iCapability.iLaunchInBackground=iAppInfo.Launch(); + iCapability.iSupportsNewFile=iAppInfo.NewFile(); + + iDefaultScreenNumber=iAppInfo.DefaultScreenNumber(); + + iCapability.iGroupName=iAppInfo.GroupName(); + + RPointerArray appOpaqueData=iAppInfo.AppOpaqueData(); + ASSERT(!(appOpaqueData.Count()>1)); + + if(appOpaqueData.Count()>0) + { + iOpaqueData=appOpaqueData[0]->OpaqueData().AllocL(); + } + else + { + //If opaque data is not available, create an empty object and assign to iOpaqueData + iOpaqueData=HBufC8::NewL(0); + } + + ReadServiceInfoL(iAppInfo.ServiceArray()); + ReadOwnedFilesInfoL(iAppInfo.OwnedFileArray()); + } + + +/* + * Reads service information of the application. + */ +void CApaAppInfoReader::ReadServiceInfoL(const RPointerArray& aServiceInfo) + { + TInt serviceCount=aServiceInfo.Count(); + + if (serviceCount > 0) + { + iServiceArray = new(ELeave) CArrayFixFlat(4); + } + else + { + //if service information is not avaliable, just return. + return; + } + + //Read application service info one at a time and store in iServiceArray. + for (TInt index=0;indexUid(); + + CArrayFixFlat* mimeTypesSupported = new(ELeave) CArrayFixFlat(5); + CleanupStack::PushL(mimeTypesSupported); + + //Read supported mime types of a service + ReadMimeTypesSupportedL(aServiceInfo[index]->DataTypes(), *mimeTypesSupported); + + RPointerArray serviceOpaqueData=aServiceInfo[index]->OpaqueData(); + //SCR schould give atmost only one opaque data for a service. + ASSERT(!(serviceOpaqueData.Count()>1)); + + HBufC8* opaqueData=NULL; + if(serviceOpaqueData.Count()>0) + { + opaqueData= serviceOpaqueData[0]->OpaqueData().AllocL(); + } + else + { + //If opaque data is not available, create an empty object and assign to opaqueData + opaqueData=HBufC8::NewL(0); + } + + TApaAppServiceInfo serviceInfo(serviceUid, mimeTypesSupported,opaqueData); // takes ownership of mimeTypesSupported and opaqueData + CleanupStack::PushL(opaqueData); + iServiceArray->AppendL(serviceInfo); + CleanupStack::Pop(2, mimeTypesSupported); + + //If service UID is KOpenServiceUid and it is first open service then initialize iIndexOfFirstOpenService + if ((serviceUid == KOpenServiceUid) && (iIndexOfFirstOpenService < 0)) + iIndexOfFirstOpenService = iServiceArray->Count() - 1; + } + } + + +/* + * Reads supported mime types and its handling priorities of a service + */ +void CApaAppInfoReader::ReadMimeTypesSupportedL(const RPointerArray& dataTypes, CArrayFixFlat& aMimeTypesSupported) + { + + const TInt dataTypeArraySize = dataTypes.Count(); + //if there are no data types available, just return. + if (dataTypeArraySize <= 0) + return; + + for (TInt i=0; i < dataTypeArraySize; i++) + { + TDataTypePriority priority = static_cast(dataTypes[i]->Priority()); + + //Check for data priority of UnTrusted apps however the trusted apps will not have any restrictions + //over the data priority. + //If an untrusted app has write device data capability (i.e. still has priority = KDataTypePrioritySystem), + //do not restrict to KDataTypeUnTrustedPriorityThreshold + if (priority > KDataTypeUnTrustedPriorityThreshold || priority == KDataTypePrioritySystem ) + { + ReadAppSecurityInfo(); + + if (priority == KDataTypePrioritySystem) + { + // Check that the app has capability WriteDeviceData + if (!iHasWriteDeviceDataCap) + priority = KDataTypePriorityNormal; + } + else + { + //data priority for UnTrusted apps would be capped if it is greater than the threshold priority i.e, KMaxTInt16. + //Component ID is zero if the application is shipped with phone. + TBool isInstalledApp=(iScr.GetComponentIdForAppL(iAppBinaryUidType[2])!=0); + if (!iIsSidTrusted && isInstalledApp) + { + //if application sid is in unprotected range and the applciation is instaleld with + //one of the installers after phone marketed, then priority needs to be downgraded. + priority = KDataTypeUnTrustedPriorityThreshold; + } + } + } + + TBuf8 buf; + //Convert 16-bit descriptor to 8-bit descriptor. + buf.Copy(dataTypes[i]->Type()); + + TDataType dataType(buf); + TDataTypeWithPriority dataTypeWithPriority(dataType, priority); + aMimeTypesSupported.AppendL(dataTypeWithPriority); + } + } + + +/* + * Reads owned files information. + */ +void CApaAppInfoReader::ReadOwnedFilesInfoL(const RPointerArray& aOwnedFiles) + { + const TInt fileOwnershipArraySize = aOwnedFiles.Count(); + + //if owned files information is not avaliable, just return. + if (fileOwnershipArraySize <= 0) + return; + + iOwnedFileArray = new(ELeave) CDesCArraySeg(fileOwnershipArraySize); + + for (TInt index=0; index < fileOwnershipArraySize; index++) + { + HBufC *fileowned=aOwnedFiles[index]->Des().AllocL(); + CleanupStack::PushL(fileowned); + iOwnedFileArray->AppendL(*fileowned); //takes the ownership of fileowned + CleanupStack::Pop(fileowned); + } + } + +void CApaAppInfoReader::ReadLocalisationInfoL() + { + RPointerArray localisationInfo; + localisationInfo=iAppInfo.LocalizableAppInfoList(); + ASSERT(localisationInfo.Count() <= 1); + + if(localisationInfo.Count()<=0) + { + //If localisable information is not avaialable then assign default icons. + TRAP_IGNORE(iIcons = CApaAppIconArray::NewDefaultIconsL()); + return; + } + + //Group name provided in localisation file takes precedence over group name provided in registration file name. + const TDesC& groupName=localisationInfo[0]->GroupName(); + + if(groupName.Length()>0) + { + iCapability.iGroupName=groupName; + } + + //Get application language for current phone language. + iApplicationLanguage=localisationInfo[0]->ApplicationLanguage(); + + const Usif::CCaptionAndIconInfo* captionIconInfo=localisationInfo[0]->CaptionAndIconInfo(); + + TBool useDefaultIcons=ETrue; + + if(captionIconInfo!=NULL) + { + iShortCaption=localisationInfo[0]->ShortCaption().AllocL(); + if(iShortCaption && iShortCaption->Length() == 0) + { + delete iShortCaption; + iShortCaption=NULL; + } + + iCaption=captionIconInfo->Caption().AllocL(); + if(iCaption && iCaption->Length() == 0) + { + delete iCaption; + iCaption=NULL; + } + + iNumOfAppIcons=captionIconInfo->NumOfAppIcons(); + + if(captionIconInfo->IconFileName().Length()>0) + iIconFileName=captionIconInfo->IconFileName().AllocL(); + + + if (iIconFileName && iIconFileName->Length()) + { + if (iFs.IsValidName(*iIconFileName)) + { + RFile file; + TInt fileSize( 0 ); + TInt err= file.Open(iFs, *iIconFileName, EFileShareReadersOnly ); + + //If the icon file does not exist, use default icons. + if(err==KErrNone) + { + User::LeaveIfError(err); + CleanupClosePushL( file ); + User::LeaveIfError( file.Size( fileSize ) ); + CleanupStack::PopAndDestroy(&file);//file + + if ( fileSize > 0 ) + { + if(FileIsMbmWithGenericExtensionL(*iIconFileName)) + { + if (iNumOfAppIcons > 0) + { + //Icon file is valid and contains mbm icons. + iIcons = CApaAppIconArray::NewAppIconsL(iNumOfAppIcons, *iIconFileName, *iIconLoader); + useDefaultIcons=EFalse; + } + } + else + { + //If the icon file is not a mbm icon file then the file is treated as a non-mbm file. + iNonMbmIconFile = ETrue; + useDefaultIcons=EFalse; + } + + } + } + } + else + { + //If the filename is not a valid name then the file is treated as a non-mbm file. + iNonMbmIconFile = ETrue; + useDefaultIcons=EFalse; + } + } + } + + if(useDefaultIcons) + TRAP_IGNORE(iIcons = CApaAppIconArray::NewDefaultIconsL()); + + ReadViewInfoL(localisationInfo[0]->ViewDataList()); + } + +/* + * Read application view information. + */ + +void CApaAppInfoReader::ReadViewInfoL(const RPointerArray& aViewData) + { + const TInt numOfViews = aViewData.Count(); + + //if view information not avaliable, just return. + if(numOfViews <=0 ) + return; + + iViewDataArray = new(ELeave) CArrayPtrFlat(numOfViews); + + //Read one view information at time and add it iViewDataArray + for(TInt view = 0; view < numOfViews; ++view) + { + CApaAppViewData* viewData = CApaAppViewData::NewLC(); + + const TUid viewUid = aViewData[view]->Uid(); + viewData->SetUid(viewUid); + + const TInt screenMode = {aViewData[view]->ScreenMode()}; + viewData->SetScreenMode(screenMode); + + const Usif::CCaptionAndIconInfo* viewCaptionIconInfo=aViewData[view]->CaptionAndIconInfo(); + + if(viewCaptionIconInfo!=NULL) + { + viewData->SetCaptionL(viewCaptionIconInfo->Caption()); + + const TInt numOfViewIcons = viewCaptionIconInfo->NumOfAppIcons(); + viewData->SetNumOfViewIcons(numOfViewIcons); + + TPtrC viewIconFile = viewCaptionIconInfo->IconFileName(); + + if (viewIconFile.Length()) + { + viewData->SetIconFileNameL(viewIconFile); + + if (iFs.IsValidName(viewIconFile)) + { + if(!FileIsMbmWithGenericExtensionL(viewIconFile)) + viewData->SetNonMbmIconFile(ETrue); + } + else //If the filename is not a valid name then the file is treated as a non-mbm file. + viewData->SetNonMbmIconFile(ETrue); + } + else + { + viewIconFile.Set(KNullDesC); + if (numOfViewIcons > 0 && iIconFileName) + viewIconFile.Set(*iIconFileName); // default to app icon filename + } + + if (numOfViewIcons > 0 && iFs.IsValidName(viewIconFile) && FileIsMbmWithGenericExtensionL(viewIconFile)) + { + CApaAppIconArray* iconArray = CApaAppIconArray::NewViewIconsL(numOfViewIcons, viewIconFile, *iIconLoader); + viewData->SetIconArray(iconArray); + iconArray = NULL; + } + } + + iViewDataArray->AppendL(viewData); + CleanupStack::Pop(viewData); + } + } + +#else + +CApaAppInfoReader* CApaAppInfoReader::NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid) + { + CApaAppInfoReader* self = new(ELeave) CApaAppInfoReader(aFs, aRegistrationFileName, aAppUid); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +CApaAppInfoReader::CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid) : + iFs(aFs), + iAppUid(aAppUid), + iTimeStamp(0), + iDefaultScreenNumber(0), + iNonMbmIconFile(EFalse), + iLocalisableResourceFileTimeStamp(0), + iApplicationLanguage(ELangNone), + iIndexOfFirstOpenService(KErrNotFound), + iRegistrationFileName(aRegistrationFileName) + { + } + +TTime CApaAppInfoReader::TimeStamp() const + { + return iTimeStamp; + } + +TTime CApaAppInfoReader::IconFileTimeStamp() const + { + return iIconFileTimeStamp; + } + +HBufC* CApaAppInfoReader::LocalisableResourceFileName() + { + HBufC* localisableResourceFileName = iLocalisableResourceFileName; + iLocalisableResourceFileName = NULL; // ownership transferred to caller + return localisableResourceFileName; + } + +TTime CApaAppInfoReader::LocalisableResourceFileTimeStamp() const + { + return iLocalisableResourceFileTimeStamp; + } + // reads as much info as it can // at least captions and icons must be setup on return from this method (using defaults if necessary) TBool CApaAppInfoReader::ReadL() @@ -361,54 +838,6 @@ iAppBinaryFullName = parse.FullName().AllocL(); } - -HBufC* CApaAppInfoReader::CreateFullIconFileNameL(const TDesC& aIconFileName) const - { - HBufC* filename = NULL; - if (aIconFileName.Length() == 0) - return NULL; - /* - * aIconFileName may contain a valid string in some format (for eg. URI format) other than path to a regular file on disk - * and that can be a mbm or non-mbm file. Such a filename will be reported as invalid filename by iFs.IsValidName() method. - * aIconFileName will be returned since it is a valid string. - */ - if(!iFs.IsValidName(aIconFileName)) - { - filename = aIconFileName.AllocL(); - return filename; - } - - TParsePtrC parsePtr(aIconFileName); - if (parsePtr.IsWild() || !parsePtr.PathPresent() || !parsePtr.NamePresent()) - return NULL; - - // check for fully qualified icon filename - if (parsePtr.DrivePresent() && BaflUtils::FileExists(iFs, aIconFileName)) - filename = aIconFileName.AllocL(); - else - { - // check for icon file on same drive as localisable resource file - TParse parse; - TPtrC localisableResourceFileDrive = TParsePtrC(*iLocalisableResourceFileName).Drive(); - TInt ret = parse.SetNoWild(localisableResourceFileDrive, &aIconFileName, NULL); - if (ret == KErrNone && BaflUtils::FileExists(iFs, parse.FullName())) - filename = parse.FullName().AllocL(); - else - { - TPtrC registrationFileDrive = TParsePtrC(iRegistrationFileName).Drive(); - if (TInt(TDriveUnit(registrationFileDrive)) != TInt(TDriveUnit(localisableResourceFileDrive))) - { - // check for icon file on same drive as registration file - ret = parse.SetNoWild(registrationFileDrive, &aIconFileName, NULL); - if (ret == KErrNone && BaflUtils::FileExists(iFs, parse.FullName())) - filename = parse.FullName().AllocL(); - } - } - } - - return filename; - } - void CApaAppInfoReader::ReadLocalisableInfoL(const CResourceFile& aResourceFile, TUint aResourceId, TBool& aUseDefaultIcons) { RResourceReader resourceReader; @@ -570,68 +999,6 @@ CleanupStack::PopAndDestroy(&resourceReader); } -/*An MBM file may have a generic icon extension. In this case, as a way to check whether the file is an MBM one, -it is necessary to read the content of the fist four 32bit words of it and find out whether these words correspond to -KWriteonceFileStoreUid, KMultiBitmapFileImageUid, zero and KMultiBitmapFileImageChecksum respectively (defined in graphics/gditools/bmconv/bmconv.h). -So the file is opened and the first 4 32 bit words are extracted and compared with the header information of standard MBM file. -If they match, the function returns ETrue, else it returns EFalse */ -TBool CApaAppInfoReader::FileIsMbmWithGenericExtensionL(const TDesC& aFileName) - { - if (aFileName.Length() > 0) - { - //open a file in Share mode - this will allow other methods to access it too - RFile file; - RFs fs; - User::LeaveIfError(fs.Connect()); - CleanupClosePushL(fs); - User::LeaveIfError(file.Open(fs,aFileName,EFileShareReadersOnly)); - //this is done beacuse the file can also be accessed by applist at the same time - //buffer stores the 16 bytes of the file - CleanupClosePushL(file); - TBuf8<16> buffer; - User::LeaveIfError(file.Read(buffer,16)); - CleanupStack::PopAndDestroy();//file - CleanupStack::PopAndDestroy(&fs);//fs - //we use a constant pointer to the buffer to read header info - TPtrC8 filePointer(buffer); - - /*The first 16 bytes of an MBM file are the same for any generic MBM file. - These are : - KWriteOnceFileStoreUid = 0x10000037(Emulator MBM file) 0x10000041(ROM image) - KMultiBitMapFileImageUid = 0x10000042(Emulator MBM file) 0x00000001(ROM image) - Zero = 0x00000000(Emulator MBM file) 0x0000000C(ROM image) - checksum = 0x47396439(Emulator MBM file) 0x10000040(ROM image) - The first 16 bytes of the given file is compared with these standard values to ascertain it is MBM file*/ - if((filePointer[3]==0x10)&&(filePointer[2]==0x00)&&(filePointer[1]==0x00)&&(filePointer[0]==0x37)) - {//KWriteOnceFileStoreUid = 0x10000037 - if((filePointer[7]==0x10)&&(filePointer[6]==0x00)&&(filePointer[5]==0x00)&&(filePointer[4]==0x42)) - {//KMultiBitMapFileImageUid = 0x10000042 - if((filePointer[11]==0x00)&&(filePointer[10]==0x00)&&(filePointer[9]==0x00)&&(filePointer[8]==0x00)) - {//Zero = 0x00000000) - if((filePointer[15]==0x47)&&(filePointer[14]==0x39)&&(filePointer[13]==0x64)&&(filePointer[12]==0x39)) - {//checksum = 0x47396439 - return ETrue; - } - } - } - } - //Else Check for ROM Image MBM file's header - else if((filePointer[3]==0x10)&&(filePointer[2]==0x00)&&(filePointer[1]==0x00)&&(filePointer[0]==0x41)) - {//KWriteOnceFileStoreUid = 0x10000041 - if((filePointer[7]==0x00)&&(filePointer[6]==0x00)&&(filePointer[5]==0x00)&&(filePointer[4]==0x01)) - {//KMultiBitMapFileImageUid = 0x00000001 - if((filePointer[11]==0x00)&&(filePointer[10]==0x00)&&(filePointer[9]==0x00)&&(filePointer[8]==0x0C)) - {//Zero = 0x0000000C) - if((filePointer[15]==0x10)&&(filePointer[14]==0x00)&&(filePointer[13]==0x00)&&(filePointer[12]==0x40)) - {//checksum = 0x10000040 - return ETrue; - } - } - } - } - } - return EFalse; - } HBufC8* CApaAppInfoReader::ReadOpaqueDataL(TUint aResourceId, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile) { // static @@ -844,6 +1211,119 @@ } } + +HBufC* CApaAppInfoReader::CreateFullIconFileNameL(const TDesC& aIconFileName) const + { + HBufC* filename = NULL; + if (aIconFileName.Length() == 0) + return NULL; + /* + * aIconFileName may contain a valid string in some format (for eg. URI format) other than path to a regular file on disk + * and that can be a mbm or non-mbm file. Such a filename will be reported as invalid filename by iFs.IsValidName() method. + * aIconFileName will be returned since it is a valid string. + */ + if(!iFs.IsValidName(aIconFileName)) + { + filename = aIconFileName.AllocL(); + return filename; + } + + TParsePtrC parsePtr(aIconFileName); + if (parsePtr.IsWild() || !parsePtr.PathPresent() || !parsePtr.NamePresent()) + return NULL; + + // check for fully qualified icon filename + if (parsePtr.DrivePresent() && BaflUtils::FileExists(iFs, aIconFileName)) + filename = aIconFileName.AllocL(); + else + { + // check for icon file on same drive as localisable resource file + TParse parse; + TPtrC localisableResourceFileDrive = TParsePtrC(*iLocalisableResourceFileName).Drive(); + TInt ret = parse.SetNoWild(localisableResourceFileDrive, &aIconFileName, NULL); + if (ret == KErrNone && BaflUtils::FileExists(iFs, parse.FullName())) + filename = parse.FullName().AllocL(); + else + { + TPtrC registrationFileDrive = TParsePtrC(iRegistrationFileName).Drive(); + if (TInt(TDriveUnit(registrationFileDrive)) != TInt(TDriveUnit(localisableResourceFileDrive))) + { + // check for icon file on same drive as registration file + ret = parse.SetNoWild(registrationFileDrive, &aIconFileName, NULL); + if (ret == KErrNone && BaflUtils::FileExists(iFs, parse.FullName())) + filename = parse.FullName().AllocL(); + } + } + } + + return filename; + } + +#endif + +/*An MBM file may have a generic icon extension. In this case, as a way to check whether the file is an MBM one, +it is necessary to read the content of the fist four 32bit words of it and find out whether these words correspond to +KWriteonceFileStoreUid, KMultiBitmapFileImageUid, zero and KMultiBitmapFileImageChecksum respectively (defined in graphics/gditools/bmconv/bmconv.h). +So the file is opened and the first 4 32 bit words are extracted and compared with the header information of standard MBM file. +If they match, the function returns ETrue, else it returns EFalse */ +TBool CApaAppInfoReader::FileIsMbmWithGenericExtensionL(const TDesC& aFileName) + { + if (aFileName.Length() > 0) + { + //open a file in Share mode - this will allow other methods to access it too + RFile file; + RFs fs; + User::LeaveIfError(fs.Connect()); + CleanupClosePushL(fs); + User::LeaveIfError(file.Open(fs,aFileName,EFileShareReadersOnly)); + //this is done beacuse the file can also be accessed by applist at the same time + //buffer stores the 16 bytes of the file + CleanupClosePushL(file); + TBuf8<16> buffer; + User::LeaveIfError(file.Read(buffer,16)); + CleanupStack::PopAndDestroy();//file + CleanupStack::PopAndDestroy(&fs);//file, fs + //we use a constant pointer to the buffer to read header info + TPtrC8 filePointer(buffer); + + /*The first 16 bytes of an MBM file are the same for any generic MBM file. + These are : + KWriteOnceFileStoreUid = 0x10000037(Emulator MBM file) 0x10000041(ROM image) + KMultiBitMapFileImageUid = 0x10000042(Emulator MBM file) 0x00000001(ROM image) + Zero = 0x00000000(Emulator MBM file) 0x0000000C(ROM image) + checksum = 0x47396439(Emulator MBM file) 0x10000040(ROM image) + The first 16 bytes of the given file is compared with these standard values to ascertain it is MBM file*/ + if((filePointer[3]==0x10)&&(filePointer[2]==0x00)&&(filePointer[1]==0x00)&&(filePointer[0]==0x37)) + {//KWriteOnceFileStoreUid = 0x10000037 + if((filePointer[7]==0x10)&&(filePointer[6]==0x00)&&(filePointer[5]==0x00)&&(filePointer[4]==0x42)) + {//KMultiBitMapFileImageUid = 0x10000042 + if((filePointer[11]==0x00)&&(filePointer[10]==0x00)&&(filePointer[9]==0x00)&&(filePointer[8]==0x00)) + {//Zero = 0x00000000) + if((filePointer[15]==0x47)&&(filePointer[14]==0x39)&&(filePointer[13]==0x64)&&(filePointer[12]==0x39)) + {//checksum = 0x47396439 + return ETrue; + } + } + } + } + //Else Check for ROM Image MBM file's header + else if((filePointer[3]==0x10)&&(filePointer[2]==0x00)&&(filePointer[1]==0x00)&&(filePointer[0]==0x41)) + {//KWriteOnceFileStoreUid = 0x10000041 + if((filePointer[7]==0x00)&&(filePointer[6]==0x00)&&(filePointer[5]==0x00)&&(filePointer[4]==0x01)) + {//KMultiBitMapFileImageUid = 0x00000001 + if((filePointer[11]==0x00)&&(filePointer[10]==0x00)&&(filePointer[9]==0x00)&&(filePointer[8]==0x0C)) + {//Zero = 0x0000000C) + if((filePointer[15]==0x10)&&(filePointer[14]==0x00)&&(filePointer[13]==0x00)&&(filePointer[12]==0x40)) + {//checksum = 0x10000040 + return ETrue; + } + } + } + } + } + return EFalse; + } + // This method can be used to check whether app has a WriteDeviceCap // and its sid is trusted void CApaAppInfoReader::ReadAppSecurityInfo() @@ -925,7 +1405,7 @@ return ret; } else - aUseCache = ETrue; + aUseCache = ETrue; // if filename in array, get the next index TInt ret = 0; @@ -963,6 +1443,7 @@ // Leaves if an error occurs while trying to populate aIcons or sort icons TBool CApaIconLoader::LoadIconsL(TInt aNumOfIcons, const TDesC& aMbmFileName, CArrayPtr& aIcons) { + TEntry entry; TInt error=iFs.Entry(aMbmFileName,entry); if (error!=KErrNone) @@ -985,7 +1466,8 @@ CApaMaskedBitmap* bitmap = CApaMaskedBitmap::NewLC(); fileIndex = IconIndexL(aMbmFileName, useCache); User::LeaveIfError(bitmap->Load(mbmFile, 2*fileIndex)); - User::LeaveIfError((bitmap->Mask())->Load(mbmFile,2*fileIndex+1)); + User::LeaveIfError((bitmap->Mask())->Load(mbmFile,2*fileIndex+1)); + aIcons.AppendL(bitmap); CleanupStack::Pop(bitmap); } diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/aplist/aplappinforeader.h --- a/appfw/apparchitecture/aplist/aplappinforeader.h Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/aplist/aplappinforeader.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -26,6 +26,11 @@ #include #include +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include +#include +#endif + class TEntry; class RFs; class CResourceFile; @@ -34,6 +39,7 @@ class CApaAppIconArray; class CApaAppViewData; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK /** @internalComponent */ @@ -42,7 +48,7 @@ public: static TBool TypeUidIsForRegistrationFile(const TUidType& aUidType); }; - +#endif /** @internalComponent @@ -126,8 +132,16 @@ class CApaAppInfoReader : public CBase { public: - static CApaAppInfoReader* NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid); - TBool ReadL(); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + static CApaAppInfoReader* NewL(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr); +#else + static CApaAppInfoReader* NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid); + HBufC* LocalisableResourceFileName(); + TTime LocalisableResourceFileTimeStamp() const; + TTime TimeStamp() const; + TTime IconFileTimeStamp() const; +#endif + TBool ReadL(); static TBool FileIsMbmWithGenericExtensionL(const TDesC& aFileName); ~CApaAppInfoReader(); public: @@ -145,35 +159,41 @@ HBufC* IconFileName(); TBool NonMbmIconFile() const; CApaIconLoader* IconLoader(); - - TTime TimeStamp() const; - TTime IconFileTimeStamp() const; - - HBufC* LocalisableResourceFileName(); - TTime LocalisableResourceFileTimeStamp() const; TLanguage AppLanguage() const; CArrayFixFlat* ServiceArray(TInt& aIndexOfFirstOpenService); HBufC8* OpaqueData(); + private: - CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + CApaAppInfoReader(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr); + void ReadAppRegistrationInfoL(); + void ReadServiceInfoL(const RPointerArray& aServiceInfo); + void ReadOwnedFilesInfoL(const RPointerArray& aOwnedFiles); + void ReadMimeTypesSupportedL(const RPointerArray& dataTypes, CArrayFixFlat& aMimeTypesSupported); + void ReadLocalisationInfoL(); + void ReadViewInfoL(const RPointerArray& aViewData); +#ifdef _DEBUG + void DisplayAppInfo(); +#endif + +#else + CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid); + void ReadMandatoryInfoL(RResourceReader& aResourceReader); + void ReadNonLocalisableInfoL(RResourceReader& aResourceReader, CResourceFile*& aLocalisableResourceFile, TUint& aLocalisableResourceId); + void ReadNonLocalisableOptionalInfoL(RResourceReader& aResourceReader, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile); + void ReadMimeTypesSupportedL(RResourceReader& aResourceReader, CArrayFixFlat& aMimeTypesSupported); + void ReadLocalisableInfoL(const CResourceFile& aResourceFile, TUint aResourceId, TBool& aUseDefaultIcons); + HBufC* CreateFullIconFileNameL(const TDesC& aIconFileName) const; +#endif void ConstructL(); - void ReadMandatoryInfoL(RResourceReader& aResourceReader); - void ReadNonLocalisableInfoL(RResourceReader& aResourceReader, CResourceFile*& aLocalisableResourceFile, TUint& aLocalisableResourceId); - void ReadNonLocalisableOptionalInfoL(RResourceReader& aResourceReader, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile); - void ReadMimeTypesSupportedL(RResourceReader& aResourceReader, CArrayFixFlat& aMimeTypesSupported); - void ReadLocalisableInfoL(const CResourceFile& aResourceFile, TUint aResourceId, TBool& aUseDefaultIcons); - HBufC* CreateFullIconFileNameL(const TDesC& aIconFileName) const; TBool HasWriteDeviceDataCap(); void ReadAppSecurityInfo(); - static HBufC8* ReadOpaqueDataL(TUint aResourceId, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile); private: RFs& iFs; TUid iAppUid; HBufC* iAppBinaryFullName; TUidType iAppBinaryUidType; - TTime iTimeStamp; - TTime iIconFileTimeStamp; TApaAppCapability iCapability; TUint iDefaultScreenNumber; HBufC* iCaption; @@ -184,20 +204,28 @@ CDesCArray* iOwnedFileArray; HBufC* iIconFileName; TBool iNonMbmIconFile; // ETrue if icon filename is not an MBM file, however, EFalse does not necessarily mean it is an MBM file - HBufC* iLocalisableResourceFileName; - TTime iLocalisableResourceFileTimeStamp; TLanguage iApplicationLanguage; CArrayFixFlat* iServiceArray; - TInt iIndexOfFirstOpenService; - TBool iOpenServiceIsLegacy; + TInt iIndexOfFirstOpenService; HBufC8* iOpaqueData; private: - const TDesC& iRegistrationFileName; TBool iHasWriteDeviceDataCap; TBool iIsSidTrusted; // This flag is used to determine if app security info was allready read TBool iSecurityInfoHasBeenRead; - CApaIconLoader* iIconLoader; + CApaIconLoader* iIconLoader; +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + const Usif::CApplicationRegistrationData& iAppInfo; //The ownership is not taken + const Usif::RSoftwareComponentRegistry& iScr; //The ownership is not taken +#else + const TDesC& iRegistrationFileName; + TTime iTimeStamp; + TTime iIconFileTimeStamp; + HBufC* iLocalisableResourceFileName; + TTime iLocalisableResourceFileTimeStamp; + TBool iOpenServiceIsLegacy; +#endif + }; diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/aplist/aplapplist.cpp --- a/appfw/apparchitecture/aplist/aplapplist.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/aplist/aplapplist.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -21,7 +21,6 @@ #include "APFDEF.H" #include "../apparc/TRACE.H" #include "apgnotif.h" // MApaAppListServObserver -#include "aplappregfinder.h" // CApaAppRegFinder #include // BaflUtils::NearestLanguageFile() #include // RBufWriteStream #include "aplappinforeader.h" @@ -30,6 +29,13 @@ #include #endif +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include +#include +#else +#include "aplappregfinder.h" // CApaAppRegFinder +#endif + // Delays in the pseudo idle object that builds the application list // @@ -49,6 +55,13 @@ const TInt16 KROMVersionCacheFileBuildVersion=0; #endif +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +const TInt KNumAppEntriesFromSCR=10; + +const TInt KSCRConnectionWaitTime=20000; //Time to wait if SCR is busy +const TUid KUidSisLaunchServer={0x1020473f}; +#endif + GLDEF_C void Panic(TApgPanic aPanic) { @@ -84,7 +97,373 @@ TLanguage iPrevLanguage; }; - + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + +enum TApaSCRFetchAction + { + EGetAllAppsInfo, //Fetch all application the information from SCR + EGetSpecificAppsInfo //Fetch only provided application uids information + }; + +/* + * Contain information about appliations to be fetched from SCR. + */ + +NONSHARABLE_CLASS(CApaAppSCRFetchInfo : public CBase) + { +public: + static CApaAppSCRFetchInfo* NewL(TApaSCRFetchAction aSCRFetchAction, RArray* aAppUpdateInfo); + ~CApaAppSCRFetchInfo(); + RArray* AppUpdateInfo(); + TApaSCRFetchAction SCRFetchAction(); + +private: + CApaAppSCRFetchInfo(TApaSCRFetchAction aSCRFetchAction, RArray* aAppUpdateInfo); + +private: + TApaSCRFetchAction iSCRFetchAction; + RArray* iAppUpdateInfo; + }; + + +/* + * Reads multiple application information from SCR and caches it. When requested provides one application + * information at a time. + */ +NONSHARABLE_CLASS(CApaAppList::CApaScrAppInfo) + { +public: + static CApaScrAppInfo* NewL(const Usif::RSoftwareComponentRegistry& aScrCon, TInt aNumEntries); + void GetAllAppsInfoL(); + void GetSpecificAppsInfoL(RArray* aAppUpdateInfo); + TUid GetNextApplicationInfo(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData); + TApaSCRFetchAction GetSCRFetchAction(); + ~CApaScrAppInfo(); + +private: + void ConstructL(); + CApaScrAppInfo(const Usif::RSoftwareComponentRegistry& aScr, TInt aNumEntries); + void GetAppUidListL(RArray& aAppUpdateInfoArr, RArray& aAppUids); + TUid GetAllAppsNextApplicationInfoL(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData); + TUid GetSpecificAppsNextApplicationInfoL(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData); +private: + Usif::RApplicationRegistryView iScrAppView; + RPointerArray iAppInfo; + RPointerArray iSCRFetchInfoQueue; + const Usif::RSoftwareComponentRegistry& iSCR; + TBool iIsSCRRegViewOpen; + TInt iSpecificAppsIndex; + CApaAppSCRFetchInfo* iAppSCRFetchInfo; + TBool iMoreAppInfo; + TInt iNumEntriesToFetch; + }; + + + +CApaAppSCRFetchInfo* CApaAppSCRFetchInfo::NewL(TApaSCRFetchAction aSCRFetchAction, RArray* aAppUpdateInfo) + { + //Ownership of aAppUpdateInfo is transfered to this object. + CApaAppSCRFetchInfo* self=new (ELeave) CApaAppSCRFetchInfo(aSCRFetchAction, aAppUpdateInfo); + return(self); + } + + +CApaAppSCRFetchInfo::CApaAppSCRFetchInfo(TApaSCRFetchAction aSCRFetchAction, RArray* aAppUpdateInfo): + iSCRFetchAction(aSCRFetchAction), + iAppUpdateInfo(aAppUpdateInfo) + { + } + +CApaAppSCRFetchInfo::~CApaAppSCRFetchInfo() + { + delete iAppUpdateInfo; + } + +RArray* CApaAppSCRFetchInfo::AppUpdateInfo() + { + return iAppUpdateInfo; + } + + +TApaSCRFetchAction CApaAppSCRFetchInfo::SCRFetchAction() + { + return iSCRFetchAction; + } + + +//CApaAppList::CApaScrAppInfo + +CApaAppList::CApaScrAppInfo* CApaAppList::CApaScrAppInfo::NewL(const Usif::RSoftwareComponentRegistry& aScrCon, TInt aNumEntries) + { + CApaScrAppInfo* self=new(ELeave) CApaScrAppInfo(aScrCon, aNumEntries); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(); + return self; + } + + +CApaAppList::CApaScrAppInfo::CApaScrAppInfo(const Usif::RSoftwareComponentRegistry& aScr, TInt aNumEntries): + iSCR(aScr), + iIsSCRRegViewOpen(EFalse), + iSpecificAppsIndex(-1), + iAppSCRFetchInfo(NULL), + iMoreAppInfo(EFalse), + iNumEntriesToFetch(aNumEntries) + + { + } + +void CApaAppList::CApaScrAppInfo::ConstructL() + { + } + + +CApaAppList::CApaScrAppInfo::~CApaScrAppInfo() + { + if(iAppSCRFetchInfo) + { + delete iAppSCRFetchInfo; + iAppSCRFetchInfo=NULL; + } + + iAppInfo.ResetAndDestroy(); + iSCRFetchInfoQueue.ResetAndDestroy(); + iScrAppView.Close(); + } + +/* + * Gets all the application information available in the SCR. It adds SCR fetch info with action EGetAllAppsInfo to a queue + * to get all the application information. The information can be obtained one at a time by calling GetNextApplicationInfoL + * function. + */ +void CApaAppList::CApaScrAppInfo::GetAllAppsInfoL() + { + CApaAppSCRFetchInfo* appSCRFetchInfo = CApaAppSCRFetchInfo::NewL(EGetAllAppsInfo, NULL); + CleanupStack::PushL(appSCRFetchInfo); + iSCRFetchInfoQueue.AppendL(appSCRFetchInfo); + CleanupStack::Pop(); + } + + +/* + * Gets specific application information from the SCR. It adds SCR fetch info request with action EGetSpecificAppsInfo + * along with the required uid list to the queue. The information can be obtained one at a time by calling GetNextApplicationInfoL + * function. + */ +void CApaAppList::CApaScrAppInfo::GetSpecificAppsInfoL(RArray* aAppUpdateInfo) + { + CApaAppSCRFetchInfo* appSCRFetchInfo=CApaAppSCRFetchInfo::NewL(EGetSpecificAppsInfo, aAppUpdateInfo); + CleanupStack::PushL(appSCRFetchInfo); + iSCRFetchInfoQueue.AppendL(appSCRFetchInfo); + CleanupStack::Pop(); + } + +/* + * Create array of uids from TApaAppUpdateInfo array. + */ +void CApaAppList::CApaScrAppInfo::GetAppUidListL(RArray& aAppUpdateInfoArr, RArray& aAppUids) + { + TInt count=aAppUpdateInfoArr.Count(); + + for(TInt index=0;indexSCRFetchAction(); +} + + +/* + * Provides one application information at a time. Returns Null UID if no more application information available. + * Ownership of aAppData is transfered to calling function. + */ +TUid CApaAppList::CApaScrAppInfo::GetNextApplicationInfo(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData) + { + aAppData=NULL; + TUid appUid=KNullUid; + + while(appUid==KNullUid) + { + //If there is no valid current SCR fetch information, get it from SCR fetch info queue + if(!iAppSCRFetchInfo) + { + if(iSCRFetchInfoQueue.Count()>0) + { + //Get next SCR fetch info + iAppSCRFetchInfo=iSCRFetchInfoQueue[0]; + iSCRFetchInfoQueue.Remove(0); + iMoreAppInfo=ETrue; + } + else + { + //No more SCR fetch information avaialable. + break; + } + } + + //Get next application information + if(iAppSCRFetchInfo->SCRFetchAction()==EGetAllAppsInfo) + { + //If there is a leave with current SCR fetch info, ignore and proceed with next SCR fetch info + TRAP_IGNORE(appUid=GetAllAppsNextApplicationInfoL(aAppAction, aAppData)); + } + else + { + //If there is a leave with current SCR fetch info, ignore and proceed with next SCR fetch info + TRAP_IGNORE(appUid=GetSpecificAppsNextApplicationInfoL(aAppAction, aAppData)); + } + + if(appUid==KNullUid) + { + //If no application information avaialble with current fetch action reset the values for next SCR fetch action. + delete iAppSCRFetchInfo; + iAppSCRFetchInfo=NULL; + iScrAppView.Close(); + iIsSCRRegViewOpen=EFalse; + } + } + + return(appUid); + } + +TUid CApaAppList::CApaScrAppInfo::GetAllAppsNextApplicationInfoL(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData) + { + TUid appUid=KNullUid; + + if(iAppInfo.Count()==0 && iMoreAppInfo) + { + //Open registry view if its not open. + if(!iIsSCRRegViewOpen) + { + TInt err=KErrNone; + TInt timeOut=KSCRConnectionWaitTime; + + //Retry if an error occurs while opening a SCR view. + while(timeOut < KSCRConnectionWaitTime*8) + { + TRAP(err, iScrAppView.OpenViewL(iSCR)); + if(err != KErrNone) + { + User::After(timeOut); + timeOut= (2*timeOut); + } + else + { + break; + } + } + User::LeaveIfError(err); + iIsSCRRegViewOpen=ETrue; + } + + //Get next available applications information. + iScrAppView.GetNextApplicationRegistrationInfoL(iNumEntriesToFetch, iAppInfo); + if(iAppInfo.Count()AppUid(); + return appUid; + } + + +/* + * Gets next application information when specific applications information requested. + */ +TUid CApaAppList::CApaScrAppInfo::GetSpecificAppsNextApplicationInfoL(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData) + { + TUid appUid=KNullUid; + TApaAppUpdateInfo::TApaAppAction action = TApaAppUpdateInfo::EAppNotPresent; //To make compiler happy + Usif::CApplicationRegistrationData* appData=NULL; + + while(appUid==KNullUid) + { + if(iAppInfo.Count()==0 && iMoreAppInfo) + { + //Open registry view if its not open and also provides application uid list for which applist needs to be updated. + if(!iIsSCRRegViewOpen) + { + RArray appUids; + CleanupClosePushL(appUids); + //Get application uids list. + GetAppUidListL(*iAppSCRFetchInfo->AppUpdateInfo(), appUids); + + TInt err=KErrNone; + do + { + TRAP(err, iScrAppView.OpenViewL(iSCR, appUids)); + if(err) + User::After(KSCRConnectionWaitTime); + } + while(err!=KErrNone); + + CleanupStack::PopAndDestroy(); + iIsSCRRegViewOpen=ETrue; + iSpecificAppsIndex=0; + } + + //Get next available applications information. + iScrAppView.GetNextApplicationRegistrationInfoL(iNumEntriesToFetch,iAppInfo); + if(iAppInfo.Count()& appUpdateInfo=*iAppSCRFetchInfo->AppUpdateInfo(); + + + if(iSpecificAppsIndex0) + { + if(iAppInfo[0]->AppUid()==appUid) + { + appData=iAppInfo[0]; + iAppInfo.Remove(0); + } + } + + iSpecificAppsIndex++; + + //If action is not uninstalled, there should be application data in SCR. Otherwise skip the application action. + if((action!=TApaAppUpdateInfo::EAppNotPresent) && appData==NULL) + { + appUid=KNullUid; + } + + } + //If there are no more applications in the current update applist, break the loop; + if(appUpdateInfo.Count()==iSpecificAppsIndex) + break; + } + + aAppData=appData; + aAppAction=action; + return appUid; + } + +#endif + // // Local functions // @@ -108,26 +487,29 @@ // EXPORT_C CApaAppList* CApaAppList::NewL(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aIdlePeriodicDelay) - { - CApaAppList* self=new (ELeave) CApaAppList(aFs, aLoadMbmIconsOnDemand, aIdlePeriodicDelay); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - return self; - } + { + CApaAppList* self=new (ELeave) CApaAppList(aFs, aLoadMbmIconsOnDemand, aIdlePeriodicDelay); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } CApaAppList::CApaAppList(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aIdlePeriodicDelay) - :iFs(aFs), - iFlags(0), - iIdlePeriodicDelay(aIdlePeriodicDelay), - iLoadMbmIconsOnDemand(aLoadMbmIconsOnDemand), - iUninstalledApps(NULL) - { - } + :iFs(aFs), + iFlags(0), + iIdlePeriodicDelay(aIdlePeriodicDelay), + iLoadMbmIconsOnDemand(aLoadMbmIconsOnDemand), + iUninstalledApps(NULL) + { + } + void CApaAppList::ConstructL() { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iAppRegFinder = CApaAppRegFinder::NewL(iFs); +#endif User::LeaveIfError(iFsShareProtected.Connect()); User::LeaveIfError(iFsShareProtected.ShareProtected()); @@ -135,8 +517,11 @@ //Start language change monitor. iAppLangMonitor = CApaLangChangeMonitor::NewL(*this); + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK const TInt KArrayGranularity = 128; iForcedRegistrations = new (ELeave) CDesCArraySeg(KArrayGranularity); +#endif // Init the AppsList cache paths _LIT(KAppsListCacheFileName, ":\\private\\10003a3f\\AppsListCache\\AppsList.bin"); @@ -176,12 +561,14 @@ delete iDefaultIconArray; delete iDefaultAppIconMbmFileName; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK delete iAppRegFinder; + delete iForcedRegistrations; +#endif delete iAppIdler; delete iAppListStorer; delete iAppIconLoader; delete iAppLangMonitor; - delete iForcedRegistrations; delete iIconCaptionObserver; delete iIconCaptionOverrides; iAppsListCacheFileName.Close(); @@ -190,8 +577,16 @@ iCustomAppList.ResetAndDestroy(); iCustomAppList.Close(); + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + iForceRegAppUids.Close(); + delete iScrAppInfo; + iScr.Close(); +#endif } + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK // Stop scanning applications if installation or uninstallation has started EXPORT_C void CApaAppList::StopScan(TBool aNNAInstall) { @@ -206,7 +601,7 @@ } UndoSetPending(iAppData); } - + // Allow scanning when installation or uninstallation is complete EXPORT_C void CApaAppList::RestartScanL() { @@ -218,18 +613,7 @@ { return iNNAInstallation; } - -void CApaAppList::UndoSetPending(CApaAppData* aAppData) - // Reset all apps to pevious pending state so they don't get purged - { - for (; aAppData; aAppData = aAppData->iNext) - { - if (aAppData->iIsPresent == CApaAppData::EPresentPendingUpdate) - { - aAppData->iIsPresent = CApaAppData::EIsPresent; - } - } - } +#endif EXPORT_C void CApaAppList::StartIdleUpdateL() /** Updates the list asynchronously, using an idle time active object, @@ -267,7 +651,8 @@ delete iAppIdler; iAppIdler=NULL; } - + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK // DEF072701 // When performing the update scan let the idle object have lower priority. if (IsFirstScanComplete()) @@ -280,16 +665,133 @@ } SetPending(iAppData); iAppRegFinder->FindAllAppsL(CApaAppRegFinder::EScanAllDrives); - - // DEF072701 - // If this is the first scan i.e the boot scan then it may take some time. Thus - // the periodic delay value should be used so that this process will stop periodically - // to allow time for other processes. - // If this is just a re-scan it should take much less time. Therefore it should just - // be completed in one go rather than periodically delayed. Thus the delay value - // should be set to 0. - iAppIdler->Start(KIdleStartDelay, IsFirstScanComplete()? 0 : iIdlePeriodicDelay, TCallBack(IdleUpdateCallbackL, this)); - } + // DEF072701 + // If this is the first scan i.e the boot scan then it may take some time. Thus + // the periodic delay value should be used so that this process will stop periodically + // to allow time for other processes. + // If this is just a re-scan it should take much less time. Therefore it should just + // be completed in one go rather than periodically delayed. Thus the delay value + // should be set to 0. + iAppIdler->Start(KIdleStartDelay, IsFirstScanComplete()? 0 : iIdlePeriodicDelay, TCallBack(IdleUpdateCallbackL, this)); +#else + + iAppIdler=CPeriodic::NewL(CActive::EPriorityStandard); + iAppIdler->Start(KIdleStartDelay, IsFirstScanComplete()? 0 : iIdlePeriodicDelay, TCallBack(IdleUpdateCallbackL, this)); + +#endif + } + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +EXPORT_C void CApaAppList::InitializeApplistL(MApaAppListObserver* aObserver) + { + if(!iScr.Handle()) + User::LeaveIfError(iScr.Connect()); + + if(iScrAppInfo==NULL) + iScrAppInfo=CApaScrAppInfo::NewL(iScr, KNumAppEntriesFromSCR); + + iScrAppInfo->GetAllAppsInfoL(); + + StartIdleUpdateL(aObserver); + } + + +void CApaAppList::InitializeLangAppListL() + { + if(!iScr.Handle()) + User::LeaveIfError(iScr.Connect()); + + if(iScrAppInfo==NULL) + iScrAppInfo=CApaScrAppInfo::NewL(iScr, KNumAppEntriesFromSCR); + + iScrAppInfo->GetAllAppsInfoL(); + + // set iIsLangChangePending=ETrue, to all the application present in the applist + CApaAppData* appData=iAppData; + while(appData) + { + appData->iIsLangChangePending=ETrue; + appData=appData->iNext; + } + } + + +EXPORT_C void CApaAppList::UpdateApplistL(MApaAppListObserver* aObserver, RArray* aAppUpdateInfo, TUid aSecureID) + { + //If update applist is called by SWI, clear force registrations from applist. + if(aSecureID == KUidSisLaunchServer) + { + TInt count=iForceRegAppUids.Count(); + for(TInt index=0; indexCount() == 0) + return; + + //If SCR connection is not valid then connect. + if(!iScr.Handle()) + User::LeaveIfError(iScr.Connect()); + + if(iScrAppInfo==NULL) + iScrAppInfo=CApaScrAppInfo::NewL(iScr, KNumAppEntriesFromSCR); + + iScrAppInfo->GetSpecificAppsInfoL(aAppUpdateInfo); + + if(IsIdleUpdateComplete()) + StartIdleUpdateL(aObserver); + } + +void CleanupAndDestroyAppInfoArray(TAny* aRPArray) + { + RPointerArray* rpArray = (static_cast*>(aRPArray)); + rpArray->ResetAndDestroy(); + rpArray->Close(); + } + + +EXPORT_C void CApaAppList::UpdateApplistByForceRegAppsL(RPointerArray& aForceRegAppsInfo) + { + //Get number of force registered application information. + TInt count=aForceRegAppsInfo.Count(); + Usif::RSoftwareComponentRegistry scr; + User::LeaveIfError(scr.Connect()); + CleanupClosePushL(scr); + + //As this function takes the ownership of aForceRegAppsInfo, this needs to be destroyed if any leave occurs. + TCleanupItem cleanup(CleanupAndDestroyAppInfoArray, &aForceRegAppsInfo); + CleanupStack::PushL(cleanup); + + //Get each force registered application information and add it to applist. + for(TInt index=0; indexAppUid(); + + //Delete if the application already exist in the applist. + FindAndDeleteApp(appUid); + AddToList(appData); + //Maintain added force registered application uids so that it can be cleared from applist + //once installation complete. + iForceRegAppUids.AppendL(appUid); + } + + CleanupStack::PopAndDestroy(2); //cleanup, scr + } + + +// The function transfers ownership of the pointer owned by a CApaAppList to the caller +// to avoid copying the array. +EXPORT_C CArrayFixFlat* CApaAppList::UpdatedAppsInfo() +{ + CArrayFixFlat* updatedAppsInfo=iAppsUpdated; + iAppsUpdated=NULL; + return updatedAppsInfo; +} + +#endif EXPORT_C void CApaAppList::StartIdleUpdateL(MApaAppListObserver* aObserver) /** Updates the list asynchronously, using an idle time active object @@ -327,7 +829,13 @@ @param aObserver Observer to be notified when the update has finished. */ { + +#if _DEBUG + RDebug::Printf("[Apparc] *****************START CREATING APPLIST ****************************"); +#endif + DeleteAppsListBackUpAndTempFiles(); + TInt ret = KErrGeneral; #ifndef __WINS__ // on the emulator, don't read app list from file, as doing so means apps // built while the emulator isn't running won't appear in the list @@ -338,7 +846,12 @@ // There was an error during restore, so update the list asynchronously. DeleteAppData(); iFs.Delete(iAppsListCacheFileName); - StartIdleUpdateL(aObserver); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + InitializeApplistL(aObserver); +#else + StartIdleUpdateL(aObserver); +#endif + } else { @@ -360,36 +873,6 @@ iAppIconLoader->Start(); } -void CApaAppList::ScanRemovableDrivesAndUpdateL() -/** Rename Appslist.bin file to AppsList_Backup.bin, so that it can be renamed back, - if the update scan on removable media drives does not change applist. */ - { - const TArray listOfRemovableMediaDrives = iAppRegFinder->DriveList(); - const TInt count = listOfRemovableMediaDrives.Count(); - - // Removable media scan would take place only if removable drives are present. - if (count) - { - CApaAppData* appData = iAppData; - while (appData) - { - for (TInt driveIndex = 0; driveIndex < count; ++driveIndex) - { - if (TParsePtrC(*appData->iRegistrationFile).Drive() == listOfRemovableMediaDrives[driveIndex].iUnit.Name()) - { - appData->SetAppPending(); - break; - } - } - appData = appData->iNext; - } - - while (IdleUpdateL()) - { // It updates the removable media apps present in AppList if it has changed. - - }; - } - } void CApaAppList::DeleteAppsListBackUpAndTempFiles() /** Deletes all files inside AppsListCache folder except AppsList.bin */ @@ -484,7 +967,7 @@ { //Leave if the current version is different from the previous stored version and recreate applist. #ifdef _DEBUG - RDebug::Print(_L("!!Firmware update detected!! Rebuilding AppList")); + RDebug::Print(_L("[Apparc] !!Firmware update detected!! Rebuilding AppList")); #endif User::Leave(KErrGeneral); } @@ -495,7 +978,7 @@ if (err != KErrPathNotFound && err != KErrNotFound) { #ifdef _DEBUG - RDebug::Print(_L("!!Error %d reading Firmware version. Rebuilding AppList"),err); + RDebug::Print(_L("[Apparc] !!Error %d reading Firmware version. Rebuilding AppList"),err); #endif User::Leave(err); } @@ -533,6 +1016,9 @@ // Close the stream; CleanupStack::PopAndDestroy(&theReadStream); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + iFlags |= ENotifyUpdateOnFirstScanComplete; +#else iFs.Rename(iAppsListCacheFileName, iAppsListCacheBackUpFileName); iAppRegFinder->FindAllAppsL(CApaAppRegFinder::EScanRemovableDrives); // Builds the Removable Media Drive List @@ -540,6 +1026,7 @@ // It runs an update scan on removable media apps. ScanRemovableDrivesAndUpdateL(); +#endif } EXPORT_C TBool CApaAppList::IsLanguageChangePending() const @@ -587,7 +1074,7 @@ else iObserver->NotifyScanComplete(); // NotifyScanComplete will notify clients for scan complete. - iObserver=NULL; + //iObserver=NULL; } } @@ -597,9 +1084,219 @@ iAppIdler=NULL; } +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + +// returns ETrue if there more application information avaialable. +TInt CApaAppList::IdleUpdateL() + { + + Usif::CApplicationRegistrationData* appInfo=NULL; + TApaAppUpdateInfo::TApaAppAction action=TApaAppUpdateInfo::EAppPresent; //to make compiler happy. Actual value is assigned by GetNextApplicationInfo + TUid appUid; + + //Ownership of appInfo is transfered to this function. + appUid=iScrAppInfo->GetNextApplicationInfo(action,appInfo); + + if(appUid==KNullUid) + return EFalse; + + CleanupStack::PushL(appInfo); + CApaAppData *appData=NULL; + CApaAppData* app = NULL; + + switch(action) + { + case TApaAppUpdateInfo::EAppNotPresent: + if(appInfo==NULL) + { + TInt ret=FindAndDeleteApp(appUid); + if(ret==KErrNone) + iFlags |= EAppListHasChanged; + + //Add uninstalled application UID to a list + if(iUninstalledApps==NULL) + iUninstalledApps=new(ELeave) CArrayFixFlat(1); + + iUninstalledApps->AppendL(appUid); + } + break; + + case TApaAppUpdateInfo::EAppPresent: + // holds the application information from Applist + app = AppDataByUid(appInfo->AppUid()); + + if( app && IsLanguageChangePending() && (iScrAppInfo->GetSCRFetchAction() == EGetAllAppsInfo)) + { + //Application needs to be updated because of language change + RPointerArray localisationInfo; + localisationInfo=appInfo->LocalizableAppInfoList(); + ASSERT(!(localisationInfo.Count()>1)); + + if((localisationInfo.Count()>0) && (app->ApplicationLanguage() != localisationInfo[0]->ApplicationLanguage())) + { + // holds the application information read from SCR db + appData=CApaAppData::NewL(*appInfo, iFs, iScr); + FindAndDeleteApp(appUid); + AddToList(appData); + iFlags |= EAppListHasChanged; + } + else + { + app->iIsLangChangePending=EFalse; + } + } + else + { + // holds the application information read from SCR db + appData=CApaAppData::NewL(*appInfo, iFs, iScr); + if(app) + { + //Application found in applist. Delete existing application information from applist and create new + //application information object and add to the applist. + FindAndDeleteApp(appUid); + AddToList( appData ); + } + else + { + AddToList( appData ); + } + iFlags |= EAppListHasChanged; + } + + break; + + case TApaAppUpdateInfo::EAppInfoChanged: + appData=CApaAppData::NewL(*appInfo, iFs, iScr); + //Delete existing application information from applist and create new application information object and + //add to the applist. + FindAndDeleteApp(appUid); + AddToList( appData ); + iFlags |= EAppListHasChanged; + break; + } + + //If first scan not complete or if phone language is changed then clear the updated application list + //Otherwise add application updated apps list + if(!(iFlags&EFirstScanComplete) || (iFlags&ELangChangePending)) + { + if(!iAppsUpdated) + delete iAppsUpdated; + iAppsUpdated=NULL; + } + else + { + if(!iAppsUpdated) + iAppsUpdated= new(ELeave) CArrayFixFlat(1); + + TApaAppUpdateInfo appUpdateInfo(appUid, action); + iAppsUpdated->AppendL(appUpdateInfo); + } + + CleanupStack::PopAndDestroy(appInfo); + return ETrue; + } + + + +/* + * Finds and delete an application from applist. + */ +TInt CApaAppList::FindAndDeleteApp(TUid aAppUid) + { + CApaAppData* appData=iAppData; + CApaAppData* prevAppData=NULL; + + while(appData && appData->iUidType[2] != aAppUid) + { + prevAppData=appData; + appData=appData->iNext; + } + + if(appData) + { + if(prevAppData) + { + //If the application position is not the first application in the list + prevAppData->iNext=appData->iNext; + } + else + { + //If the application position is first in the list + iAppData=appData->iNext; + } + +#if _DEBUG + if(appData) + { + RDebug::Print(_L("[Apparc] Application with UID: %X is deleted from applist"), appData->iUidType[2]); + } +#endif + + delete appData; + return(KErrNone); + } + + //if application not found, return KErrNotFound + return(KErrNotFound); + } + +/** +@internalComponent +*/ +EXPORT_C CApaAppData* CApaAppList::FindAndAddSpecificAppL(TUid aAppUid) + { + Usif::RSoftwareComponentRegistry scrCon; + //If SCR connection not avaialable then connect to SCR. Otherwise use the + //existing connection. + if(!iScr.Handle()) + { + User::LeaveIfError(scrCon.Connect()); + CleanupClosePushL(scrCon); + } + else + scrCon=iScr; + + + //Pass 1 as number of entries to fetch from SCR as only specific application information is required. + CApaScrAppInfo *scrAppInfo=CApaScrAppInfo::NewL(scrCon, 1); + CleanupStack::PushL(scrAppInfo); + + RArray* appUpdateInfoList=new (ELeave) RArray(1); + CleanupStack::PushL(appUpdateInfoList); + TApaAppUpdateInfo appUpdateInfo(aAppUid, TApaAppUpdateInfo::EAppPresent) ; + appUpdateInfoList->AppendL(appUpdateInfo); + + scrAppInfo->GetSpecificAppsInfoL(appUpdateInfoList); + CleanupStack::Pop(appUpdateInfoList); + + Usif::CApplicationRegistrationData* appInfo=NULL; + TApaAppUpdateInfo::TApaAppAction action; + TUid uid; + uid=scrAppInfo->GetNextApplicationInfo(action, appInfo); + CleanupStack::PushL(appInfo); + + CApaAppData *appData=NULL; + if(appInfo) + { + appData=CApaAppData::NewL(*appInfo, iFs, scrCon); + FindAndDeleteApp(uid); + AddToList(appData); + iFlags |= EAppListHasChanged; + } + CleanupStack::PopAndDestroy(2, scrAppInfo); + + //If SCR session established in this function, then close it. + if(!iScr.Handle()) + CleanupStack::PopAndDestroy(); + + return appData; + } + +#else TInt CApaAppList::IdleUpdateL() // returns ETrue if there is more scanning to be done. { + TBool more=EFalse; TApaAppEntry currentApp = TApaAppEntry(); TRAPD(err, more = iAppRegFinder->NextL(currentApp, *iForcedRegistrations)); @@ -635,6 +1332,205 @@ return more; } +void CApaAppList::UpdateNextAppL(const TApaAppEntry& aAppEntry,TBool& aHasChanged) + { + CApaAppData* appData=AppDataByUid(aAppEntry.iUidType[2]); + if (appData==NULL) + {// not in list, so add it at the start + TRAPD(err,appData=CApaAppData::NewL(aAppEntry, iFs)); + if (err==KErrNone) + { + AddToList( appData ); + aHasChanged=ETrue; + } + } + else if (appData->IsPending()) + { // not found yet during current scan - we may need to override this one + + // On a system which scans for registration .RSC files (V2 apps) first, followed by + // .APP files (V1 apps), it's valid for a V1 app to override a V2 app (if the V2 app + // has just been removed). If this is the case, assume it's ok to compare the V1 .APP filename, + // with the V2 .RSC filename as their filenames will never match (which is what we want in this case). + TPtrC currentFileName; + if (appData->RegistrationFileUsed()) + currentFileName.Set(*appData->iRegistrationFile); + else + currentFileName.Set(*appData->iFullName); + + if (aAppEntry.iFullName.CompareF(currentFileName)!=0) + { + delete appData->iSuccessor; + appData->iSuccessor = NULL; + appData->iSuccessor = CApaAppEntry::NewL(aAppEntry); + + appData->iIsPresent = CApaAppData::ESuperseded; + aHasChanged=ETrue; + } + else + { + if (appData->Update() || appData->iIsPresent==CApaAppData::ENotPresentPendingUpdate) + aHasChanged=ETrue; + + appData->iIsPresent = CApaAppData::EIsPresent; + } + } + } + +void CApaAppList::SetPending(CApaAppData* aAppData) + // set all apps to pending update - we'll find them again as we scan + { + for (; aAppData; aAppData = aAppData->iNext) + aAppData->SetAppPending(); + } + +void CApaAppList::SetNotFound(CApaAppData* aAppData, TBool& aHasChanged) + // mark any unfound apps not present + { + while (aAppData) + { + if (aAppData->IsPending()) + { + aAppData->iIsPresent = CApaAppData::ENotPresent; + aHasChanged = ETrue; + } + aAppData = aAppData->iNext; + } + } + +EXPORT_C void CApaAppList::PurgeL() +/** Removes any applications from the list if they are no longer present +on the phone. It updates applications that have been +superceded. */ + { + CApaAppData* appData=iAppData; + CApaAppData* prev=NULL; + while (appData) + { + CApaAppData* next=appData->iNext; + if (appData->iIsPresent==CApaAppData::ENotPresent) + { + if (prev) + prev->iNext=next; + else + iAppData=next; + + //Add uninstalled application UID to a list + if(iUninstalledApps==NULL) + iUninstalledApps=new(ELeave) CArrayFixFlat(1); + + iUninstalledApps->AppendL(appData->AppEntry().iUidType[2]); + + delete appData; + } + else if (appData->iIsPresent==CApaAppData::ESuperseded) + { + CApaAppData* newApp=NULL; + TApaAppEntry appEntry; + appData->iSuccessor->Get(appEntry); + TRAPD(err,newApp=CApaAppData::NewL(appEntry, iFs)); + if (err==KErrNone) + { + // remove the old one and add the new one in its place + if (prev) + prev->iNext=newApp; + else + iAppData=newApp; + + newApp->iNext = appData->iNext; + delete appData; + // increment the iterator + prev = newApp; + } + } + else + prev=appData; + + appData=next; + } + } + +void CApaAppList::ScanRemovableDrivesAndUpdateL() +/** Rename Appslist.bin file to AppsList_Backup.bin, so that it can be renamed back, + if the update scan on removable media drives does not change applist. */ + { + const TArray listOfRemovableMediaDrives = iAppRegFinder->DriveList(); + const TInt count = listOfRemovableMediaDrives.Count(); + + // Removable media scan would take place only if removable drives are present. + if (count) + { + CApaAppData* appData = iAppData; + while (appData) + { + for (TInt driveIndex = 0; driveIndex < count; ++driveIndex) + { + if (TParsePtrC(*appData->iRegistrationFile).Drive() == listOfRemovableMediaDrives[driveIndex].iUnit.Name()) + { + appData->SetAppPending(); + break; + } + } + appData = appData->iNext; + } + + while (IdleUpdateL()) + { // It updates the removable media apps present in AppList if it has changed. + + }; + } + } + +void CApaAppList::UndoSetPending(CApaAppData* aAppData) + // Reset all apps to pevious pending state so they don't get purged + { + for (; aAppData; aAppData = aAppData->iNext) + { + if (aAppData->iIsPresent == CApaAppData::EPresentPendingUpdate) + { + aAppData->iIsPresent = CApaAppData::EIsPresent; + } + } + } + +/** +@internalComponent +*/ +EXPORT_C CApaAppData* CApaAppList::FindAndAddSpecificAppL(CApaAppRegFinder* aFinder, TUid aAppUid) + { +//Scans and adds the specified application to the app list if found + __ASSERT_DEBUG(aFinder, Panic(EPanicNullPointer)); + TBool found = EFalse; + TApaAppEntry appEntry; + aFinder->FindAllAppsL(CApaAppRegFinder::EScanAllDrives); + while (aFinder->NextL(appEntry, *iForcedRegistrations)) + { + if (appEntry.iUidType[2] == aAppUid) + { + found = ETrue; + break; + } + } + + CApaAppData* app = NULL; + if (found) + { + // add the app to the list + TBool hasChanged = EFalse; + CApaAppData* prevFirstAppInList = iAppData; + UpdateNextAppL(appEntry, hasChanged); + if (iAppData != prevFirstAppInList) + app = iAppData; // assume the new app was added to the list + + if (hasChanged) + iFlags |= EAppListHasChanged; + } + + return app; + return NULL; + } + +#endif + EXPORT_C TBool CApaAppList::IsIdleUpdateComplete() const /** Tests whether an asynchronous update of the list is currently in progress. @@ -644,165 +1540,19 @@ return iAppIdler == NULL; } -void CApaAppList::SetPending(CApaAppData* aAppData) - // set all apps to pending update - we'll find them again as we scan - { - for (; aAppData; aAppData = aAppData->iNext) - aAppData->SetAppPending(); - } - -void CApaAppList::SetNotFound(CApaAppData* aAppData, TBool& aHasChanged) - // mark any unfound apps not present - { - while (aAppData) - { - if (aAppData->IsPending()) - { - aAppData->iIsPresent = CApaAppData::ENotPresent; - aHasChanged = ETrue; - } - aAppData = aAppData->iNext; - } - } void CApaAppList::AddToList( CApaAppData* aAppData ) { __ASSERT_DEBUG(aAppData, Panic(EPanicNullPointer)); aAppData->iNext=iAppData; iAppData=aAppData; - } - -void CApaAppList::UpdateNextAppL(const TApaAppEntry& aAppEntry,TBool& aHasChanged) - { - CApaAppData* appData=AppDataByUid(aAppEntry.iUidType[2]); - if (appData==NULL) - {// not in list, so add it at the start - TRAPD(err,appData=CApaAppData::NewL(aAppEntry, iFs)); - if (err==KErrNone) - { - AddToList( appData ); - aHasChanged=ETrue; - } - } - else if (appData->IsPending()) - { // not found yet during current scan - we may need to override this one - - // On a system which scans for registration .RSC files (V2 apps) first, followed by - // .APP files (V1 apps), it's valid for a V1 app to override a V2 app (if the V2 app - // has just been removed). If this is the case, assume it's ok to compare the V1 .APP filename, - // with the V2 .RSC filename as their filenames will never match (which is what we want in this case). - TPtrC currentFileName; - if (appData->RegistrationFileUsed()) - currentFileName.Set(*appData->iRegistrationFile); - else - currentFileName.Set(*appData->iFullName); - if (aAppEntry.iFullName.CompareF(currentFileName)!=0) - { - delete appData->iSuccessor; - appData->iSuccessor = NULL; - appData->iSuccessor = CApaAppEntry::NewL(aAppEntry); - - appData->iIsPresent = CApaAppData::ESuperseded; - aHasChanged=ETrue; - } - else - { - if (appData->Update() || appData->iIsPresent==CApaAppData::ENotPresentPendingUpdate) - aHasChanged=ETrue; - - appData->iIsPresent = CApaAppData::EIsPresent; - } - } +#if _DEBUG + RDebug::Print(_L("[Apparc] Application with UID: %X is added to applist"), aAppData->iUidType[2]); +#endif + } -/** -@internalComponent -*/ -EXPORT_C CApaAppData* CApaAppList::FindAndAddSpecificAppL(CApaAppRegFinder* aFinder, TUid aAppUid) - { -//Scans and adds the specified application to the app list if found - __ASSERT_DEBUG(aFinder, Panic(EPanicNullPointer)); - TBool found = EFalse; - TApaAppEntry appEntry; - aFinder->FindAllAppsL(CApaAppRegFinder::EScanAllDrives); - while (aFinder->NextL(appEntry, *iForcedRegistrations)) - { - if (appEntry.iUidType[2] == aAppUid) - { - found = ETrue; - break; - } - } - - CApaAppData* app = NULL; - if (found) - { - // add the app to the list - TBool hasChanged = EFalse; - CApaAppData* prevFirstAppInList = iAppData; - UpdateNextAppL(appEntry, hasChanged); - if (iAppData != prevFirstAppInList) - app = iAppData; // assume the new app was added to the list - - if (hasChanged) - iFlags |= EAppListHasChanged; - } - - return app; - } - -EXPORT_C void CApaAppList::PurgeL() -/** Removes any applications from the list if they are no longer present -on the phone. It updates applications that have been -superceded. */ - { - CApaAppData* appData=iAppData; - CApaAppData* prev=NULL; - while (appData) - { - CApaAppData* next=appData->iNext; - if (appData->iIsPresent==CApaAppData::ENotPresent) - { - if (prev) - prev->iNext=next; - else - iAppData=next; - - //Add uninstalled application UID to a list - if(iUninstalledApps==NULL) - iUninstalledApps=new(ELeave) CArrayFixFlat(1); - - iUninstalledApps->AppendL(appData->AppEntry().iUidType[2]); - - delete appData; - } - else if (appData->iIsPresent==CApaAppData::ESuperseded) - { - CApaAppData* newApp=NULL; - TApaAppEntry appEntry; - appData->iSuccessor->Get(appEntry); - TRAPD(err,newApp=CApaAppData::NewL(appEntry, iFs)); - if (err==KErrNone) - { - // remove the old one and add the new one in its place - if (prev) - prev->iNext=newApp; - else - iAppData=newApp; - - newApp->iNext = appData->iNext; - delete appData; - // increment the iterator - prev = newApp; - } - } - else - prev=appData; - - appData=next; - } - } EXPORT_C TInt CApaAppList::Count() const /** Gets the count of applications present in the app list. @@ -841,7 +1591,7 @@ specified screen mode. */ { - CApaAppData* appData=iValidFirstAppData; + CApaAppData* appData=iAppData; if(aScreenMode!=KIgnoreScreenMode) { @@ -935,6 +1685,7 @@ return NULL; } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK /** Adds a registration file to the iForcedRegistrations array. @@ -954,6 +1705,7 @@ if(iForcedRegistrations) iForcedRegistrations->Reset(); } +#endif /** Finds the preferred application to handle the specified data type. @@ -1047,7 +1799,19 @@ iObserver->InitialListPopulationComplete(); iValidFirstAppData = iAppData; iFlags|=EFirstScanComplete; + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNNAInstallation = EFalse; +#endif + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + delete iScrAppInfo; + iScrAppInfo=NULL; + iScr.Close(); +#endif +#if _DEBUG + RDebug::Printf("[Apparc] *****************END CREATING APPLIST ****************************"); +#endif } /** @@ -1080,8 +1844,10 @@ if (app) { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK if (!app->RegistrationFileUsed()) User::Leave(KErrNotSupported); +#endif if (app->iServiceArray) { @@ -1111,9 +1877,12 @@ if (app) { + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK if (!app->RegistrationFileUsed()) User::Leave(KErrNotSupported); - +#endif + if (app->iServiceArray) { CArrayFixFlat& serviceArray = *(app->iServiceArray); @@ -1149,8 +1918,10 @@ if (app) { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK if (!app->RegistrationFileUsed()) User::Leave(KErrNotSupported); +#endif if (app->iServiceArray) { @@ -1704,6 +2475,9 @@ { iPrevLanguage = User::Language(); iAppList.iFlags |= CApaAppList::ELangChangePending; +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + iAppList.InitializeLangAppListL(); +#endif iAppList.StartIdleUpdateL(iAppList.iObserver); } } diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/aplist/aplapplist.h --- a/appfw/apparchitecture/aplist/aplapplist.h Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/aplist/aplapplist.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -27,6 +27,12 @@ #include #include +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include +#include +#include +#endif + // classes defined: class CApaAppList; class CApaAppViewData; @@ -34,7 +40,9 @@ class CApaMaskedBitmap; class TEntry; class RFs; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK class CApaAppRegFinder; +#endif class CApaAppIconArray; class CApaIconLoader; class TApaAppEntry; @@ -72,19 +80,26 @@ */ class CApaAppList : public CBase { -public: - IMPORT_C static CApaAppList* NewL(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aTimeoutDelay = 50000); // takes ownership of aAppRegFinder public: + IMPORT_C static CApaAppList* NewL(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aTimeoutDelay = 50000); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK IMPORT_C void PurgeL(); + IMPORT_C CApaAppData* FindAndAddSpecificAppL(CApaAppRegFinder* aFinder, TUid aAppUid); + IMPORT_C void StopScan(TBool aNNAInstall = EFalse); + IMPORT_C void RestartScanL(); + IMPORT_C TBool AppListUpdatePending(); + IMPORT_C void AddForcedRegistrationL(const TDesC& aRegistrationFile); + IMPORT_C void ResetForcedRegistrations(); +#else + IMPORT_C CApaAppData* FindAndAddSpecificAppL(TUid aAppUid); +#endif + IMPORT_C TInt Count() const; IMPORT_C CApaAppData* FirstApp() const; IMPORT_C CApaAppData* FirstApp(TInt aScreenMode) const; IMPORT_C CApaAppData* NextApp(const CApaAppData* aApp) const; IMPORT_C CApaAppData* NextApp(const CApaAppData* aApp, TInt aScreenMode) const; IMPORT_C CApaAppData* AppDataByUid(TUid aAppUid) const; - IMPORT_C void StopScan(TBool aNNAInstall = EFalse); - IMPORT_C void RestartScanL(); - IMPORT_C TBool AppListUpdatePending(); // ER5 IMPORT_C TUid PreferredDataHandlerL(const TDataType& aDataType) const; IMPORT_C void StartIdleUpdateL(); @@ -99,15 +114,12 @@ IMPORT_C CBufFlat* ServiceImplArrayBufferL(TUid aServiceUid, const TDataType& aDataType) const; IMPORT_C CBufFlat* ServiceUidBufferL(TUid aAppUid) const; IMPORT_C CBufFlat* ServiceOpaqueDataBufferL(TUid aAppUid, TUid aServiceUid) const; - IMPORT_C CApaAppData* FindAndAddSpecificAppL(CApaAppRegFinder* aFinder, TUid aAppUid); IMPORT_C TUid PreferredDataHandlerL(const TDataType& aDataType, const TUid* aServiceUid, TInt& aPriority) const; IMPORT_C ~CApaAppList(); // 9.1 IMPORT_C CApaAppData* AppDataByFileName(const TDesC& aFullFileName) const; /*IMPORT_C*/ RFs& ShareProtectedFileServer(); - IMPORT_C void AddForcedRegistrationL(const TDesC& aRegistrationFile); - IMPORT_C void ResetForcedRegistrations(); IMPORT_C TBool IsLanguageChangePending() const; IMPORT_C static CApaAppList* Self(); IMPORT_C CArrayFixFlat* UninstalledAppArray(); @@ -125,6 +137,15 @@ IMPORT_C void AddCustomAppInfoInListL(TUid aAppUid, TLanguage aLanguage, const TDesC& aShortCaption); IMPORT_C void UpdateAppListByShortCaptionL(); IMPORT_C void UpdateAppListByIconCaptionOverridesL(); + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + IMPORT_C void InitializeApplistL(MApaAppListObserver* aObserver); + void InitializeLangAppListL(); + IMPORT_C void UpdateApplistL(MApaAppListObserver* aObserver, RArray* aAppUpdateInfo, TUid aSecureID); + IMPORT_C void UpdateApplistByForceRegAppsL(RPointerArray& aForceRegAppsInfo); + IMPORT_C CArrayFixFlat* UpdatedAppsInfo(); +#endif + private: enum { @@ -134,15 +155,11 @@ ELangChangePending = 0x08 // This flag is used to check if applist update is in progress on language change event. }; private: - CApaAppList(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aIdlePeriodicDelay); - void UpdateNextAppL(const TApaAppEntry& aAppEntry,TBool& aHasChanged); + CApaAppList(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aIdlePeriodicDelay); void AddToList( CApaAppData* aAppData ); - static void SetPending(CApaAppData* aAppData); - static void SetNotFound(CApaAppData* aAppData, TBool& aHasChanged); static TInt IdleUpdateCallbackL(TAny* aObject); TInt IdleUpdateL(); void ScanComplete(); - void UndoSetPending(CApaAppData* aAppData); void StopIdler(); void DeleteAppData(); @@ -154,6 +171,16 @@ void DeleteAppsListBackUpAndTempFiles(); void ScanRemovableDrivesAndUpdateL(); void CreateDefaultAppIconFileNameL(); + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + void UndoSetPending(CApaAppData* aAppData); + static void SetPending(CApaAppData* aAppData); + static void SetNotFound(CApaAppData* aAppData, TBool& aHasChanged); + void UpdateNextAppL(const TApaAppEntry& aAppEntry,TBool& aHasChanged); +#else + TInt FindAndDeleteApp(TUid aAppUid); +#endif + private: // Persistence Layer void RestoreL(); @@ -236,13 +263,18 @@ MApaAppListObserver* iObserver; CApaAppData* iValidFirstAppData; //First valid app data in linked list! TInt iFlags; - CApaAppRegFinder* iAppRegFinder; - TInt iIdlePeriodicDelay; // idle timeout periodic delay + TInt iIdlePeriodicDelay; // idle timeout periodic delay RFs iFsShareProtected; mutable CApaAppIconArray* iDefaultIconArray; mutable TInt iDefaultIconUsageCount; - CDesCArray* iForcedRegistrations; class CApaLangChangeMonitor; //inner class of CApaAppList. + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + class CApaScrAppInfo; +#else + CDesCArray* iForcedRegistrations; +#endif + CApaLangChangeMonitor* iAppLangMonitor; // Active Object used for language change monitoring. RBuf iAppsListCacheFileName; @@ -256,8 +288,17 @@ RPointerArray iCustomAppList; CApaIconCaptionOverrides* iIconCaptionOverrides; CApaIconCaptionCenrepObserver* iIconCaptionObserver; - TBool iNNAInstallation; - CArrayFixFlat* iUninstalledApps; + CArrayFixFlat* iUninstalledApps; + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + Usif::RSoftwareComponentRegistry iScr; + CApaScrAppInfo *iScrAppInfo; + RArray iForceRegAppUids; + CArrayFixFlat* iAppsUpdated; +#else + CApaAppRegFinder* iAppRegFinder; + TBool iNNAInstallation; +#endif private: friend class CApaLangChangeMonitor; diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/aplist/aplapplistitem.cpp --- a/appfw/apparchitecture/aplist/aplapplistitem.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/aplist/aplapplistitem.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -25,6 +25,9 @@ #include "aplappinforeader.h" #include +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include +#endif // Delays in the pseudo idle object that builds the application list // @@ -233,43 +236,196 @@ // Class CApaAppData // -EXPORT_C CApaAppData* CApaAppData::NewL(const TApaAppEntry& aAppEntry, RFs& aFs) - { - CApaAppData* self=new(ELeave) CApaAppData(aFs); - CleanupStack::PushL(self); - self->ConstructL(aAppEntry); - CleanupStack::Pop(); // self - return self; - } +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +CApaAppData::CApaAppData(RFs& aFs) + :iCaption(NULL), iShortCaption(NULL), + iFs(aFs), + iNonMbmIconFile(EFalse), + iApplicationLanguage(ELangNone), iIndexOfFirstOpenService(-1), + iShortCaptionFromResourceFile(NULL) + { + } +EXPORT_C CApaAppData* CApaAppData::NewL(const Usif::CApplicationRegistrationData& aAppInfo, RFs& aFs, const Usif::RSoftwareComponentRegistry& aScrCon) + { + CApaAppData* self=new(ELeave) CApaAppData(aFs); + CleanupStack::PushL(self); + self->ConstructL(aAppInfo, aScrCon); + CleanupStack::Pop(self); // self + return self; + } + +void CApaAppData::ConstructL(const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScrCon) + { + iCapabilityBuf.FillZ(iCapabilityBuf.MaxLength()); + iIcons = CApaAppIconArray::NewL(); + iViewDataArray=new(ELeave) CArrayPtrFlat(1); + iOwnedFileArray=new(ELeave) CDesCArraySeg(1); + User::LeaveIfError(ReadApplicationInformationFromSCRL(aAppInfo, aScrCon)); + } + +//Initializes the CApaAppData object with information read from SCR. Leaves if any error occurs during initialization. + +TInt CApaAppData::ReadApplicationInformationFromSCRL(const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScrCon) + { + HBufC* caption = NULL; + HBufC* shortCaption = NULL; + + CApaAppInfoReader* appInfoReader = NULL; + appInfoReader = CApaAppInfoReader::NewL(iFs, aAppInfo, aScrCon); + CleanupStack::PushL(appInfoReader); + TBool readSuccessful=EFalse; + readSuccessful= appInfoReader->ReadL(); + + iFullName=appInfoReader->AppBinaryFullName(); + + iUidType = appInfoReader->AppBinaryUidType(); + + caption = appInfoReader->Caption(); + shortCaption = appInfoReader->ShortCaption(); + + CApaAppIconArray* icons = appInfoReader->Icons(); + if(icons) + { + delete iIcons; + iIcons = icons; + iIconLoader = appInfoReader->IconLoader(); + } + else + { + TRAPD(err, icons = CApaAppIconArray::NewL()); + if(err == KErrNone) + { + delete iIcons; + iIcons = icons; + } + } + + + iOpaqueData = appInfoReader->OpaqueData(); + + if (readSuccessful) + { + appInfoReader->Capability(iCapabilityBuf); + + iDefaultScreenNumber = appInfoReader->DefaultScreenNumber(); + delete iIconFileName; + iIconFileName = appInfoReader->IconFileName(); + iNonMbmIconFile = appInfoReader->NonMbmIconFile(); + iNumOfAppIcons = appInfoReader->NumOfAppIcons(); + iApplicationLanguage = appInfoReader->AppLanguage(); + + // views + iViewDataArray->ResetAndDestroy(); + CArrayPtrFlat* viewDataArray = appInfoReader->Views(); + if (viewDataArray) + { + delete iViewDataArray; + iViewDataArray = viewDataArray; + + if(!iIconLoader && ViewMbmIconsRequireLoading()) + { + //if VIEW_DATA contains a MBM icon we need to initialize iIconLoader + iIconLoader = appInfoReader->IconLoader(); + } + } + + // owned files + iOwnedFileArray->Reset(); + CDesCArray* const ownedFileArray = appInfoReader->OwnedFiles(); + if (ownedFileArray) + { + delete iOwnedFileArray; + iOwnedFileArray = ownedFileArray; + } + + UpdateServiceArray(appInfoReader->ServiceArray(iIndexOfFirstOpenService)); + } + + CleanupStack::PopAndDestroy(appInfoReader); + + if (!caption) + { + TParsePtrC parse (*iFullName); + caption = parse.Name().Alloc(); + } + + // Put the captions into place + if (caption) + { + if (!shortCaption) + { + shortCaption = caption->Alloc(); + if (!shortCaption) + { + delete caption; + caption = NULL; + } + } + + delete iCaption; + iCaption = caption; + delete iShortCaption; + iShortCaption = shortCaption; + } + + return caption ? KErrNone : KErrNoMemory; + } + + +EXPORT_C TUid CApaAppData::NonNativeApplicationType() const +/** @internalComponent */ + { + if (iCapabilityBuf().iAttributes & TApaAppCapability::ENonNative) + return iUidType[1]; + else + return TUid::Null(); + } + +EXPORT_C TBool CApaAppData::IsLangChangePending() +{ + return iIsLangChangePending; +} + +#else CApaAppData::CApaAppData(RFs& aFs) - :iCaption(NULL), iShortCaption(NULL), - iIsPresent(CApaAppData::EIsPresent), iFs(aFs), - iNonMbmIconFile(EFalse), - iApplicationLanguage(ELangNone), iIndexOfFirstOpenService(-1), - iNonNativeApplicationType(TUid::Null()), - iShortCaptionFromResourceFile(NULL) - { - } + :iCaption(NULL), iShortCaption(NULL), + iIsPresent(CApaAppData::EIsPresent), iFs(aFs), + iNonMbmIconFile(EFalse), + iApplicationLanguage(ELangNone), iIndexOfFirstOpenService(-1), + iNonNativeApplicationType(TUid::Null()), + iShortCaptionFromResourceFile(NULL) + { + } + +EXPORT_C CApaAppData* CApaAppData::NewL(const TApaAppEntry& aAppEntry, RFs& aFs) + { + CApaAppData* self=new(ELeave) CApaAppData(aFs); + CleanupStack::PushL(self); + self->ConstructL(aAppEntry); + CleanupStack::Pop(); // self + return self; + } void CApaAppData::ConstructL(const TApaAppEntry& aAppEntry) - { - iUidType = aAppEntry.iUidType; // if the 2nd UID is KUidAppRegistrationFile, iUidType will be updated in ReadApplicationInformationFromResourceFiles() to reflect the TUidType for the application binary - if (ApaUtils::TypeUidIsForRegistrationFile(aAppEntry.iUidType)) - { - iRegistrationFile = aAppEntry.iFullName.AllocL(); - } - else - { - iFullName = aAppEntry.iFullName.AllocL(); - } + { + iUidType = aAppEntry.iUidType; // if the 2nd UID is KUidAppRegistrationFile, iUidType will be updated in ReadApplicationInformationFromResourceFiles() to reflect the TUidType for the application binary - iCapabilityBuf.FillZ(iCapabilityBuf.MaxLength()); - iIcons = CApaAppIconArray::NewL(); - iViewDataArray=new(ELeave) CArrayPtrFlat(1); - iOwnedFileArray=new(ELeave) CDesCArraySeg(1); - User::LeaveIfError(ReadApplicationInformationFromResourceFiles()); - } + if (ApaUtils::TypeUidIsForRegistrationFile(aAppEntry.iUidType)) + { + iRegistrationFile = aAppEntry.iFullName.AllocL(); + } + else + { + iFullName = aAppEntry.iFullName.AllocL(); + } + + iCapabilityBuf.FillZ(iCapabilityBuf.MaxLength()); + iIcons = CApaAppIconArray::NewL(); + iViewDataArray=new(ELeave) CArrayPtrFlat(1); + iOwnedFileArray=new(ELeave) CDesCArraySeg(1); + User::LeaveIfError(ReadApplicationInformationFromResourceFiles()); + } // Return a standard error code // The value returned only reflect the caption status @@ -281,172 +437,330 @@ // 2. Be very careful in this method, because it can be called on a newly constructed object, // or on an existing object, so don't assume member data pointers will be NULL TInt CApaAppData::ReadApplicationInformationFromResourceFiles() - { - HBufC* caption = NULL; - HBufC* shortCaption = NULL; + { + HBufC* caption = NULL; + HBufC* shortCaption = NULL; + + iTimeStamp = TTime(0); // cannot init in constructor because this function can be called on an existing CApaAppData object - iTimeStamp = TTime(0); // cannot init in constructor because this function can be called on an existing CApaAppData object + if(iRegistrationFile) + { + CApaAppInfoReader* appInfoReader = NULL; + TRAP_IGNORE(appInfoReader = CApaAppInfoReader::NewL(iFs, *iRegistrationFile, iUidType[2])); + if (!appInfoReader) + { + if (!iFullName) + { + // assume that if iFullName is NULL, this method has been called as part + // of constructing a new app data object. The CApaAppInfoReader derived object + // could not be created, therefore we have no way to determine the full filename + // of the app binary, so give up + return KErrNoMemory; + } + } + else + { + TBool readSuccessful=EFalse; + TRAP_IGNORE(readSuccessful= appInfoReader->ReadL()); - if(iRegistrationFile) - { - CApaAppInfoReader* appInfoReader = NULL; - TRAP_IGNORE(appInfoReader = CApaAppInfoReader::NewL(iFs, *iRegistrationFile, iUidType[2])); - if (!appInfoReader) - { - if (!iFullName) - { - // assume that if iFullName is NULL, this method has been called as part - // of constructing a new app data object. The CApaAppInfoReader derived object - // could not be created, therefore we have no way to determine the full filename - // of the app binary, so give up - return KErrNoMemory; - } - } - else - { - TBool readSuccessful=EFalse; - TRAP_IGNORE(readSuccessful= appInfoReader->ReadL()); + HBufC* const appBinaryFullName = appInfoReader->AppBinaryFullName(); + if (appBinaryFullName) + { + delete iFullName; + iFullName = appBinaryFullName; + } + + if (!iFullName) + { + delete appInfoReader; + return KErrNoMemory; + } + + // if this object has just been constructed, iUidType is currently the TUidType + // of the registration file, it should be the TUidType of the app binary file + TUidType uidType = appInfoReader->AppBinaryUidType(); + if (uidType[1].iUid != KNullUid.iUid) + iUidType = uidType; + + // must get captions regardless of value of readSuccessful, + // because the V1 reader might have read captions + // this is done to maintain behavioural compatibility with V1 + caption = appInfoReader->Caption(); + shortCaption = appInfoReader->ShortCaption(); + + CApaAppIconArray* icons = appInfoReader->Icons(); + if(icons) + { + delete iIcons; + iIcons = icons; + iIconLoader = appInfoReader->IconLoader(); + } + else + { + TRAPD(err, icons = CApaAppIconArray::NewL()); + if(err == KErrNone) + { + delete iIcons; + iIcons = icons; + } + } + + iTimeStamp = appInfoReader->TimeStamp(); + delete iLocalisableResourceFileName; + iLocalisableResourceFileName = appInfoReader->LocalisableResourceFileName(); + iLocalisableResourceFileTimeStamp = appInfoReader->LocalisableResourceFileTimeStamp(); - HBufC* const appBinaryFullName = appInfoReader->AppBinaryFullName(); - if (appBinaryFullName) - { - delete iFullName; - iFullName = appBinaryFullName; - } - - if (!iFullName) - { - delete appInfoReader; - return KErrNoMemory; - } - - // if this object has just been constructed, iUidType is currently the TUidType - // of the registration file, it should be the TUidType of the app binary file - TUidType uidType = appInfoReader->AppBinaryUidType(); - if (uidType[1].iUid != KNullUid.iUid) - iUidType = uidType; + const TBool isNonNativeApp = + (TParsePtrC(*iRegistrationFile).Path().CompareF(KLitPathForNonNativeResourceAndIconFiles) == 0); + + if (isNonNativeApp) + { + // In the case of a non-native app, the resource file has been prefixed with a + // TCheckedUid, the second of whose UIDs is the non-native application type uid. + TEntry entry; + const TInt error=iFs.Entry(*iRegistrationFile, entry); + if (error!=KErrNone) + { + delete appInfoReader; + return error; + } + + __ASSERT_DEBUG(entry.iType[0].iUid==KUidPrefixedNonNativeRegistrationResourceFile, Panic(EPanicUnexpectedUid)); + iNonNativeApplicationType=entry.iType[1]; + } + + delete iOpaqueData; + iOpaqueData = appInfoReader->OpaqueData(); + + if (readSuccessful) + { + appInfoReader->Capability(iCapabilityBuf); + + iDefaultScreenNumber = appInfoReader->DefaultScreenNumber(); - // must get captions regardless of value of readSuccessful, - // because the V1 reader might have read captions - // this is done to maintain behavioural compatibility with V1 - caption = appInfoReader->Caption(); - shortCaption = appInfoReader->ShortCaption(); + delete iIconFileName; + iIconFileName = appInfoReader->IconFileName(); + iIconFileTimeStamp = appInfoReader->IconFileTimeStamp(); + iNonMbmIconFile = appInfoReader->NonMbmIconFile(); + iNumOfAppIcons = appInfoReader->NumOfAppIcons(); + iApplicationLanguage = appInfoReader->AppLanguage(); + + // views + iViewDataArray->ResetAndDestroy(); + CArrayPtrFlat* viewDataArray = appInfoReader->Views(); + if (viewDataArray) + { + delete iViewDataArray; + iViewDataArray = viewDataArray; + + if(!iIconLoader && ViewMbmIconsRequireLoading()) + { + //if VIEW_DATA contains a MBM icon we need to initialize iIconLoader + iIconLoader = appInfoReader->IconLoader(); + } + } - CApaAppIconArray* icons = appInfoReader->Icons(); - if(icons) - { - delete iIcons; - iIcons = icons; - iIconLoader = appInfoReader->IconLoader(); - } - else - { - TRAPD(err, icons = CApaAppIconArray::NewL()); - if(err == KErrNone) - { - delete iIcons; - iIcons = icons; - } - } - - iTimeStamp = appInfoReader->TimeStamp(); - delete iLocalisableResourceFileName; - iLocalisableResourceFileName = appInfoReader->LocalisableResourceFileName(); - iLocalisableResourceFileTimeStamp = appInfoReader->LocalisableResourceFileTimeStamp(); + // owned files + iOwnedFileArray->Reset(); + CDesCArray* const ownedFileArray = appInfoReader->OwnedFiles(); + if (ownedFileArray) + { + delete iOwnedFileArray; + iOwnedFileArray = ownedFileArray; + } + + UpdateServiceArray(appInfoReader->ServiceArray(iIndexOfFirstOpenService)); + } + + delete appInfoReader; + } + } + + if (!caption) + { + TParsePtrC parse (*iFullName); + caption = parse.Name().Alloc(); + } + + // Put the captions into place + if (caption) + { + if (!shortCaption) + { + shortCaption = caption->Alloc(); + if (!shortCaption) + { + delete caption; + caption = NULL; + } + } - const TBool isNonNativeApp = - (TParsePtrC(*iRegistrationFile).Path().CompareF(KLitPathForNonNativeResourceAndIconFiles) == 0); - - if (isNonNativeApp) - { - // In the case of a non-native app, the resource file has been prefixed with a - // TCheckedUid, the second of whose UIDs is the non-native application type uid. - TEntry entry; - const TInt error=iFs.Entry(*iRegistrationFile, entry); - if (error!=KErrNone) - { - delete appInfoReader; - return error; - } - - __ASSERT_DEBUG(entry.iType[0].iUid==KUidPrefixedNonNativeRegistrationResourceFile, Panic(EPanicUnexpectedUid)); - iNonNativeApplicationType=entry.iType[1]; - } + delete iCaption; + iCaption = caption; + delete iShortCaption; + iShortCaption = shortCaption; + } + + return caption ? KErrNone : KErrNoMemory; + } + + +/** Returns true if app info was provided by a registration file + +@return true if app info was provided by a registration file +*/ +EXPORT_C TBool CApaAppData::RegistrationFileUsed() const + { + return iRegistrationFile != NULL; + } + +/** Returns the full filename of the registration resource file - delete iOpaqueData; - iOpaqueData = appInfoReader->OpaqueData(); +@return The full path and filename of the registration resource file. +@internalTechnology +*/ +EXPORT_C TPtrC CApaAppData::RegistrationFileName() const + { + if (iRegistrationFile) + { + return *iRegistrationFile; + } + else + { + return TPtrC(KNullDesC); + } + } + + +/** Returns the full filename of the localisable resource file - if (readSuccessful) - { - appInfoReader->Capability(iCapabilityBuf); +@return The full path and filename of the localisable resource file. +@internalTechnology +*/ +EXPORT_C TPtrC CApaAppData::LocalisableResourceFileName() const + { + if (iLocalisableResourceFileName) + { + return *iLocalisableResourceFileName; + } + else + { + return TPtrC(KNullDesC); + } + } - iDefaultScreenNumber = appInfoReader->DefaultScreenNumber(); + +TBool CApaAppData::Update() +// returns true if changes were made to the cached data + { + __APA_PROFILE_START(17); + TBool changed=EFalse; - delete iIconFileName; - iIconFileName = appInfoReader->IconFileName(); - iIconFileTimeStamp = appInfoReader->IconFileTimeStamp(); - iNonMbmIconFile = appInfoReader->NonMbmIconFile(); - iNumOfAppIcons = appInfoReader->NumOfAppIcons(); - iApplicationLanguage = appInfoReader->AppLanguage(); - - // views - iViewDataArray->ResetAndDestroy(); - CArrayPtrFlat* viewDataArray = appInfoReader->Views(); - if (viewDataArray) - { - delete iViewDataArray; - iViewDataArray = viewDataArray; - - if(!iIconLoader && ViewMbmIconsRequireLoading()) - { - //if VIEW_DATA contains a MBM icon we need to initialize iIconLoader - iIconLoader = appInfoReader->IconLoader(); - } - } + // Get app info file entry + TEntry entry; + TInt ret; + if (iRegistrationFile != NULL) + { + ret = iFs.Entry(*iRegistrationFile, entry); + if (ret==KErrNone && entry.iModified!=iTimeStamp) + { + // assume registration file may have changed + changed = ETrue; + } + else + { + if (iLocalisableResourceFileName) + { + // see if localisable resource information might have changed + TParse parse; + ret = parse.SetNoWild(KAppResourceFileExtension, iLocalisableResourceFileName, NULL); + if (ret == KErrNone) + { + TFileName resourceFileName(parse.FullName()); + TLanguage language; + BaflUtils::NearestLanguageFileV2(iFs, resourceFileName, language); + (void)language; + if (resourceFileName.CompareF(*iLocalisableResourceFileName)!=0) + { + changed = ETrue; + } + else + { + ret = iFs.Entry(*iLocalisableResourceFileName, entry); + if ((ret==KErrNotFound && iLocalisableResourceFileTimeStamp!=TTime(0)) || + (ret==KErrNone && entry.iModified!=iLocalisableResourceFileTimeStamp)) + { + changed = ETrue; + } + } + } + } + } + } + if (changed) + { + // re-read data + // Ignore result, nothing we can do in case failure + // and the old values should be preserved + const TInt ignore = ReadApplicationInformationFromResourceFiles(); + } //lint !e529 Symbol 'ignore' not subsequently referenced + + else + { + if (iIconFileName) + { + ret = iFs.Entry(*iIconFileName, entry); + // See if the icon file has been "modified" + // It could have been replaced with a differnt version, deleted or added + // if the icon file specified in the resource was missing + if ((ret==KErrNotFound && iIconFileTimeStamp!=TTime(0)) || + (ret==KErrNone && entry.iModified!=iIconFileTimeStamp)) + { + // Assume the icon file has changed + iIconFileTimeStamp = entry.iModified; + changed = ETrue; + } + } + } - // owned files - iOwnedFileArray->Reset(); - CDesCArray* const ownedFileArray = appInfoReader->OwnedFiles(); - if (ownedFileArray) - { - delete iOwnedFileArray; - iOwnedFileArray = ownedFileArray; - } - - UpdateServiceArray(appInfoReader->ServiceArray(iIndexOfFirstOpenService)); - } + __APA_PROFILE_END(17); + return changed; + } - delete appInfoReader; - } - } - - if (!caption) - { - TParsePtrC parse (*iFullName); - caption = parse.Name().Alloc(); - } +EXPORT_C TBool CApaAppData::IsPending() const +/* Returns true if the app info is not yet updated by the current scan. */ + { + return (iIsPresent==CApaAppData::EPresentPendingUpdate + || iIsPresent==CApaAppData::ENotPresentPendingUpdate); + } + +EXPORT_C TUid CApaAppData::NonNativeApplicationType() const +/** @internalComponent */ + { + return iNonNativeApplicationType; + } - // Put the captions into place - if (caption) - { - if (!shortCaption) - { - shortCaption = caption->Alloc(); - if (!shortCaption) - { - delete caption; - caption = NULL; - } - } +void CApaAppData::SetAppPending() + { + if (iIsPresent == CApaAppData::ENotPresent + || iIsPresent == CApaAppData::ENotPresentPendingUpdate) + { + iIsPresent = CApaAppData::ENotPresentPendingUpdate; + } + else + { + iIsPresent = CApaAppData::EPresentPendingUpdate; + } + } +#endif - delete iCaption; - iCaption = caption; - delete iShortCaption; - iShortCaption = shortCaption; - } +EXPORT_C TApaAppEntry CApaAppData::AppEntry() const +/** Constructs an application entry based on this object. - return caption ? KErrNone : KErrNoMemory; - } +@return The application entry. */ + { + return TApaAppEntry(iUidType,*iFullName); + } EXPORT_C CApaAppData::~CApaAppData() // Just delete components, NOT iNext (next CApaAppData in the list). @@ -465,17 +779,20 @@ } delete iOwnedFileArray; delete iIconFileName; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK delete iLocalisableResourceFileName; + delete iRegistrationFile; +#endif if (iServiceArray) { CleanupServiceArray(iServiceArray); iServiceArray = NULL; } delete iOpaqueData; - delete iRegistrationFile; iNext = NULL; } + void CApaAppData::UpdateServiceArray(CArrayFixFlat* aNewServiceArray) { // clear out any existing service info @@ -576,14 +893,6 @@ return iIcons->IconSizesL(); } -EXPORT_C TApaAppEntry CApaAppData::AppEntry() const -/** Constructs an application entry based on this object. - -@return The application entry. */ - { - return TApaAppEntry(iUidType,*iFullName); - } - EXPORT_C void CApaAppData::Capability(TDes8& aCapabilityBuf)const /** Gets the application's capabilities. @@ -614,82 +923,6 @@ return iOwnedFileArray; } -TBool CApaAppData::Update() -// returns true if changes were made to the cached data - { - __APA_PROFILE_START(17); - TBool changed=EFalse; - - // Get app info file entry - TEntry entry; - TInt ret; - if (iRegistrationFile != NULL) - { - ret = iFs.Entry(*iRegistrationFile, entry); - if (ret==KErrNone && entry.iModified!=iTimeStamp) - { - // assume registration file may have changed - changed = ETrue; - } - else - { - if (iLocalisableResourceFileName) - { - // see if localisable resource information might have changed - TParse parse; - ret = parse.SetNoWild(KAppResourceFileExtension, iLocalisableResourceFileName, NULL); - if (ret == KErrNone) - { - TFileName resourceFileName(parse.FullName()); - TLanguage language; - BaflUtils::NearestLanguageFileV2(iFs, resourceFileName, language); - (void)language; - if (resourceFileName.CompareF(*iLocalisableResourceFileName)!=0) - { - changed = ETrue; - } - else - { - ret = iFs.Entry(*iLocalisableResourceFileName, entry); - if ((ret==KErrNotFound && iLocalisableResourceFileTimeStamp!=TTime(0)) || - (ret==KErrNone && entry.iModified!=iLocalisableResourceFileTimeStamp)) - { - changed = ETrue; - } - } - } - } - } - } - if (changed) - { - // re-read data - // Ignore result, nothing we can do in case failure - // and the old values should be preserved - const TInt ignore = ReadApplicationInformationFromResourceFiles(); - } //lint !e529 Symbol 'ignore' not subsequently referenced - - else - { - if (iIconFileName) - { - ret = iFs.Entry(*iIconFileName, entry); - // See if the icon file has been "modified" - // It could have been replaced with a differnt version, deleted or added - // if the icon file specified in the resource was missing - if ((ret==KErrNotFound && iIconFileTimeStamp!=TTime(0)) || - (ret==KErrNone && entry.iModified!=iIconFileTimeStamp)) - { - // Assume the icon file has changed - iIconFileTimeStamp = entry.iModified; - changed = ETrue; - } - } - } - - __APA_PROFILE_END(17); - return changed; - } EXPORT_C TDataTypePriority CApaAppData::DataType(const TDataType& aDataType) const // returns the priority of the data type @@ -719,12 +952,6 @@ } -EXPORT_C TBool CApaAppData::IsPending() const -/* Returns true if the app info is not yet updated by the current scan. */ - { - return (iIsPresent==CApaAppData::EPresentPendingUpdate - || iIsPresent==CApaAppData::ENotPresentPendingUpdate); - } EXPORT_C TBool CApaAppData::CanUseScreenMode(TInt aScreenMode) /** Tests whether the specified screen mode is valid for any of @@ -775,51 +1002,6 @@ return iDefaultScreenNumber; } -/** Returns true if app info was provided by a registration file - -@return true if app info was provided by a registration file -*/ -EXPORT_C TBool CApaAppData::RegistrationFileUsed() const - { - return iRegistrationFile != NULL; - } - -/** Returns the full filename of the registration resource file - -@return The full path and filename of the registration resource file. -@internalTechnology -*/ -EXPORT_C TPtrC CApaAppData::RegistrationFileName() const - { - if (iRegistrationFile) - { - return *iRegistrationFile; - } - else - { - return TPtrC(KNullDesC); - } - } - - -/** Returns the full filename of the localisable resource file - -@return The full path and filename of the localisable resource file. -@internalTechnology -*/ -EXPORT_C TPtrC CApaAppData::LocalisableResourceFileName() const - { - if (iLocalisableResourceFileName) - { - return *iLocalisableResourceFileName; - } - else - { - return TPtrC(KNullDesC); - } - } - - /** Returns the non-native application opaque data @return The non-native application opaque data. @@ -837,11 +1019,6 @@ } } -EXPORT_C TUid CApaAppData::NonNativeApplicationType() const -/** @internalComponent */ - { - return iNonNativeApplicationType; - } /** Returns the full filename of the file containing application icons @@ -991,7 +1168,9 @@ iIconFileNameFromResourceFile = iIconFileName; iIconFileName = NULL; iNonMbmIconFileFromResourceFile = iNonMbmIconFile; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iIconFileTimeStampFromResourceFile = iIconFileTimeStamp; +#endif } iNonMbmIconFile = !CApaAppInfoReader::FileIsMbmWithGenericExtensionL(aFileName); @@ -1025,29 +1204,19 @@ } } -void CApaAppData::SetAppPending() - { - if (iIsPresent == CApaAppData::ENotPresent - || iIsPresent == CApaAppData::ENotPresentPendingUpdate) - { - iIsPresent = CApaAppData::ENotPresentPendingUpdate; - } - else - { - iIsPresent = CApaAppData::EPresentPendingUpdate; - } - } - void CApaAppData::InternalizeL(RReadStream& aReadStream) /** Internalizes the appdata from the AppsList.bin file */ { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK TUint highTime = aReadStream.ReadUint32L(); TUint lowTime = aReadStream.ReadUint32L(); iTimeStamp = TTime(MAKE_TINT64(highTime, lowTime)); - + highTime = aReadStream.ReadUint32L(); lowTime = aReadStream.ReadUint32L(); iIconFileTimeStamp = TTime(MAKE_TINT64(highTime, lowTime)); +#endif + iCaption = HBufC::NewL(aReadStream, KMaxFileName); // Caption iShortCaption = HBufC::NewL(aReadStream, KMaxFileName); // Shortcaption iFullName = HBufC::NewL(aReadStream, KMaxFileName); // Filename of application binary @@ -1061,7 +1230,9 @@ iUidType = TUidType(uid1, uid2, uid3); // Application UID aReadStream >> iCapabilityBuf; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iRegistrationFile = HBufC::NewL(aReadStream, KMaxFileName); // Registration Filename +#endif iDefaultScreenNumber = aReadStream.ReadUint32L(); // Default Screen number iNumOfAppIcons = aReadStream.ReadInt32L(); // No. of icons iNonMbmIconFile = aReadStream.ReadUint32L(); @@ -1092,6 +1263,7 @@ TRAP_IGNORE(iIcons = CApaAppIconArray::NewDefaultIconsL()); // Creates and Loads Default Icons. } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK HBufC* localisableResourceFileName = HBufC::NewL(aReadStream, KMaxFileName); // Registration Filename if (*localisableResourceFileName != KNullDesC) iLocalisableResourceFileName = localisableResourceFileName; @@ -1101,10 +1273,13 @@ highTime = aReadStream.ReadUint32L(); lowTime = aReadStream.ReadUint32L(); iLocalisableResourceFileTimeStamp = TTime(MAKE_TINT64(highTime, lowTime)); // Localisable file timestamp - +#endif + iApplicationLanguage = (TLanguage)aReadStream.ReadInt32L(); // Application Language iIndexOfFirstOpenService = aReadStream.ReadUint32L(); // Index of first open service +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNonNativeApplicationType.iUid = aReadStream.ReadUint32L(); +#endif HBufC8* opaqueData = HBufC8::NewL(aReadStream, KMaxFileName); // Opaque Data if (*opaqueData != KNullDesC8) @@ -1203,12 +1378,10 @@ void CApaAppData::ExternalizeL(RWriteStream& aWriteStream) const { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK aWriteStream.WriteUint32L(I64HIGH(iTimeStamp.Int64())); aWriteStream.WriteUint32L(I64LOW(iTimeStamp.Int64())); - aWriteStream.WriteUint32L(I64HIGH(iIconFileTimeStamp.Int64())); - aWriteStream.WriteUint32L(I64LOW(iIconFileTimeStamp.Int64())); - aWriteStream << *iCaption; // Caption if (iIconFileNameFromResourceFile) { aWriteStream.WriteUint32L(I64HIGH(iIconFileTimeStampFromResourceFile.Int64())); @@ -1219,6 +1392,7 @@ aWriteStream.WriteUint32L(I64HIGH(iIconFileTimeStamp.Int64())); aWriteStream.WriteUint32L(I64LOW(iIconFileTimeStamp.Int64())); } +#endif if (iCaptionFromResourceFile) // Caption present in the resource file would be externalized if the one in applist has dynamically changed { @@ -1241,7 +1415,9 @@ aWriteStream << iUidType[i]; // Uid Type aWriteStream << iCapabilityBuf; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK aWriteStream << RegistrationFileName(); // Registration filename +#endif aWriteStream.WriteUint32L(iDefaultScreenNumber); // Default screen number if (iIconFileNameFromResourceFile) @@ -1256,17 +1432,20 @@ aWriteStream.WriteUint32L(iNonMbmIconFile); aWriteStream << IconFileName(); } - +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK aWriteStream << LocalisableResourceFileName(); aWriteStream.WriteUint32L(I64HIGH(iLocalisableResourceFileTimeStamp.Int64())); aWriteStream.WriteUint32L(I64LOW(iLocalisableResourceFileTimeStamp.Int64())); +#endif aWriteStream.WriteInt32L(iApplicationLanguage); aWriteStream.WriteUint32L(iIndexOfFirstOpenService); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK aWriteStream.WriteUint32L(iNonNativeApplicationType.iUid); +#endif aWriteStream << OpaqueData(); diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/aplist/aplapplistitem.h --- a/appfw/apparchitecture/aplist/aplapplistitem.h Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/aplist/aplapplistitem.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -29,6 +29,13 @@ #include #include +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include +#include +#endif + + + // classes defined: class CApaAppData; class CApaAppList; @@ -94,15 +101,25 @@ */ class CApaAppData : public CBase { -public: - IMPORT_C static CApaAppData* NewL(const TApaAppEntry& aAppEntry, RFs& aFs); +public: +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + IMPORT_C static CApaAppData* NewL(const Usif::CApplicationRegistrationData& aAppInfo, RFs& aFs, const Usif::RSoftwareComponentRegistry& aScrCon); + IMPORT_C TBool IsLangChangePending(); +#else + IMPORT_C static CApaAppData* NewL(const TApaAppEntry& aAppEntry, RFs& aFs); + inline TBool IsPresent() const; + IMPORT_C TBool RegistrationFileUsed() const; + IMPORT_C TPtrC RegistrationFileName() const; + IMPORT_C TBool IsPending()const; + IMPORT_C TPtrC LocalisableResourceFileName() const; +#endif + IMPORT_C ~CApaAppData(); IMPORT_C TApaAppEntry AppEntry() const; inline TPtrC Caption() const; inline TPtrC ShortCaption() const; IMPORT_C CApaMaskedBitmap* Icon(TInt aIconIndex) const; IMPORT_C void Capability(TDes8& aCapabilityBuf)const; - inline TBool IsPresent() const; // ER5 IMPORT_C TDataTypePriority DataType(const TDataType& aDataType) const; // ER6 @@ -116,22 +133,17 @@ IMPORT_C void GetIconInfo(TInt& aIconCount, TInt& aDefaultIconsUsed) const; // 8.1 IMPORT_C TUint DefaultScreenNumber() const; - IMPORT_C TBool RegistrationFileUsed() const; IMPORT_C TPtrC IconFileName() const; IMPORT_C TBool NonMbmIconFile() const; - // 9.0 IMPORT_C TBool ImplementsService(TUid aServiceUid) const; TInt ImplementsServiceWithDataType(TUid aServiceUid, const TDataType& aDataType) const; // 9.1 IMPORT_C TLanguage ApplicationLanguage() const; - IMPORT_C TPtrC RegistrationFileName() const; IMPORT_C TPtrC8 OpaqueData() const; - IMPORT_C TUid NonNativeApplicationType() const; - IMPORT_C TPtrC LocalisableResourceFileName() const; + IMPORT_C TUid NonNativeApplicationType() const; IMPORT_C void SetShortCaptionL(const TDesC& aShortCaption); - IMPORT_C TBool IsPending()const; // 9.5 IMPORT_C void SetCaptionL(const TDesC& aCaption); IMPORT_C void SetIconsL(const TDesC& aFileName, TInt aNumIcons); @@ -142,15 +154,21 @@ inline CApaAppData* Next() const; private: CApaAppData(RFs& aFs); - TBool Update(); - void SetAppPending(); - - void ConstructL(const TApaAppEntry& aAppEntry); - TInt ReadApplicationInformationFromResourceFiles(); void UpdateServiceArray(CArrayFixFlat* aNewServiceArray); TDataTypePriority DataType(const TDataType& aDataType, const CArrayFixFlat& aDataTypeArray) const; void InternalizeL(RReadStream& aReadStream); TBool ViewMbmIconsRequireLoading() const; + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + void ConstructL(const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScrCon); + TInt ReadApplicationInformationFromSCRL(const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScrCon); +#else + TBool Update(); + void SetAppPending(); + void ConstructL(const TApaAppEntry& aAppEntry); + TInt ReadApplicationInformationFromResourceFiles(); +#endif + private: enum { ENotPresent, ENotPresentPendingUpdate, EPresentPendingUpdate, EIsPresent, ESuperseded }; private: @@ -158,35 +176,43 @@ HBufC* iCaption; HBufC* iShortCaption; HBufC* iFullName; // filename of application binary - TInt iIsPresent; // uses enum - TUidType iUidType; + TUid iUid; + TUidType iUidType; CApaAppData* iNext; TApaAppCapabilityBuf iCapabilityBuf; CApaAppEntry* iSuccessor; - TTime iTimeStamp; CArrayPtrFlat* iViewDataArray; CDesCArray* iOwnedFileArray; RFs& iFs; - HBufC* iRegistrationFile; TUint iDefaultScreenNumber; HBufC* iIconFileName; TBool iNonMbmIconFile; - HBufC* iLocalisableResourceFileName; - TTime iLocalisableResourceFileTimeStamp; - TTime iIconFileTimeStamp; TLanguage iApplicationLanguage; CArrayFixFlat* iServiceArray; TInt iIndexOfFirstOpenService; - TUid iNonNativeApplicationType; HBufC8* iOpaqueData; TInt iNumOfAppIcons; TInt iNumOfAppIconsFromResourceFile; HBufC* iIconFileNameFromResourceFile; // Icon file name as found in the localisable resource file TBool iNonMbmIconFileFromResourceFile; // A Flag that tells whether the icon in resource file is non MBM file format - TTime iIconFileTimeStampFromResourceFile; HBufC* iShortCaptionFromResourceFile; // Short Caption as found in the localisable resource file HBufC* iCaptionFromResourceFile; // Caption as found in the localisable resource file CApaIconLoader* iIconLoader; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + TInt iIsPresent; // uses enum + TTime iTimeStamp; + HBufC* iRegistrationFile; + HBufC* iLocalisableResourceFileName; + TTime iLocalisableResourceFileTimeStamp; + TTime iIconFileTimeStamp; + TUid iNonNativeApplicationType; + TTime iIconFileTimeStampFromResourceFile; +#endif + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + TBool iIsLangChangePending; +#endif + private: friend class CApaAppList; }; @@ -249,11 +275,13 @@ inline TPtrC CApaAppData::ShortCaption() const { return *iShortCaption; } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK /** Tests whether the application is present or not on the device. @return True if application exists, else false. */ inline TBool CApaAppData::IsPresent() const { return iIsPresent; } +#endif /** Gets the Next Appdata in the list diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/aplist/aplappregfinder.cpp --- a/appfw/apparchitecture/aplist/aplappregfinder.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/aplist/aplappregfinder.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -187,8 +187,13 @@ const TDriveName driveName = currentDrive.iUnit.Name(); regFileNameParser.Set(entry.iName, &appFolderOnDrive, &driveName); - // If the appliation is located on a removable drive... - if (currentDrive.iAttribs&KDriveAttRemovable) + // Apparc will call sidchecker to verify if an application is a valid registered application. + // Apparc will call sidchecker in the following conditions + // 1. If the current drive is a removable drive + // 2. If the current drive is not + // a) an internal read-only drive + // b) the system drive + if(currentDrive.iAttribs&KDriveAttRemovable || ((currentDrive.iUnit != iFs.GetSystemDrive()) && (currentDrive.iAttribs&KDriveAttInternal) && !(currentDrive.iAttribs&KDriveAttRom))) { // ...then verify that there is a valid Secure ID (SID) for the appliation // to protect against untrusted applications. diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/aplist/distribution.policy.s60 --- a/appfw/apparchitecture/aplist/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apparc/distribution.policy.s60 --- a/appfw/apparchitecture/apparc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apserv/APSCLSV.H --- a/appfw/apparchitecture/apserv/APSCLSV.H Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/apserv/APSCLSV.H Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -126,6 +126,8 @@ EDebugAddFailingNonNativeApplicationsUpdate, EDebugAddPanicingNonNativeApplicationsUpdate, EDebugAddRollbackPanicingNonNativeApplicationsUpdate, // = 89 + EAppListServUpdateAppList, + EAppListUpdatedAppsInfo, EAppListServAppInfoProvidedByRegistrationFile = 99, // = 99 //WriteDeviceData Capability requirement // ER5 diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apserv/APSSERV.CPP --- a/appfw/apparchitecture/apserv/APSSERV.CPP Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/apserv/APSSERV.CPP Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -26,24 +26,38 @@ #include "APFREC.H" #include "APSSES.H" #include "APSSTD.H" -#include "../aplist/aplappregfinder.h" #include "../aplist/aplapplistitem.h" #include "APSSCAN.H" #include "APSSTD.H" #include "APASVST.H" #include #include "APSRECCACHE.h" -#include "apsnnapps.h" -#include "../apfile/apinstallationmonitor.h" #include "../apgrfx/apprivate.h" #include "apgnotif.h" +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include +#include +#include +#else +#include "../aplist/aplappregfinder.h" +#include "apsnnapps.h" +#include "../apfile/apinstallationmonitor.h" +#endif + + _LIT(KAppArcServerSemaphore,"AppArcServerSemaphore"); _LIT(KAppArcServerThread,"AppArcServerThread"); + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK _LIT(KAppRegistrationFileImportLocation, "?:\\private\\10003a3f\\import\\apps\\"); _LIT(KAppResourceAppsLocation, "?:\\resource\\apps\\"); _LIT(KNonNativeApplicationTypeRegistry, ":\\private\\10003a3f\\NonNativeTypes.dat"); +//To monitor all drives. +const TInt KApaMonitorAllDrives = 0x3FFFFFF; +#endif + /* * patchable const data values defined in ApsConstData.cpp */ @@ -55,9 +69,6 @@ const TUint8 KPolicyElementWriteDeviceData = 0; -//To monitor all drives. -const TInt KApaMonitorAllDrives = 0x3FFFFFF; - const TUint KRangeCount = 3; const TInt KAppListServRanges[KRangeCount] = @@ -139,8 +150,10 @@ iAppList(0), iTypeStoreModified(0), iLoadRecognizersOnDemand(KApaLoadDataRecognizersOnDemand), - iLoadMbmIconsOnDemand(KApaLoadMbmIconsOnDemand), - iForceRegistrationStatus(EForceRegistrationNone) +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + iForceRegistrationStatus(EForceRegistrationNone), +#endif + iLoadMbmIconsOnDemand(KApaLoadMbmIconsOnDemand) { #ifdef __WINS__ @@ -163,7 +176,16 @@ StartL(KAppListServerName); User::LeaveIfError(Dll::SetTls(this)); User::LeaveIfError(iFs.Connect()); - + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + //Connect to sisregistrysession to initially populate the applications information and + //store it to SCR. + Swi::RSisRegistrySession sisReg; + sisReg.Connect(); + sisReg.Close(); +#endif + + // Get the idle timeout delay from the commandline if specified. The default is 50000ms const TInt cmdLineLen = User::CommandLineLength(); TInt idlePeriodicDelay=50000; //default value @@ -226,12 +248,15 @@ iAppList=CApaAppList::NewL(iFs, iLoadMbmIconsOnDemand, idlePeriodicDelay); // takes ownership of scanner +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK // If the phone rebooted halfway through processing updates, there will be a log file left // look for one and recover if neccessary CApsNonNativeApplicationsManager::RecoverFromUpdateLogL(iFs); +#endif iMimeTypeRecognizer=CApaScanningDataRecognizer::NewL(iFs, !iLoadRecognizersOnDemand); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK ConstructPathsToMonitorL(); if ( iAppFsMonitor ) @@ -239,6 +264,8 @@ iAppFsMonitor->Start(ENotifyFile); iAppFsMonitor->SetBlocked(ETrue); } +#endif + TRAP_IGNORE(iAppList->InitListL(this)); // @@ -260,22 +287,29 @@ iBaBackupSessionWrapper=CBaBackupSessionWrapper::NewL(); iBaBackupSessionWrapper->RegisterBackupOperationObserverL(*((MBackupOperationObserver*)this)); - // - TChar sysDrive = RFs::GetSystemDriveChar(); - TInt maxSizeofFileName = KNonNativeApplicationTypeRegistry().Length() + 1; - iNonNativeApplicationTypeRegistry.CreateL(maxSizeofFileName); - iNonNativeApplicationTypeRegistry.Append(sysDrive); - iNonNativeApplicationTypeRegistry.Append(KNonNativeApplicationTypeRegistry()); - - TRAP_IGNORE(InternalizeNonNativeApplicationTypeArrayL()); // We don't want a corrupt file to prevent from starting +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + TRAP_IGNORE(InitNonNativeApplicationTypeArrayL()); +#else + // + TChar sysDrive = RFs::GetSystemDriveChar(); + TInt maxSizeofFileName = KNonNativeApplicationTypeRegistry().Length() + 1; + iNonNativeApplicationTypeRegistry.CreateL(maxSizeofFileName); + iNonNativeApplicationTypeRegistry.Append(sysDrive); + iNonNativeApplicationTypeRegistry.Append(KNonNativeApplicationTypeRegistry()); + + TRAP_IGNORE(InternalizeNonNativeApplicationTypeArrayL()); // We don't want a corrupt file to prevent from starting +#endif + if(iLoadRecognizersOnDemand) iRecognizerUnloadTimer=CPeriodic::NewL(EPriorityNormal); - // +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iAppInstallationMonitor = CApaAppInstallationMonitor::NewL(this); iAppInstallationMonitor->Start(); +#endif } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK void CApaAppArcServer::ConstructPathsToMonitorL() { TInt drivesToMonitor = KApaDrivesToMonitor; @@ -337,16 +371,20 @@ iAppFsMonitor->AddLocationL(KAppResourceAppsLocation); } } - +#endif + EXPORT_C CApaAppArcServer::~CApaAppArcServer() { if(iBaBackupSessionWrapper) iBaBackupSessionWrapper->DeRegisterBackupOperationObserver(*this); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK delete iAppInstallationMonitor; + delete iAppFsMonitor; + iNonNativeApplicationTypeRegistry.Close(); +#endif delete iAppList; // deletes scanners delete iMimeTypeRecognizer; delete iMimeTypeToAppMappingsManager; - delete iAppFsMonitor; delete iTypeStoreMonitor; delete iBaBackupSessionWrapper; delete iRecognitionCache; @@ -361,9 +399,9 @@ iNonNativeApplicationTypeArray.Close(); delete iRecognizerUnloadTimer; - iNonNativeApplicationTypeRegistry.Close(); } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK EXPORT_C void CApaAppArcServer::HandleInstallationStartEvent() { if ( iAppFsMonitor ) @@ -381,6 +419,7 @@ } AppList().RestartScanL(); } +#endif CSession2* CApaAppArcServer::NewSessionL(const TVersion& aVersion,const RMessage2&/* aMessage*/) const // Create a new server session. @@ -396,7 +435,7 @@ // // scanning code here // - +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK EXPORT_C TCallBack CApaAppArcServer::RescanCallBack() { return TCallBack(&AppFsNotifyWithForcedRegistrationsResetCallBack,this); @@ -415,6 +454,7 @@ reinterpret_cast(aObject)->UpdateApps(); return KErrNone; } +#endif TInt CApaAppArcServer::PlugInNotifyCallBack(TAny* aObject) { @@ -431,6 +471,7 @@ return KErrNone; } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK void CApaAppArcServer::UpdateApps() // update the list { @@ -446,7 +487,8 @@ { iForceRegistrationStatus|=EForceRegistrationRequested; UpdateApps(); - } + } +#endif void CApaAppArcServer::NotifyUpdate(TInt aReason) // tell all sessions to update their clients @@ -480,10 +522,23 @@ if(modificationStatus) TRAP_IGNORE(iMimeTypeToAppMappingsManager->StoreL()); } - + // iterate through sessions iSessionIter.SetToFirst(); CApaAppArcServSession* ses=static_cast(&(*iSessionIter++)); + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + //Get the updated application information from iAppList + CArrayFixFlat* updatedAppsInfo=iAppList->UpdatedAppsInfo(); + + while (ses!=NULL) + { + //Call session object NotifyClients and pass the updated application information. + ses->NotifyClients(aReason, updatedAppsInfo); + ses=static_cast(&(*iSessionIter++)); + } +#else + while (ses!=NULL) { if(iForceRegistrationStatus & EForceRegistrationRequested) @@ -510,6 +565,7 @@ //If this function is called not because of force registration, clear force registration applist change status. iForceRegistrationStatus &= (~EForceRegistrationAppListChanged); } +#endif } void CApaAppArcServer::UpdatePlugIns() @@ -576,16 +632,20 @@ case MBackupOperationObserver::EAbort: break; case MBackupOperationObserver::EStart: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK if ( iAppFsMonitor ) { iAppFsMonitor->SetBlocked(ETrue); } +#endif break; case MBackupOperationObserver::EEnd: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK if ( iAppFsMonitor ) { iAppFsMonitor->SetBlocked(EFalse); } +#endif break; default: Panic(EEventFromBackupObserverError); @@ -595,10 +655,12 @@ void CApaAppArcServer::InitialListPopulationComplete() { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK if ( iAppFsMonitor ) { iAppFsMonitor->SetBlocked(EFalse); } +#endif // notify clients (whoever is interested) that initial population of list is completed iSessionIter.SetToFirst(); @@ -611,41 +673,90 @@ } } + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + +/* + * Cleanup RPointerArray + */ +void CleanupAndDestroyLauncherArray(TAny* aRPrray) + { + RPointerArray* rpArray = (static_cast*>(aRPrray)); + rpArray->ResetAndDestroy(); + rpArray->Close(); + } + + +/* + * Gets non-native type to its run time mapping information from SCR and initialzes + * a mapping array + */ +void CApaAppArcServer::InitNonNativeApplicationTypeArrayL() + { + Usif::RSoftwareComponentRegistry scrSession; + User::LeaveIfError(scrSession.Connect()); + CleanupClosePushL(scrSession); + + RPointerArray launchers; + //Get non-native type to its run-time mappings + scrSession.GetApplicationLaunchersL(launchers); + TCleanupItem cleanup(CleanupAndDestroyLauncherArray, &launchers); + CleanupStack::PushL(cleanup); + + //Get each mapping and add it to mapping array + for(TInt index=0;indexTypeId(); + nonNativeApplicationType.iNativeExecutable=launcherInfo->Launcher().AllocLC(); + iNonNativeApplicationTypeArray.AppendL(nonNativeApplicationType); + CleanupStack::Pop(nonNativeApplicationType.iNativeExecutable); + } + CleanupStack::PopAndDestroy(2, &scrSession); + } + +void CApaAppArcServer::UpdateAppListL(RArray* aAppUpdateInfo, TUid aSecureID) +{ + iAppList->UpdateApplistL(this, aAppUpdateInfo, aSecureID); +} +#else + void CApaAppArcServer::RegisterNonNativeApplicationTypeL(TUid aApplicationType, const TDesC& aNativeExecutable) - { - for (TInt i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i) - { - if (iNonNativeApplicationTypeArray[i].iTypeUid.iUid==aApplicationType.iUid) - User::Leave(KErrAlreadyExists); - } - - SNonNativeApplicationType nonNativeApplicationType; - nonNativeApplicationType.iTypeUid.iUid=aApplicationType.iUid; - nonNativeApplicationType.iNativeExecutable=aNativeExecutable.AllocLC(); - iNonNativeApplicationTypeArray.AppendL(nonNativeApplicationType); - CleanupStack::Pop(nonNativeApplicationType.iNativeExecutable); - CleanupStack::PushL(TCleanupItem(DeleteLastNonNativeApplicationType, this)); - ExternalizeNonNativeApplicationTypeArrayL(); - CleanupStack::Pop(this); // the TCleanupItem - } + { + for (TInt i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i) + { + if (iNonNativeApplicationTypeArray[i].iTypeUid.iUid==aApplicationType.iUid) + User::Leave(KErrAlreadyExists); + } + + SNonNativeApplicationType nonNativeApplicationType; + nonNativeApplicationType.iTypeUid.iUid=aApplicationType.iUid; + nonNativeApplicationType.iNativeExecutable=aNativeExecutable.AllocLC(); + iNonNativeApplicationTypeArray.AppendL(nonNativeApplicationType); + CleanupStack::Pop(nonNativeApplicationType.iNativeExecutable); + CleanupStack::PushL(TCleanupItem(DeleteLastNonNativeApplicationType, this)); + ExternalizeNonNativeApplicationTypeArrayL(); + CleanupStack::Pop(this); // the TCleanupItem + } void CApaAppArcServer::DeregisterNonNativeApplicationTypeL(TUid aApplicationType) - { - TInt i; - for (i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i) - { - if (iNonNativeApplicationTypeArray[i].iTypeUid.iUid==aApplicationType.iUid) - break; - } - - if (i>=0) - { - ExternalizeNonNativeApplicationTypeArrayL(i); - delete iNonNativeApplicationTypeArray[i].iNativeExecutable; - iNonNativeApplicationTypeArray[i].iNativeExecutable = NULL; - iNonNativeApplicationTypeArray.Remove(i); - } - } + { + TInt i; + for (i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i) + { + if (iNonNativeApplicationTypeArray[i].iTypeUid.iUid==aApplicationType.iUid) + break; + } + + if (i>=0) + { + ExternalizeNonNativeApplicationTypeArrayL(i); + delete iNonNativeApplicationTypeArray[i].iNativeExecutable; + iNonNativeApplicationTypeArray[i].iNativeExecutable = NULL; + iNonNativeApplicationTypeArray.Remove(i); + } + } void CApaAppArcServer::InternalizeNonNativeApplicationTypeArrayL() { @@ -673,37 +784,39 @@ CleanupStack::PopAndDestroy(&file); } + void CApaAppArcServer::ExternalizeNonNativeApplicationTypeArrayL(TInt aIndexToIgnore/*=-1*/) const - { - RFs& fs=const_cast(iFs); - fs.MkDirAll(iNonNativeApplicationTypeRegistry); // ignore any error - RFile file; - CleanupClosePushL(file); - User::LeaveIfError(file.Replace(fs, iNonNativeApplicationTypeRegistry, EFileShareExclusive|EFileStream|EFileWrite)); - RFileWriteStream targetStream; - targetStream.Attach(file); // file gets closed by this call, but that's okay, we don't need it any more (targetStream has its own copy of this RFile object that it owns) - CleanupClosePushL(targetStream); - const TInt arrayCount(iNonNativeApplicationTypeArray.Count()); - TInt arrayCountToExternalize=arrayCount; - if (aIndexToIgnore>=0) - --arrayCountToExternalize; + { + RFs& fs=const_cast(iFs); + fs.MkDirAll(iNonNativeApplicationTypeRegistry); // ignore any error + RFile file; + CleanupClosePushL(file); + User::LeaveIfError(file.Replace(fs, iNonNativeApplicationTypeRegistry, EFileShareExclusive|EFileStream|EFileWrite)); + RFileWriteStream targetStream; + targetStream.Attach(file); // file gets closed by this call, but that's okay, we don't need it any more (targetStream has its own copy of this RFile object that it owns) + CleanupClosePushL(targetStream); + const TInt arrayCount(iNonNativeApplicationTypeArray.Count()); + TInt arrayCountToExternalize=arrayCount; + if (aIndexToIgnore>=0) + --arrayCountToExternalize; - TCardinality(arrayCountToExternalize).ExternalizeL(targetStream); - for (TInt i=0; i=0; --i) { @@ -711,11 +824,56 @@ if (nonNativeApplicationType.iTypeUid.iUid==aNonNativeApplicationType.iUid) return *nonNativeApplicationType.iNativeExecutable; } - + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + //If the mapping is not available in the list, search in SCR and add it to the list. + TPtrC nativeExecutableName=FindAndAddNonNativeRuntimeMappingL(aNonNativeApplicationType); + if(nativeExecutableName==KNullDesC()) + User::Leave(KErrNotSupported); // not KErrNotFound + + return nativeExecutableName; +#else User::Leave(KErrNotSupported); // not KErrNotFound return KNullDesC(); +#endif } + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +TPtrC CApaAppArcServer::FindAndAddNonNativeRuntimeMappingL(TUid aNonNativeApplicationType) +{ + //If non-native type to its runtime is not available search in SCR and update in list + Usif::RSoftwareComponentRegistry scrSession; + User::LeaveIfError(scrSession.Connect()); + CleanupClosePushL(scrSession); + + RPointerArray launchers; + //Get non-native type to its run-time mappings + scrSession.GetApplicationLaunchersL(launchers); + TCleanupItem cleanup(CleanupAndDestroyLauncherArray, &launchers); + CleanupStack::PushL(cleanup); + + //Search for mapping and add it mapping list. + for(TInt index=0;indexTypeId()) + { + SNonNativeApplicationType nonNativeApplicationType; + nonNativeApplicationType.iTypeUid.iUid=launcherInfo->TypeId(); + nonNativeApplicationType.iNativeExecutable=launcherInfo->Launcher().AllocLC(); + iNonNativeApplicationTypeArray.AppendL(nonNativeApplicationType); + CleanupStack::Pop(nonNativeApplicationType.iNativeExecutable); + CleanupStack::PopAndDestroy(2, &scrSession); + return *nonNativeApplicationType.iNativeExecutable; + } + } + + CleanupStack::PopAndDestroy(2, &scrSession); + return KNullDesC(); +} +#endif + void CApaAppArcServer::DeleteLastNonNativeApplicationType(TAny* aThis) { // static CApaAppArcServer& self=*static_cast(aThis); @@ -736,6 +894,13 @@ // iterate through sessions iSessionIter.SetToFirst(); CApaAppArcServSession* ses=static_cast(&(*iSessionIter++)); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + while (ses) + { + ses->NotifyScanComplete(); + ses=static_cast(&(*iSessionIter++)); + } +#else while (ses) { if((iForceRegistrationStatus & EForceRegistrationRequested) || @@ -760,6 +925,7 @@ } //Clear force registration request status iForceRegistrationStatus &= (~EForceRegistrationRequested); +#endif } /* diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apserv/APSSES.CPP --- a/appfw/apparchitecture/apserv/APSSES.CPP Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/apserv/APSSES.CPP Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -38,13 +38,18 @@ #include #include "../apgrfx/apprivate.h" #include "apgnotif.h" -#include "../aplist/aplappregfinder.h" #include "ApLaunchChecker.h" -#include "apsnnapps.h" #include "../aplist/aplapplistitem.h" #include "apsecutils.h" +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include "../aplist/aplappregfinder.h" +#include "apsnnapps.h" +#else +#include "usif/scr/scr.h" +#endif + const TInt KApaAppListServMaxBuffer=256; #include "APSRECCACHE.h" const TInt KApaAppInfoArrayGranularity = 4; @@ -147,21 +152,34 @@ return self; } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK CApaAppListServSession::CApaAppListServSession(RFs& aFs, CApaAppArcServer& aAppArcSrv, CApaAppList& aAppList) : iFs(aFs), iAppArcSrv(aAppArcSrv), iAppList(aAppList), iApaAppInfoArray(KApaAppInfoArrayGranularity) { } +#else +CApaAppListServSession::CApaAppListServSession(RFs& aFs, CApaAppArcServer& aAppArcSrv, CApaAppList& aAppList) + : iFs(aFs), iAppArcSrv(aAppArcSrv), iAppList(aAppList), iApaAppInfoArray(KApaAppInfoArrayGranularity), + iNotificationRequested(EFalse) + { + + } +#endif void CApaAppListServSession::ConstructL() { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNonNativeApplicationsManager = CApsNonNativeApplicationsManager::NewL(iAppArcSrv,iFs); +#endif } CApaAppListServSession::~CApaAppListServSession() { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK delete iNonNativeApplicationsManager; +#endif iApaAppInfoArray.ResetAndDestroy(); iApaAppInfoArray.Close(); } @@ -251,36 +269,68 @@ ApplicationLanguageL(aMessage); break; case EAppListServAppInfoProvidedByRegistrationFile: // private OpCode for CEikApplication's use only +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK AppInfoProvidedByRegistrationFileL(aMessage); +#else + ASSERT(0); // panic debug only + User::Leave(KErrNotSupported); +#endif break; case EAppListServAppIconFileName: IconFileNameL(aMessage); break; case EAppListServAppViewIconFileName: ViewIconFileNameL(aMessage); - break; + break; case EAppListServPrepareNonNativeApplicationsUpdates: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNonNativeApplicationsManager->PrepareNonNativeApplicationsUpdatesL(); +#else + ASSERT(0); // panic debug only + User::Leave(KErrNotSupported); +#endif break; case EAppListServRegisterNonNativeApplication: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNonNativeApplicationsManager->RegisterNonNativeApplicationL(aMessage); +#else + ASSERT(0); // panic debug only + User::Leave(KErrNotSupported); +#endif break; case EAppListServDeregisterNonNativeApplication: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNonNativeApplicationsManager->DeregisterNonNativeApplicationL(aMessage); +#else + ASSERT(0); // panic debug only + User::Leave(KErrNotSupported); +#endif break; case EAppListServCommitNonNativeApplications: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNonNativeApplicationsManager->CommitNonNativeApplicationsUpdatesL(aMessage); completeMessage=EFalse; +#else + ASSERT(0); // panic debug only + User::Leave(KErrNotSupported); +#endif break; case EAppListServRollbackNonNativeApplications: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNonNativeApplicationsManager->RollbackNonNativeApplicationsUpdates(); +#else + ASSERT(0); // panic debug only + User::Leave(KErrNotSupported); +#endif break; case EAppListServGetAppType: GetAppTypeL(aMessage); break; case EAppListServForceRegistration: ForceRegistrationL(aMessage); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK completeMessage=EFalse; +#endif break; case EMatchesSecurityPolicy: MatchesSecurityPolicyL(aMessage); @@ -295,25 +345,41 @@ #endif break; case EDebugAddFailingNonNativeApplicationsUpdate: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK #ifdef _DEBUG iNonNativeApplicationsManager->ForceFailInNonNativeApplicationsUpdatesL(); #endif +#endif break; case EDebugAddPanicingNonNativeApplicationsUpdate: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK #ifdef _DEBUG iNonNativeApplicationsManager->ForcePanicInNonNativeApplicationsUpdatesL(); #endif +#endif break; case EDebugAddRollbackPanicingNonNativeApplicationsUpdate: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK #ifdef _DEBUG iNonNativeApplicationsManager->ForcePanicInNonNativeApplicationsRollbackL(); #endif +#endif break; + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + case EAppListServUpdateAppList: + UpdateAppListL(aMessage); + break; + case EAppListUpdatedAppsInfo: + UpdatedAppsInfoL(aMessage); + break; +#endif default: aMessage.Panic(KApaPanicCli,EClientBadRequest); break; + } - + if (completeMessage && !aMessage.IsNull()) aMessage.Complete(KErrNone); } @@ -355,6 +421,18 @@ void CApaAppArcServSession::ServiceL(const RMessage2& aMessage) { +#ifdef _DEBUG + TFullName* name = new(ELeave) TFullName(); + RThread client; + if ( aMessage.Client( client ) == KErrNone ) + { + client.FullName( *name ); + client.Close(); + } + RDebug::Print( _L("[Apparc] CApaAppListServSession::ServiceL(0x%08x) - START - op code: %04d, client: %S"), this, aMessage.Function(), name ); + delete name; +#endif + TBool completeMessage = ETrue; switch (aMessage.Function()) { @@ -472,10 +550,20 @@ } break; case EAppListServRegisterNonNativeApplicationType: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK RegisterNonNativeApplicationTypeL(aMessage); +#else + ASSERT(0); // panic debug only + User::Leave(KErrNotSupported); +#endif break; case EAppListServDeregisterNonNativeApplicationType: +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK DeregisterNonNativeApplicationTypeL(aMessage); +#else + ASSERT(0); // panic debug only + User::Leave(KErrNotSupported); +#endif break; case EAppListServPreferredBufSize: aMessage.Complete(PreferredBufSize()); @@ -536,9 +624,15 @@ break; default: iAppListSession->DoServiceL(aMessage); +#ifdef _DEBUG + RDebug::Print( _L("[Apparc] CApaAppListServSession::ServiceL(0x%08x) - END - op code: %04d, completeMessage: %d"), this, aMessage.Function(), completeMessage ); +#endif return; } - + +#ifdef _DEBUG + RDebug::Print( _L("[Apparc] CApaAppListServSession::ServiceL(0x%08x) - END - op code: %04d, completeMessage: %d"), this, aMessage.Function(), completeMessage ); +#endif if (completeMessage && !aMessage.IsNull()) aMessage.Complete(KErrNone); } @@ -566,6 +660,7 @@ return (err==KErrNone) ? Min(iMaxBufSize, preferredBufferSize) : iMaxBufSize; } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK void CApaAppArcServSession::RegisterNonNativeApplicationTypeL(const RMessage2& aMessage) { const TUid applicationType(TUid::Uid(aMessage.Int0())); @@ -581,23 +676,55 @@ const TUid applicationType(TUid::Uid(aMessage.Int0())); iServ.DeregisterNonNativeApplicationTypeL(applicationType); } +#endif void CApaAppListServSession::GetAppTypeL(const RMessage2& aMessage) { + const TUid KTypeIDToNonNativeUidMapping[2][2]={ {TUid::Uid(0xB031C52A), TUid::Uid(0x10210E26)}, //Java + {TUid::Uid(0x7BDB6DA1), TUid::Uid(0x10282821)}}; //Widget + TInt uid = aMessage.Int0(); CApaAppData* appData = iAppList.AppDataByUid(TUid::Uid(uid)); if (!appData) + { aMessage.Complete(KErrNotFound); + } else { - TPckgBuf typeUid(appData->NonNativeApplicationType()); - aMessage.WriteL(1,typeUid); + TUid typeId(appData->NonNativeApplicationType()); + + //Check if non-native type to non-native UID mapping available. Otherwise + //return whatever returned by NonNativeApplicationType. + TUid nonNativeUid=typeId; + TInt numMappings= (sizeof(KTypeIDToNonNativeUidMapping)/ (2*sizeof(TUid))); + + for(TInt index=0; index nonNativeUidBuf(nonNativeUid); + aMessage.WriteL(1,nonNativeUidBuf); aMessage.Complete(KErrNone); } } - + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +void CleanupAndDestroyAppInfoArray(TAny* aRPArray) + { + RPointerArray* rpArray = (static_cast*>(aRPArray)); + rpArray->ResetAndDestroy(); + rpArray->Close(); + } +#endif + void CApaAppListServSession::ForceRegistrationL(const RMessage2& aMessage) { +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK TInt bufferSize = aMessage.GetDesLength(0); User::LeaveIfError(bufferSize); HBufC8* const buffer=HBufC8::NewLC(bufferSize); @@ -623,8 +750,46 @@ // Trigger a rescan, when rescan completes it will complete iNotifyOnScanCompleteMsg iNotifyOnScanCompleteMsg=aMessage; iAppArcSrv.UpdateAppsByForceRegistration(); +#else + const TUid KUidSisLaunchServer={0x1020473f}; + + if(aMessage.SecureId().iId != KUidSisLaunchServer.iUid) + User::Leave(KErrNotSupported); + + //Get the size of the updated apps info buffer + TInt bufferSize = aMessage.GetDesLength(0); + + //Allocate the buffer of bufferSize and read. + HBufC8* const buffer=HBufC8::NewLC(bufferSize); + TPtr8 buffer_asWritable(buffer->Des()); + aMessage.ReadL(0,buffer_asWritable); + + RDesReadStream readStream(*buffer); + CleanupClosePushL(readStream); + + //Read the number of application information available in the buffer. + const TUint count=readStream.ReadUint32L(); + + RPointerArray appsInfo; + TCleanupItem cleanup(CleanupAndDestroyAppInfoArray, &appsInfo); + CleanupStack::PushL(cleanup); + + //Read one applciation information at a time and create list of application information. + for(TUint index=0; index>*appData; + appsInfo.AppendL(appData); + CleanupStack::Pop(appData); + } + CleanupStack::Pop(); //Remove cleanup + CleanupStack::PopAndDestroy(2, buffer); //delete readStream, buffer + + iAppList.UpdateApplistByForceRegAppsL(appsInfo); +#endif } - + void CApaAppArcServSession::AppForDocumentPassedByFileHandleL(const RMessage2& aMessage, const TUid* aServiceUid) { #if defined(__PROFILE) @@ -757,8 +922,75 @@ if (!FindAppInList(app, dummy, aUid)) User::Leave(KErrNotFound); - return *app; - } + return *app; + } + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +/** +locate app in list, return EFalse if it isn't present +search is regardless of screen mode. +@internalComponent +*/ +TBool CApaAppListServSession::FindAppInList(CApaAppData*& aApp, TApaAppEntry& aEntry, TUid aAppUid) + { + // Look for the app with aAppUid in the applist we keep + const CApaAppList& list = iAppList; + aApp = list.AppDataByUid(aAppUid); + if (aApp) + aEntry = aApp->AppEntry(); + + // If the app list is currently in flux, try to nail down the app by looking for it specifically + const TBool appPendingOnLangChange = (aApp && list.IsLanguageChangePending() && aApp->IsPending()); + + if ((!aApp || appPendingOnLangChange) && !list.IsIdleUpdateComplete()) + { + // 1. App wasn't found, but an app scan is currently in progress, + // so try to find and add the specific app we're looking for to the list + + // 2. On language change event, current app scan could not yet update the found app, + // so try to update the specific app we're looking for, in the list. + if(aAppUid != KNullUid) + { + CApaAppData* app = NULL; + TRAPD(err, app = FindSpecificAppL(aAppUid)); + if (!err && app) + { + // app has been found and added to the app list + aApp = app; + aEntry = aApp->AppEntry(); + } + } + } + + return (aApp != NULL); + } + +#else +/** +locate app in list, return EFalse if it isn't present +search is regardless of screen mode. +@internalComponent +*/ +TBool CApaAppListServSession::FindAppInList(CApaAppData*& aApp, TApaAppEntry& aEntry, TUid aAppUid) + { + // Look for the application with aAppUid in the applist + const CApaAppList& list = iAppList; + aApp = list.AppDataByUid(aAppUid); + + TBool appListChanging= (list.IsLanguageChangePending()||!list.IsIdleUpdateComplete()); + //If the application is not in the applist and applist is still getting updated then find the + //requested application specifically and add to applist. + TInt err=KErrNone; + if( (!aApp && appListChanging) || (aApp && aApp->IsLangChangePending())) + TRAP(err, aApp=FindSpecificAppL(aAppUid)); + + if (!err && aApp) + aEntry = aApp->AppEntry(); + + return (aApp != NULL); + } + +#endif void CApaAppListServSession::SendArrayL(const MArrayItemWriter& aArrayItemWriter,const RMessage2& aMessage) const { @@ -1027,6 +1259,23 @@ } else { +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + Usif::RSoftwareComponentRegistry scrCon; + User::LeaveIfError(scrCon.Connect()); + CleanupClosePushL(scrCon); + TApaAppEntry appEntry=appData->AppEntry(); + + //If component id of an application is non-zero then it is installed by installer + //after phone marketed. + TBool isInstalledApp=(scrCon.GetComponentIdForAppL(appEntry.iUidType[2])!=0); + + //data priority for UnTrusted apps would be capped if it is greater than the threshold priority i.e, KMaxTInt16. + if (!isSidTrusted && isInstalledApp) + { + priority = KDataTypeUnTrustedPriorityThreshold; + } + CleanupStack::PopAndDestroy(); //scrCon +#else TPtrC registrationFilePath = appData->RegistrationFileName(); TInt match = registrationFilePath.MatchF ( KLitPathForUntrustedRegistrationResourceFiles ); @@ -1038,6 +1287,7 @@ // than UnTrusted apps Threshold priority priority = KDataTypeUnTrustedPriorityThreshold; } +#endif } } else @@ -1672,50 +1922,17 @@ return (capabilityBuf().iAttributes & TApaAppCapability::EControlPanelItem); } -/** -locate app in list, return EFalse if it isn't present -search is regardless of screen mode. -@internalComponent -*/ -TBool CApaAppListServSession::FindAppInList(CApaAppData*& aApp, TApaAppEntry& aEntry, TUid aAppUid) - { - // Look for the app with aAppUid in the app list we keep - const CApaAppList& list = iAppList; - aApp = list.AppDataByUid(aAppUid); - if (aApp) - aEntry = aApp->AppEntry(); - - // If the app list is currently in flux, try to nail down the app by looking for it specifically - const TBool appPendingOnLangChange = (aApp && list.IsLanguageChangePending() && aApp->IsPending()); - if ((!aApp || appPendingOnLangChange) && !list.IsIdleUpdateComplete()) - { - // 1. App wasn't found, but an app scan is currently in progress, - // so try to find and add the specific app we're looking for to the list - - // 2. On language change event, current app scan could not yet update the found app, - // so try to update the specific app we're looking for, in the list. - if(aAppUid != KNullUid) - { - CApaAppData* app = NULL; - TRAPD(err, app = FindSpecificAppL(aAppUid)); - if (!err && app) - { - // app has been found and added to the app list - aApp = app; - aEntry = aApp->AppEntry(); - } - } - } - - return (aApp != NULL); - } CApaAppData* CApaAppListServSession::FindSpecificAppL(TUid aAppUid) { - //Scans the drives and folder lists for the specific app - CApaAppRegFinder* regFinder = CApaAppRegFinder::NewLC(iFs); - CApaAppData* app = iAppList.FindAndAddSpecificAppL(regFinder, aAppUid); - CleanupStack::PopAndDestroy(regFinder); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + CApaAppData* app = iAppList.FindAndAddSpecificAppL(aAppUid); +#else + //Scans the drives and folder lists for the specific app + CApaAppRegFinder* regFinder = CApaAppRegFinder::NewLC(iFs); + CApaAppData* app = iAppList.FindAndAddSpecificAppL(regFinder, aAppUid); + CleanupStack::PopAndDestroy(regFinder); +#endif return app; } @@ -1761,34 +1978,79 @@ else { const TBool completeImmediatelyIfNoScanImpendingOrInProgress=aMessage.Int0(); - if ((!completeImmediatelyIfNoScanImpendingOrInProgress) || - iAppArcSrv.AppFsMonitor().AnyNotificationImpending() || - iAppList.AppScanInProgress()) +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + if ((!completeImmediatelyIfNoScanImpendingOrInProgress) || + iAppList.AppScanInProgress()) +#else + if ((!completeImmediatelyIfNoScanImpendingOrInProgress) || + iAppArcSrv.AppFsMonitor().AnyNotificationImpending() || + iAppList.AppScanInProgress()) +#endif iNotifyMessage=aMessage; else aMessage.Complete(KErrNone); } + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + iNotificationRequested=ETrue; +#endif } +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +void CApaAppArcServSession::NotifyClients(TInt aReason, CArrayFixFlat* aUpdatedAppsInfo) +#else void CApaAppArcServSession::NotifyClients(TInt aReason) +#endif + { - iAppListSession->NotifyClients(aReason); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + iAppListSession->NotifyClients(aReason, aUpdatedAppsInfo); +#else + iAppListSession->NotifyClients(aReason); +#endif } + void CApaAppListServSession::CancelNotify() { +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + NotifyClients(KErrCancel, NULL); +#else NotifyClients(KErrCancel); +#endif } +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +void CApaAppListServSession::NotifyClients(TInt aReason, CArrayFixFlat* aUpdatedAppsInfo) +#else void CApaAppListServSession::NotifyClients(TInt aReason) +#endif { if (!iNotifyMessage.IsNull()) iNotifyMessage.Complete(aReason); //Notify client for scan complete. NotifyScanComplete(); + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + if(aUpdatedAppsInfo && iNotificationRequested) + { + //Append the updated applications information to iAppsUpdated + TInt count=aUpdatedAppsInfo->Count(); + for(TInt index=0; index pckg(registrationFileUsed); aMessage.WriteL(1, pckg); } +#endif + void CApaAppListServSession::IconFileNameL(const RMessage2& aMessage) { @@ -1810,20 +2074,27 @@ // locate app in list const CApaAppData& app = FindAppInListL(uid); - if (!app.RegistrationFileUsed()) - User::Leave(KErrNotSupported); - else - { - TPtrC iconFileName(app.IconFileName()); - if (iconFileName.Length() == 0) - User::Leave(KErrNotFound); - else - { - TFileName fileName = iconFileName; - TPckgC pckg(fileName); - aMessage.WriteL(1, pckg); - } - } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + if (!app.RegistrationFileUsed()) + User::Leave(KErrNotSupported); + else + { +#endif + + TPtrC iconFileName(app.IconFileName()); + if (iconFileName.Length() == 0) + User::Leave(KErrNotFound); + else + { + TFileName fileName = iconFileName; + TPckgC pckg(fileName); + aMessage.WriteL(1, pckg); + } + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + } +#endif + } void CApaAppListServSession::ViewIconFileNameL(const RMessage2& aMessage) @@ -1838,31 +2109,38 @@ // locate app in list const CApaAppData& app = FindAppInListL(uid); - if (!app.RegistrationFileUsed()) - User::Leave(KErrNotSupported); - else - { - const CArrayPtr& viewDataArray = *app.Views(); - const TInt count = viewDataArray.Count(); - for (TInt ii=0; ii& viewDataArray = *app.Views(); + const TInt count = viewDataArray.Count(); + for (TInt ii=0; ii pckg(fileName); + aMessage.WriteL(2, pckg); + } - if (viewIconFileName.Length() == 0) - User::Leave(KErrNotFound); - else - { - TFileName fileName = viewIconFileName; - TPckgC pckg(fileName); - aMessage.WriteL(2, pckg); - } - } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + } +#endif + } void CApaAppArcServSession::GetAppServicesL(const RMessage2& aMessage) @@ -2061,9 +2339,87 @@ { iNotifyOnScanCompleteMsg.Complete(KErrNone); } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK iNonNativeApplicationsManager->NotifyScanComplete(); +#endif } //lint !e1762 Suppress member function could be made const + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + +//Update applist based on the information provided by the installers. +void CApaAppListServSession::UpdateAppListL(const RMessage2& aMessage) +{ + //Create the update info array from the buffer. + TInt bufferSize = aMessage.GetDesLength(0); + User::LeaveIfError(bufferSize); + HBufC8* const buffer=HBufC8::NewLC(bufferSize); + TPtr8 buffer_asWritable(buffer->Des()); + aMessage.ReadL(0,buffer_asWritable); + + RDesReadStream readStream(*buffer); + CleanupClosePushL(readStream); + const TUint count=readStream.ReadUint32L(); + + RArray *appUpdateInfo=new (ELeave) RArray(5); + CleanupStack::PushL(appUpdateInfo); + + for(TUint index=0; index>appInfo; + appUpdateInfo->AppendL(appInfo); + } + CleanupStack::Pop(appUpdateInfo); + CleanupStack::PopAndDestroy(2, buffer); //delete readStream, buffer + + iAppArcSrv.UpdateAppListL(appUpdateInfo, TUid::Uid(aMessage.SecureId())); +} + + +void CApaAppListServSession::UpdatedAppsInfoL(const RMessage2& aMessage) + { + //Read the buffer size + TInt sizeOfBuffer=aMessage.Int1(); + TInt count=iAppsUpdated.Count(); + TInt sizeRequired= sizeof(TInt)+(sizeof(TApaAppUpdateInfo) * count); + + TPckgBuf pckg(sizeRequired); + + //If size of the buffer is not enough write the required size and leave. + if(sizeOfBufferExpandL(0, sizeRequired); + + RBufWriteStream writeStream; + writeStream.Open(*buffer); + + //Write count to stream. + writeStream.WriteUint32L(count); + + //Write updated applications information to stream. + for(TInt index=0; indexPtr(0)); + //Write size of the buffer + aMessage.WriteL(1, pckg); + + CleanupStack::PopAndDestroy(buffer); + iAppsUpdated.Reset(); + iNotificationRequested=EFalse; + } +#endif + // TSizeArrayItemWriter TInt TSizeArrayItemWriter::ArrayItemCount() const diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apserv/APSSES.H --- a/appfw/apparchitecture/apserv/APSSES.H Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/apserv/APSSES.H Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -44,7 +44,12 @@ void NotifyScanComplete(); void SetNotify(const RMessage2& aMessage); void CancelNotify(); - void NotifyClients(TInt aReason); + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + void NotifyClients(TInt aReason, CArrayFixFlat* aUpdatedAppsInfo); +#else + void NotifyClients(TInt aReason); +#endif void NotifyClientForCompletionOfListPopulation(); void CancelListPopulationCompleteObserver(); @@ -99,6 +104,11 @@ void ApplicationLanguageL(const RMessage2& aMessage); void SetAppShortCaptionL(const RMessage2& aMessage); + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + void UpdateAppListL(const RMessage2& aMessage); + void UpdatedAppsInfoL(const RMessage2& aMessage); +#endif private: static TInt NextDriveToScan(TInt aCurrentDrive); static TBool AppIsControlPanelItem(const CApaAppData& aAppData); @@ -120,7 +130,9 @@ CApaAppList& iAppList; RMessage2 iNotifyMessage; RMessage2 iNotifyOnScanCompleteMsg; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK CApsNonNativeApplicationsManager* iNonNativeApplicationsManager; +#endif RMessage2 iCompletionOfListPopulationObserverMsg; TAppListType iAppListType; @@ -130,6 +142,11 @@ TUint iCapabilityAttrFilterValue; // contains bit flags from TCapabilityAttribute TUid iServiceUid; RPointerArray iApaAppInfoArray; //contains the most recent "snapshot" of the applist taken by GetNextAppL. + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + RArray iAppsUpdated; + TBool iNotificationRequested; //If its true updated application information is maintained in session object. +#endif }; @@ -143,7 +160,11 @@ virtual void ServiceL(const RMessage2 &aMessage); void NotifyClientOfDataMappingChange(); - void NotifyClients(TInt aReason); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + void NotifyClients(TInt aReason, CArrayFixFlat* aUpdatedAppsInfo); +#else + void NotifyClients(TInt aReason); +#endif void NotifyScanComplete(); void NotifyClientForCompletionOfListPopulation(); private: @@ -178,8 +199,10 @@ void AppForDataTypeAndServiceL(const RMessage2& aMessage); void AppForDocumentPassedByFileHandleL(const RMessage2& aMessage, const TUid* aServiceUid); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK void RegisterNonNativeApplicationTypeL(const RMessage2& aMessage); void DeregisterNonNativeApplicationTypeL(const RMessage2& aMessage); +#endif void GetExecutableNameGivenDocumentL(const RMessage2& aMessage); void GetExecutableNameGivenDocumentPassedByFileHandleL(const RMessage2& aMessage); diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apserv/apsserv.h --- a/appfw/apparchitecture/apserv/apsserv.h Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/apserv/apsserv.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -55,21 +55,22 @@ inline RWsSession& WsSession(); - inline const CApaFsMonitor& AppFsMonitor() const {return *iAppFsMonitor;} - inline CApaScanningRuleBasedPlugIns* RuleBasedPlugIns(); // Application list stuff inline CApaAppList& AppList(); - void UpdateApps(); - IMPORT_C TCallBack RescanCallBack(); - - void RegisterNonNativeApplicationTypeL(TUid aApplicationType, const TDesC& aNativeExecutable); - void DeregisterNonNativeApplicationTypeL(TUid aApplicationType); - TPtrC NativeExecutableL(TUid aNonNativeApplicationType) const; - + TPtrC NativeExecutableL(TUid aNonNativeApplicationType); + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + void UpdateApps(); + IMPORT_C TCallBack RescanCallBack(); + void UpdateAppsByForceRegistration(); + void RegisterNonNativeApplicationTypeL(TUid aApplicationType, const TDesC& aNativeExecutable); + void DeregisterNonNativeApplicationTypeL(TUid aApplicationType); + inline const CApaFsMonitor& AppFsMonitor() const {return *iAppFsMonitor;} IMPORT_C void HandleInstallationStartEvent(); IMPORT_C void HandleInstallationEndEventL(); +#endif // MIME-type recognition inline CApaDataRecognizer* MimeTypeRecognizer(); @@ -101,23 +102,34 @@ void HandleBackupOperationEventL(const TBackupOperationAttributes& aBackupOperationAttributes); public: // IMPORT_C ~CApaAppArcServer(); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK TBool NonNativeRecovery() const; void SetNonNativeRecovery(TBool aValue); +#else + void UpdateAppListL(RArray* aAppUpdateInfo, TUid aSecureID); +#endif TBool LoadMbmIconsOnDemand() const; - void UpdateAppsByForceRegistration(); + private: CApaAppArcServer(TInt aPriority); void ConstructL(); virtual CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const; - static TInt AppFsNotifyWithForcedRegistrationsResetCallBack(TAny* aPtr); - static TInt AppFsNotifyCallBack(TAny* aPtr); static TInt PlugInNotifyCallBack(TAny* aPtr); static TInt TypeStoreNotifyCallback(TAny* aPtr); void UpdatePlugIns(); void UpdateTypeStore(); void DoUpdateTypeStoreL(); + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + void InitNonNativeApplicationTypeArrayL(); + TPtrC FindAndAddNonNativeRuntimeMappingL(TUid aNonNativeApplicationType); +#else + static TInt AppFsNotifyWithForcedRegistrationsResetCallBack(TAny* aPtr); + static TInt AppFsNotifyCallBack(TAny* aPtr); void InternalizeNonNativeApplicationTypeArrayL(); - void ExternalizeNonNativeApplicationTypeArrayL(TInt aIndexToIgnore=-1) const; + void ExternalizeNonNativeApplicationTypeArrayL(TInt aIndexToIgnore=-1) const; + void ConstructPathsToMonitorL(); +#endif static void DeleteLastNonNativeApplicationType(TAny* aThis); void NotifyScanComplete(); void DeleteCustomAppInfoList(); @@ -131,7 +143,6 @@ CRecognitionResult* CachedRecognitionResult(const RFile& aFile, const TParseBase& aParser) const; void CacheRecognitionResultL(const TParseBase& aParser, const TDataRecognitionResult& aResult); void CacheRecognitionResultL(const RFile& aFile, const TParseBase& aParser, const TDataRecognitionResult& aResult); - void ConstructPathsToMonitorL(); private: enum { @@ -157,7 +168,9 @@ CApaAppList* iAppList; CPeriodic* iRecognizerUnloadTimer; CApaScanningDataRecognizer* iMimeTypeRecognizer; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK CApaFsMonitor* iAppFsMonitor; +#endif CApaFsMonitor* iTypeStoreMonitor; CTypeStoreManager* iMimeTypeToAppMappingsManager; TTime iTypeStoreModified; @@ -174,10 +187,17 @@ TBool iNonNativeRecovery; TBool iLoadRecognizersOnDemand; +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK CApaAppInstallationMonitor* iAppInstallationMonitor; //CApaAppInstallationMonitor monitors installation and uninstallation of applications. + RBuf iNonNativeApplicationTypeRegistry; + TInt iForceRegistrationStatus; +#endif TBool iLoadMbmIconsOnDemand; - RBuf iNonNativeApplicationTypeRegistry; - TInt iForceRegistrationStatus; + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + RArray iAppUpdateInfo; +#endif + }; diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apserv/distribution.policy.s60 --- a/appfw/apparchitecture/apserv/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apsexe/distribution.policy.s60 --- a/appfw/apparchitecture/apsexe/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/apstart/distribution.policy.s60 --- a/appfw/apparchitecture/apstart/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/APFILEU.DEF --- a/appfw/apparchitecture/bwins/APFILEU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/bwins/APFILEU.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -55,9 +55,9 @@ ?reserved3@CAppSidChecker@@EAEXXZ @ 54 NONAME ABSENT ; void CAppSidChecker::reserved3(void) ?DriveList@CApaAppRegFinder@@QBEABV?$RArray@VTDriveUnitInfo@@@@XZ @ 55 NONAME ABSENT ; class RArray const & CApaAppRegFinder::DriveList(void) const ?FindAllRemovableMediaAppsL@CApaAppRegFinder@@QAEXXZ @ 56 NONAME ABSENT ; void CApaAppRegFinder::FindAllRemovableMediaAppsL(void) - ??1CApaAppInstallationMonitor@@UAE@XZ @ 57 NONAME ; CApaAppInstallationMonitor::~CApaAppInstallationMonitor(void) - ?NewL@CApaAppInstallationMonitor@@SAPAV1@PAVCApaAppArcServer@@@Z @ 58 NONAME ; class CApaAppInstallationMonitor * CApaAppInstallationMonitor::NewL(class CApaAppArcServer *) - ?Start@CApaAppInstallationMonitor@@QAEXXZ @ 59 NONAME ; void CApaAppInstallationMonitor::Start(void) + ??1CApaAppInstallationMonitor@@UAE@XZ @ 57 NONAME ABSENT; CApaAppInstallationMonitor::~CApaAppInstallationMonitor(void) + ?NewL@CApaAppInstallationMonitor@@SAPAV1@PAVCApaAppArcServer@@@Z @ 58 NONAME ABSENT; class CApaAppInstallationMonitor * CApaAppInstallationMonitor::NewL(class CApaAppArcServer *) + ?Start@CApaAppInstallationMonitor@@QAEXXZ @ 59 NONAME ABSENT; void CApaAppInstallationMonitor::Start(void) ??1CApfMimeContentPolicy@@UAE@XZ @ 60 NONAME ; CApfMimeContentPolicy::~CApfMimeContentPolicy(void) ?IsClosedExtension@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 61 NONAME ; int CApfMimeContentPolicy::IsClosedExtension(class TDesC16 const &) ?IsClosedFileL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 62 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class RFile &) @@ -69,5 +69,4 @@ ?NewL@CApfMimeContentPolicy@@SAPAV1@XZ @ 68 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(void) ?NewLC@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 69 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(class RFs &) ?NewLC@CApfMimeContentPolicy@@SAPAV1@XZ @ 70 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(void) - _E32Dll=__E32Dll ; Entry point for emulation diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/APGRFXU.DEF --- a/appfw/apparchitecture/bwins/APGRFXU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/bwins/APGRFXU.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -331,7 +331,15 @@ ?IsPending@CApaAppData@@QBEHXZ @ 330 NONAME ABSENT ; int CApaAppData::IsPending(void) const ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 331 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const ?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 332 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &) - X @ 333 NONAME ABSENT ; - X @ 334 NONAME ABSENT ; + X @ 333 NONAME ABSENT + X @ 334 NONAME ABSENT ?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 335 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void) - ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @336 NONAME;TInt RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const + ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 336 NONAME ; TInt RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const + ??0TApaAppUpdateInfo@@QAE@XZ @ 337 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(void) + ?InternalizeL@TApaAppUpdateInfo@@QAEXAAVRReadStream@@@Z @ 338 NONAME ; void TApaAppUpdateInfo::InternalizeL(class RReadStream &) + ?UpdateAppListL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 339 NONAME ; int RApaLsSession::UpdateAppListL(class RArray &) + ?ExternalizeL@TApaAppUpdateInfo@@QBEXAAVRWriteStream@@@Z @ 340 NONAME ; void TApaAppUpdateInfo::ExternalizeL(class RWriteStream &) const + ??0TApaAppUpdateInfo@@QAE@VTUid@@W4TApaAppAction@0@@Z @ 341 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(class TUid, enum TApaAppUpdateInfo::TApaAppAction) + ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 342 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray const &) + ?UpdatedAppsInfoL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 343 NONAME ; int RApaLsSession::UpdatedAppsInfoL(class RArray &) + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/APSERVU.DEF --- a/appfw/apparchitecture/bwins/APSERVU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/bwins/APSERVU.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -16,11 +16,11 @@ ??1CUpdatedAppsList@@UAE@XZ @ 15 NONAME ABSENT ; CUpdatedAppsList::~CUpdatedAppsList(void) ?CloseAndDeletePermanentStore@CUpdatedAppsList@@QAEXXZ @ 16 NONAME ABSENT ; void CUpdatedAppsList::CloseAndDeletePermanentStore(void) ?IsInList@CUpdatedAppsList@@QBEHABVTDesC16@@@Z @ 17 NONAME ABSENT ; int CUpdatedAppsList::IsInList(class TDesC16 const &) const - ?RescanCallBack@CApaAppArcServer@@QAE?AVTCallBack@@XZ @ 18 NONAME ; class TCallBack CApaAppArcServer::RescanCallBack(void) + ?RescanCallBack@CApaAppArcServer@@QAE?AVTCallBack@@XZ @ 18 NONAME ABSENT; class TCallBack CApaAppArcServer::RescanCallBack(void) ?KApaLoadDataRecognizersOnDemand@@3HB @ 19 NONAME DATA 4 ; int const KApaLoadDataRecognizersOnDemand ?KApaUnloadRecognizersTimeout@@3HB @ 20 NONAME DATA 4 ; int const KApaUnloadRecognizersTimeout - ?HandleInstallationEndEventL@CApaAppArcServer@@QAEXXZ @ 21 NONAME ; void CApaAppArcServer::HandleEndUninstallEventL(void) - ?HandleInstallationStartEvent@CApaAppArcServer@@QAEXXZ @ 22 NONAME ; void CApaAppArcServer::HandleStartUninstallEvent(void) + ?HandleInstallationEndEventL@CApaAppArcServer@@QAEXXZ @ 21 NONAME ABSENT; void CApaAppArcServer::HandleEndUninstallEventL(void) + ?HandleInstallationStartEvent@CApaAppArcServer@@QAEXXZ @ 22 NONAME ABSENT; void CApaAppArcServer::HandleStartUninstallEvent(void) ?KApaDrivesToMonitor@@3HB @ 23 NONAME ; int const KApaDrivesToMonitor ?KApaLoadMbmIconsOnDemand@@3HB @ 24 NONAME ; int const KApaLoadMbmIconsOnDemand diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF --- a/appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -77,7 +77,7 @@ ?Exists@TApaTask@@QBEHXZ @ 76 NONAME ; int TApaTask::Exists(void) const ?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 77 NONAME ; void CApaMaskedBitmap::ExternalizeL(class RWriteStream &) const ?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 78 NONAME ; class TBuf<256> CApaSystemControl::FileName(void) const - ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 79 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid) + ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 79 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid) ?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 80 NONAME ; class TApaTask TApaTaskList::FindApp(class TDesC16 const &) ?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 81 NONAME ; class TApaTask TApaTaskList::FindApp(class TUid) ?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 82 NONAME ; void CApaWindowGroupName::FindByAppUid(class TUid, class RWsSession &, int &) @@ -87,7 +87,7 @@ ?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 86 NONAME ; class TApaTask TApaTaskList::FindDoc(class TDesC16 const &) ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 87 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 88 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const - ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 89 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray const &) + ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 89 NONAME ABSENT; int RApaLsSession::ForceRegistration(class RPointerArray const &) ?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 90 NONAME ; class RFs * RApaLsSession::FsSession(void) ?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 91 NONAME ; int RApaLsSession::GetAcceptedConfidence(int &) const ?GetAllApps@RApaLsSession@@QBEHH@Z @ 92 NONAME ; int RApaLsSession::GetAllApps(int) const @@ -150,11 +150,11 @@ ?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 149 NONAME ; int CApaAppList::IsFirstScanComplete(void) const ?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 150 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const ?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 151 NONAME ; int CApaAppList::IsLanguageChangePending(void) const - ?IsPending@CApaAppData@@QBEHXZ @ 152 NONAME ; int CApaAppData::IsPending(void) const + ?IsPending@CApaAppData@@QBEHXZ @ 152 NONAME ABSENT ; int CApaAppData::IsPending(void) const ?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 153 NONAME ; int RApaLsSession::IsProgram(class TDesC16 const &, int &) const ?IsSystem@CApaWindowGroupName@@QBEHXZ @ 154 NONAME ; int CApaWindowGroupName::IsSystem(void) const ?KillTask@TApaTask@@QAEXXZ @ 155 NONAME ; void TApaTask::KillTask(void) - ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 156 NONAME ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const + ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 156 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const ?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 157 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void) ?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 158 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void) ?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 159 NONAME ; class CFbsBitmap * CApaMaskedBitmap::Mask(void) const @@ -162,7 +162,7 @@ ?MinApplicationStackSize@@YAIXZ @ 161 NONAME ; unsigned int MinApplicationStackSize(void) ?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 162 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::New(class RWsSession const &, class HBufC16 *) ?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 163 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int) - ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 164 NONAME ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &) + ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 164 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &) ?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 165 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int) ?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 166 NONAME ; class CApaAppListNotifier * CApaAppListNotifier::NewL(class MApaAppListServObserver *, enum CActive::TPriority) ?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 167 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CApaDocument &, class TSize const &) @@ -194,7 +194,7 @@ ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 193 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 194 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const ?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 195 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void) - ?PurgeL@CApaAppList@@QAEXXZ @ 196 NONAME ; void CApaAppList::PurgeL(void) + ?PurgeL@CApaAppList@@QAEXXZ @ 196 NONAME ABSENT ; void CApaAppList::PurgeL(void) ?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 197 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void) ?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 198 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void) ?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 199 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const @@ -208,12 +208,12 @@ ?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 207 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const ?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 208 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *) ?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 209 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &) - ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 210 NONAME ; class TPtrC16 CApaAppData::RegistrationFileName(void) const - ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 211 NONAME ; int CApaAppData::RegistrationFileUsed(void) const - ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 212 NONAME ; void CApaAppList::ResetForcedRegistrations(void) + ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 210 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const + ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 211 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const + ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 212 NONAME ABSENT; void CApaAppList::ResetForcedRegistrations(void) ?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 213 NONAME ; int CApaWindowGroupName::RespondsToShutdownEvent(void) const ?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 214 NONAME ; int CApaWindowGroupName::RespondsToSwitchFilesEvent(void) const - ?RestartScanL@CApaAppList@@QAEXXZ @ 215 NONAME ; void CApaAppList::RestartScanL(void) + ?RestartScanL@CApaAppList@@QAEXXZ @ 215 NONAME ABSENT ; void CApaAppList::RestartScanL(void) ?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 216 NONAME ; void CApaDoor::RestoreL(class CStreamStore const &, class TStreamId) ?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 217 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void) ?ScreenMode@CApaAppViewData@@QBEHXZ @ 218 NONAME ; int CApaAppViewData::ScreenMode(void) const @@ -275,7 +275,7 @@ ?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 274 NONAME ; void CApaAppList::StartIdleUpdateL(void) ?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 275 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &) ?StartupApaServerProcess@@YAHXZ @ 276 NONAME ; int StartupApaServerProcess(void) - ?StopScan@CApaAppList@@QAEXH@Z @ 277 NONAME ; void CApaAppList::StopScan(int) + ?StopScan@CApaAppList@@QAEXH@Z @ 277 NONAME ABSENT ; void CApaAppList::StopScan(int) ?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 278 NONAME ABSENT ; void CApaAppInfoFileWriter::StoreL(void) ?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 279 NONAME ; int TApaTask::SwitchCreateFile(class TDesC16 const &) ?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 280 NONAME ; int TApaTask::SwitchOpenFile(class TDesC16 const &) @@ -298,7 +298,7 @@ ?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 297 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void) ?DataTypes@TApaAppServiceInfo@@QAEAAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 298 NONAME ; class CArrayFixFlat & TApaAppServiceInfo::DataTypes(void) ??0TApaAppIdentifier@@QAE@XZ @ 299 NONAME ; TApaAppIdentifier::TApaAppIdentifier(void) - ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 300 NONAME ; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &) + ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 300 NONAME ABSENT; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &) ?ExternalizeL@TApaAppCapability@@QBEXAAVRWriteStream@@@Z @ 301 NONAME ; void TApaAppCapability::ExternalizeL(class RWriteStream &) const ??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@11@Z @ 302 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &, class TBuf<256> const &) ?AddEmbeddability@TApaEmbeddabilityFilter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 303 NONAME ; void TApaEmbeddabilityFilter::AddEmbeddability(enum TApaAppCapability::TEmbeddability) @@ -330,6 +330,21 @@ ??0TApaAppInfo@@QAE@XZ @ 329 NONAME ; TApaAppInfo::TApaAppInfo(void) ??0TApaAppViewInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@H@Z @ 330 NONAME ; TApaAppViewInfo::TApaAppViewInfo(class TUid, class TBuf<256> const &, int) ??0TApaAppServiceInfo@@QAE@VTUid@@PAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@PAVHBufC8@@@Z @ 331 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(class TUid, class CArrayFixFlat *, class HBufC8 *) - ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 332 NONAME ; int CApaAppList::AppListUpdatePending(void) - ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @333 NONAME ; TInt RecognizeData(class TDesC8 const &, class TDataRecognitionResult & ) const + ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 332 NONAME ABSENT ; int CApaAppList::AppListUpdatePending(void) + ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 333 NONAME ; TInt RecognizeData(class TDesC8 const &, class TDataRecognitionResult & ) const ?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 334 NONAME ; class CArrayFixFlat * CApaAppList::UninstalledAppArray(void) + ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@VTUid@@@Z @ 335 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class TUid) + ?NewL@CApaAppData@@SAPAV1@ABVCApplicationRegistrationData@Usif@@AAVRFs@@ABVRSoftwareComponentRegistry@3@@Z @ 336 NONAME ; class CApaAppData * CApaAppData::NewL(class Usif::CApplicationRegistrationData const &, class RFs &, class Usif::RSoftwareComponentRegistry const &) + ?InitializeApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 337 NONAME ; void CApaAppList::InitializeApplistL(class MApaAppListObserver *) + ??0TApaAppUpdateInfo@@QAE@XZ @ 338 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(void) + ?InternalizeL@TApaAppUpdateInfo@@QAEXAAVRReadStream@@@Z @ 339 NONAME ; void TApaAppUpdateInfo::InternalizeL(class RReadStream &) + ?UpdateAppListL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 340 NONAME ; int RApaLsSession::UpdateAppListL(class RArray &) + ?ExternalizeL@TApaAppUpdateInfo@@QBEXAAVRWriteStream@@@Z @ 341 NONAME ; void TApaAppUpdateInfo::ExternalizeL(class RWriteStream &) const + ??0TApaAppUpdateInfo@@QAE@VTUid@@W4TApaAppAction@0@@Z @ 342 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(class TUid, enum TApaAppUpdateInfo::TApaAppAction) + ?UpdateApplistByForceRegAppsL@CApaAppList@@QAEXAAV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 343 NONAME ; void CApaAppList::UpdateApplistByForceRegAppsL(class RPointerArray &) + ?UpdatedAppsInfo@CApaAppList@@QAEPAV?$CArrayFixFlat@VTApaAppUpdateInfo@@@@XZ @ 344 NONAME ; class CArrayFixFlat * CApaAppList::UpdatedAppsInfo(void) + ?UpdateApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@PAV?$RArray@VTApaAppUpdateInfo@@@@VTUid@@@Z @ 345 NONAME ; void CApaAppList::UpdateApplistL(class MApaAppListObserver *, class RArray *, class TUid) + ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 346 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray const &) + ?UpdatedAppsInfoL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 347 NONAME ; int RApaLsSession::UpdatedAppsInfoL(class RArray &) + ?IsLangChangePending@CApaAppData@@QAEHXZ @ 348 NONAME ; int CApaAppData::IsLangChangePending(void) + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/apfile_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/apfile_legacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,73 @@ +EXPORTS + ??0CApaScanningFileRecognizer@@IAE@AAVRFs@@PAVMApaAppStarter@@@Z @ 1 NONAME ABSENT + ??1CApaAppLocatorProxy@@UAE@XZ @ 2 NONAME ABSENT + ??1CApaScanningAppFinder@@UAE@XZ @ 3 NONAME ABSENT + ??1CApaScanningFileRecognizer@@UAE@XZ @ 4 NONAME ABSENT + ?ConstructL@CApaScanningFileRecognizer@@IAEXXZ @ 5 NONAME ABSENT + ?DefaultAppInfoFileName@CApaScanningAppFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 6 NONAME ABSENT + ?FindAllAppsL@CApaScanningAppFinder@@UAEXXZ @ 7 NONAME ABSENT + ?FindAppL@CApaScanningAppFinder@@UAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 8 NONAME ABSENT + ?GetAppCapabilityByUid@CApaAppLocatorProxy@@UAEHAAVTDes8@@VTUid@@@Z @ 9 NONAME ABSENT + ?GetAppEntryByUid@CApaAppLocatorProxy@@UAEHAAVTApaAppEntry@@VTUid@@@Z @ 10 NONAME ABSENT + ?NewL@CApaAppLocatorProxy@@SAPAV1@AAVRFs@@@Z @ 11 NONAME ABSENT + ?NewL@CApaScanningAppFinder@@SAPAV1@ABVRFs@@@Z @ 12 NONAME ABSENT + ?NewL@CApaScanningFileRecognizer@@SAPAV1@AAVRFs@@PAVMApaAppStarter@@@Z @ 13 NONAME ABSENT + ?NewLC@CApaScanningAppFinder@@SAPAV1@ABVRFs@@@Z @ 14 NONAME ABSENT + ?NextL@CApaScanningAppFinder@@UAEHAAVTApaAppEntry@@@Z @ 15 NONAME ABSENT + ?RecognizerCount@CApaScanningFileRecognizer@@QAEHXZ @ 16 NONAME ABSENT + ?RecognizerListLC@CApaScanningFileRecognizer@@QBEPAV?$CArrayFixFlat@VRRecognizer@CApaScanningFileRecognizer@@@@XZ @ 17 NONAME ABSENT + ?ScanForRecognizersL@CApaScanningFileRecognizer@@QAEXXZ @ 18 NONAME ABSENT + ?SetRecognizersFromListL@CApaScanningFileRecognizer@@QAEXABV?$CArrayFixFlat@VTRecognizer@CApaScanningFileRecognizer@@@@@Z @ 19 NONAME ABSENT + ?TempPath@CApaScanningAppFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 20 NONAME ABSENT + ?TempPath@Apfile@@SA?AVTPtrC16@@XZ @ 21 NONAME ABSENT + ??ACApaScanningFileRecognizer@@QBEABVRRecognizer@0@H@Z @ 22 NONAME ABSENT ; class CApaScanningFileRecognizer::RRecognizer const & CApaScanningFileRecognizer::operator[](int) const + ?SetRecognizerL@CApaScanningFileRecognizer@@QAEXABVTRecognizer@1@@Z @ 23 NONAME ABSENT + ?UpdateCounter@CApaScanningFileRecognizer@@QBEHXZ @ 24 NONAME ABSENT + ??1CApaScanningControlFinder@@UAE@XZ @ 25 NONAME ABSENT + ?DefaultAppInfoFileName@CApaScanningControlFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 26 NONAME ABSENT + ?FindAllAppsL@CApaScanningControlFinder@@UAEXXZ @ 27 NONAME ABSENT + ?FindAppL@CApaScanningControlFinder@@UAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 28 NONAME ABSENT + ?NewL@CApaScanningControlFinder@@SAPAV1@ABVRFs@@@Z @ 29 NONAME ABSENT + ?NewLC@CApaScanningControlFinder@@SAPAV1@ABVRFs@@@Z @ 30 NONAME ABSENT + ?NextL@CApaScanningControlFinder@@UAEHAAVTApaAppEntry@@@Z @ 31 NONAME ABSENT + ?TempPath@CApaScanningControlFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 32 NONAME ABSENT + ?SetEcomRecognizerL@CApaScanningFileRecognizer@@QAEXABVRRecognizer@1@@Z @ 33 NONAME ABSENT + ?SetEcomRecognizersFromListL@CApaScanningFileRecognizer@@QAEXABV?$CArrayFixFlat@VRRecognizer@CApaScanningFileRecognizer@@@@@Z @ 34 NONAME ABSENT + ?FindAllAppsL@CApaAppRegFinder@@QAEXXZ @ 35 NONAME ABSENT ; void CApaAppRegFinder::FindAllAppsL(void) + ?FindAppL@CApaAppRegFinder@@QAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 36 NONAME ABSENT ; class TBuf<256> CApaAppRegFinder::FindAppL(class TDesC16 const &, class TUid) + ?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 37 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &) + ?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &) + ?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABV?$RPointerArray@VHBufC16@@@@@Z @ 39 NONAME ABSENT ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class RPointerArray const &) + ?TempPath@CApaAppRegFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 40 NONAME ABSENT ; class TBuf<256> CApaAppRegFinder::TempPath(void) const + ??1CAppLaunchChecker@@UAE@XZ @ 41 NONAME ; CAppLaunchChecker::~CAppLaunchChecker(void) + ??ACApaScanningRuleBasedPlugIns@@QBEPAVCAppLaunchChecker@@H@Z @ 42 NONAME ; class CAppLaunchChecker * CApaScanningRuleBasedPlugIns::operator[](int) const + ??1CApaScanningRuleBasedPlugIns@@UAE@XZ @ 43 NONAME ; CApaScanningRuleBasedPlugIns::~CApaScanningRuleBasedPlugIns(void) + ?NewL@CApaScanningRuleBasedPlugIns@@SAPAV1@XZ @ 44 NONAME ; class CApaScanningRuleBasedPlugIns * CApaScanningRuleBasedPlugIns::NewL(void) + ?ScanForRuleBasedPlugInsL@CApaScanningRuleBasedPlugIns@@QAEXXZ @ 45 NONAME ; void CApaScanningRuleBasedPlugIns::ScanForRuleBasedPlugInsL(void) + ?ImplementationCount@CApaScanningRuleBasedPlugIns@@QBEHXZ @ 46 NONAME ; int CApaScanningRuleBasedPlugIns::ImplementationCount(void) const + ?Reserved_1@CAppLaunchChecker@@EAEXXZ @ 47 NONAME ; void CAppLaunchChecker::Reserved_1(void) + ?Reserved_2@CAppLaunchChecker@@EAEXXZ @ 48 NONAME ; void CAppLaunchChecker::Reserved_2(void) + ?Reserved_3@CAppLaunchChecker@@EAEXXZ @ 49 NONAME ; void CAppLaunchChecker::Reserved_3(void) + ??1CAppSidChecker@@UAE@XZ @ 50 NONAME ABSENT ; CAppSidChecker::~CAppSidChecker(void) + ?SetRescanCallBackL@CAppSidChecker@@UAEXABVTCallBack@@@Z @ 51 NONAME ABSENT ; void CAppSidChecker::SetRescanCallBackL(class TCallBack const &) + ?reserved1@CAppSidChecker@@EAEXXZ @ 52 NONAME ABSENT ; void CAppSidChecker::reserved1(void) + ?reserved2@CAppSidChecker@@EAEXXZ @ 53 NONAME ABSENT ; void CAppSidChecker::reserved2(void) + ?reserved3@CAppSidChecker@@EAEXXZ @ 54 NONAME ABSENT ; void CAppSidChecker::reserved3(void) + ?DriveList@CApaAppRegFinder@@QBEABV?$RArray@VTDriveUnitInfo@@@@XZ @ 55 NONAME ABSENT ; class RArray const & CApaAppRegFinder::DriveList(void) const + ?FindAllRemovableMediaAppsL@CApaAppRegFinder@@QAEXXZ @ 56 NONAME ABSENT ; void CApaAppRegFinder::FindAllRemovableMediaAppsL(void) + ??1CApaAppInstallationMonitor@@UAE@XZ @ 57 NONAME ; CApaAppInstallationMonitor::~CApaAppInstallationMonitor(void) + ?NewL@CApaAppInstallationMonitor@@SAPAV1@PAVCApaAppArcServer@@@Z @ 58 NONAME ; class CApaAppInstallationMonitor * CApaAppInstallationMonitor::NewL(class CApaAppArcServer *) + ?Start@CApaAppInstallationMonitor@@QAEXXZ @ 59 NONAME ; void CApaAppInstallationMonitor::Start(void) + ??1CApfMimeContentPolicy@@UAE@XZ @ 60 NONAME ; CApfMimeContentPolicy::~CApfMimeContentPolicy(void) + ?IsClosedExtension@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 61 NONAME ; int CApfMimeContentPolicy::IsClosedExtension(class TDesC16 const &) + ?IsClosedFileL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 62 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class RFile &) + ?IsClosedFileL@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 63 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class TDesC16 const &) + ?IsClosedType@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 64 NONAME ; int CApfMimeContentPolicy::IsClosedType(class TDesC16 const &) + ?IsDRMEnvelopeL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 65 NONAME ; int CApfMimeContentPolicy::IsDRMEnvelopeL(class RFile &) + ?IsDRMEnvelopeL@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 66 NONAME ; int CApfMimeContentPolicy::IsDRMEnvelopeL(class TDesC16 const &) + ?NewL@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 67 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(class RFs &) + ?NewL@CApfMimeContentPolicy@@SAPAV1@XZ @ 68 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(void) + ?NewLC@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 69 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(class RFs &) + ?NewLC@CApfMimeContentPolicy@@SAPAV1@XZ @ 70 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(void) + + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/apgrfx_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/apgrfx_legacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,344 @@ +EXPORTS + ??0RApaLsSession@@QAE@XZ @ 1 NONAME ; public: __thiscall RApaLsSession::RApaLsSession(void) + ??0TApaPictureFactory@@QAE@PAVCApaProcess@@@Z @ 2 NONAME ; public: __thiscall TApaPictureFactory::TApaPictureFactory(class CApaProcess *) + ??0TApaTask@@QAE@AAVRWsSession@@@Z @ 3 NONAME ; public: __thiscall TApaTask::TApaTask(class RWsSession &) + ??0TApaTaskList@@QAE@AAVRWsSession@@@Z @ 4 NONAME ; public: __thiscall TApaTaskList::TApaTaskList(class RWsSession &) + ??1CApaAppInfoFileReader@@UAE@XZ @ 5 NONAME ABSENT ; public: virtual __thiscall CApaAppInfoFileReader::~CApaAppInfoFileReader(void) + ??1CApaAppInfoFileWriter@@UAE@XZ @ 6 NONAME ABSENT ; public: virtual __thiscall CApaAppInfoFileWriter::~CApaAppInfoFileWriter(void) + ??1CApaAppList@@UAE@XZ @ 7 NONAME ABSENT ; public: virtual __thiscall CApaAppList::~CApaAppList(void) + ??1CApaDoor@@UAE@XZ @ 8 NONAME ; public: virtual __thiscall CApaDoor::~CApaDoor(void) + ??1CApaMaskedBitmap@@UAE@XZ @ 9 NONAME ; public: virtual __thiscall CApaMaskedBitmap::~CApaMaskedBitmap(void) + ??1CApaWindowGroupName@@UAE@XZ @ 10 NONAME ; public: virtual __thiscall CApaWindowGroupName::~CApaWindowGroupName(void) + ?AddCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@@Z @ 11 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddCaptionL(enum TLanguage,class TDesC16 const &) + ?AddIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@@Z @ 12 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddIconL(class CApaMaskedBitmap &) + ?AddIconL@CApaAppInfoFileWriter@@QAEXABVTDesC16@@@Z @ 13 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddIconL(class TDesC16 const &) + ?AppCount@RApaLsSession@@QBEHAAH@Z @ 14 NONAME ; public: int __thiscall RApaLsSession::AppCount(int &)const + ?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 15 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::AppDataByUid(class TUid)const + ?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 16 NONAME ABSENT ; public: class TApaAppEntry __thiscall CApaAppData::AppEntry(void)const + ?AppUid@CApaWindowGroupName@@QBE?AVTUid@@XZ @ 17 NONAME ; public: class TUid __thiscall CApaWindowGroupName::AppUid(void)const + ?AppUidL@CApaDoor@@QBE?AVTUid@@XZ @ 18 NONAME ; public: class TUid __thiscall CApaDoor::AppUidL(void)const + ?BringToForeground@TApaTask@@QAEXXZ @ 19 NONAME ; public: void __thiscall TApaTask::BringToForeground(void) + ?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 20 NONAME ABSENT ; public: void __thiscall CApaAppData::Capability(class TDes8 &)const + ?Capability@CApaAppInfoFileReader@@QBEXAAVTDes8@@@Z @ 21 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::Capability(class TDes8 &)const + ?Caption@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 22 NONAME ; public: class TPtrC16 __thiscall CApaWindowGroupName::Caption(void)const + ?CaptionL@CApaAppInfoFileReader@@QAE?AV?$TBuf@$0BAA@@@W4TLanguage@@@Z @ 23 NONAME ABSENT ; public: class TBuf<256> __thiscall CApaAppInfoFileReader::CaptionL(enum TLanguage) + ?Connect@RApaLsSession@@QAEHXZ @ 24 NONAME ; public: int __thiscall RApaLsSession::Connect(void) + ?ConstructFromWgIdL@CApaWindowGroupName@@QAEXH@Z @ 25 NONAME ; public: void __thiscall CApaWindowGroupName::ConstructFromWgIdL(int) + ?Count@CApaAppList@@QBEHXZ @ 26 NONAME ABSENT ; public: int __thiscall CApaAppList::Count(void)const + ?CreateMaskedBitmapL@CApaAppInfoFileReader@@QAEPAVCApaMaskedBitmap@@H@Z @ 27 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppInfoFileReader::CreateMaskedBitmapL(int) + ?CycleTasks@TApaTaskList@@QAEHVTUid@@W4TCycleDirection@1@@Z @ 28 NONAME ; public: int __thiscall TApaTaskList::CycleTasks(class TUid,enum TApaTaskList::TCycleDirection) + ?DocName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 29 NONAME ; public: class TPtrC16 __thiscall CApaWindowGroupName::DocName(void)const + ?DocNameIsAFile@CApaWindowGroupName@@QBEHXZ @ 30 NONAME ; public: int __thiscall CApaWindowGroupName::DocNameIsAFile(void)const + ?DocumentL@CApaDoor@@QAEPAVCApaDocument@@H@Z @ 31 NONAME ; public: class CApaDocument * __thiscall CApaDoor::DocumentL(int) + ?EmbeddableAppCount@RApaLsSession@@QBEHAAH@Z @ 32 NONAME ; public: int __thiscall RApaLsSession::EmbeddableAppCount(int &)const + ?EndTask@TApaTask@@QAEXXZ @ 33 NONAME ; public: void __thiscall TApaTask::EndTask(void) + ?Exists@TApaTask@@QBEHXZ @ 34 NONAME ; public: int __thiscall TApaTask::Exists(void)const + ?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 35 NONAME ; public: void __thiscall CApaMaskedBitmap::ExternalizeL(class RWriteStream &)const + ?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 36 NONAME ; public: class TApaTask __thiscall TApaTaskList::FindApp(class TDesC16 const &) + ?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 37 NONAME ; public: class TApaTask __thiscall TApaTaskList::FindApp(class TUid) + ?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 38 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByAppUid(class TUid,class RWsSession &,int &) + ?FindByCaption@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 39 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByCaption(class TDesC16 const &,class RWsSession &,int &) + ?FindByDocName@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 40 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByDocName(class TDesC16 const &,class RWsSession &,int &) + ?FindByPos@TApaTaskList@@QAE?AVTApaTask@@H@Z @ 41 NONAME ; public: class TApaTask __thiscall TApaTaskList::FindByPos(int) + ?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 42 NONAME ; public: class TApaTask __thiscall TApaTaskList::FindDoc(class TDesC16 const &) + ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 43 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::FirstApp(void)const + ?GetAllApps@RApaLsSession@@QBEHXZ @ 44 NONAME ; public: int __thiscall RApaLsSession::GetAllApps(void)const + ?GetAppCapability@RApaLsSession@@QBEHAAVTDes8@@VTUid@@@Z @ 45 NONAME ; public: int __thiscall RApaLsSession::GetAppCapability(class TDes8 &,class TUid)const + ?GetAppInfo@RApaLsSession@@QBEHAAVTApaAppInfo@@VTUid@@@Z @ 46 NONAME ; public: int __thiscall RApaLsSession::GetAppInfo(class TApaAppInfo &,class TUid)const + ?GetEmbeddableApps@RApaLsSession@@QBEHXZ @ 47 NONAME ; public: int __thiscall RApaLsSession::GetEmbeddableApps(void)const + ?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@@Z @ 48 NONAME ; public: int __thiscall RApaLsSession::GetNextApp(class TApaAppInfo &)const + ?InternalizeL@CApaMaskedBitmap@@QAEXAAVRReadStream@@@Z @ 49 NONAME ; public: void __thiscall CApaMaskedBitmap::InternalizeL(class RReadStream &) + ?IsBusy@CApaWindowGroupName@@QBEHXZ @ 50 NONAME ; public: int __thiscall CApaWindowGroupName::IsBusy(void)const + ?IsSystem@CApaWindowGroupName@@QBEHXZ @ 51 NONAME ; public: int __thiscall CApaWindowGroupName::IsSystem(void)const + ?KillTask@TApaTask@@QAEXXZ @ 52 NONAME ; public: void __thiscall TApaTask::KillTask(void) + ?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 53 NONAME ; public: class CFbsBitmap * __thiscall CApaMaskedBitmap::Mask(void)const + ?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 54 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::New(class RWsSession const &,class HBufC16 *) + ?NewL@CApaAppInfoFileReader@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 55 NONAME ABSENT ; public: static class CApaAppInfoFileReader * __cdecl CApaAppInfoFileReader::NewL(class RFs &,class TDesC16 const &,class TUid) + ?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 56 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int) + ?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 57 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewL(class RFs &,class CApaDocument &,class TSize const &) + ?NewL@CApaDoor@@SAPAV1@AAVRFs@@ABVCStreamStore@@VTStreamId@@AAVCApaProcess@@@Z @ 58 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewL(class RFs &,class CStreamStore const &,class TStreamId,class CApaProcess &) + ?NewL@CApaMaskedBitmap@@SAPAV1@PBV1@@Z @ 59 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewL(class CApaMaskedBitmap const *) + ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 60 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &) + ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 61 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &,class TDesC16 const &) + ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 62 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &,int) + ?NewLC@CApaAppInfoFileReader@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 63 NONAME ABSENT ; public: static class CApaAppInfoFileReader * __cdecl CApaAppInfoFileReader::NewLC(class RFs &,class TDesC16 const &,class TUid) + ?NewLC@CApaAppInfoFileWriter@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 64 NONAME ABSENT ; public: static class CApaAppInfoFileWriter * __cdecl CApaAppInfoFileWriter::NewLC(class RFs &,class TDesC16 const &,class TUid) + ?NewLC@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 65 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewLC(class RFs &,class CApaDocument &,class TSize const &) + ?NewLC@CApaMaskedBitmap@@SAPAV1@XZ @ 66 NONAME ; public: static class CApaMaskedBitmap * __cdecl CApaMaskedBitmap::NewLC(void) + ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 67 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &) + ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 68 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &,class TDesC16 const &) + ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 69 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &,int) + ?NewPictureL@TApaPictureFactory@@UBEXAAVTPictureHeader@@ABVCStreamStore@@@Z @ 70 NONAME ; public: virtual void __thiscall TApaPictureFactory::NewPictureL(class TPictureHeader &,class CStreamStore const &)const + ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 71 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::NextApp(class CApaAppData const *)const + ?PurgeL@CApaAppList@@QAEXXZ @ 72 NONAME ABSENT ; public: void __thiscall CApaAppList::PurgeL(void) + ?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 73 NONAME ; public: int __thiscall CApaWindowGroupName::RespondsToShutdownEvent(void)const + ?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 74 NONAME ; public: int __thiscall CApaWindowGroupName::RespondsToSwitchFilesEvent(void)const + ?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 75 NONAME ; public: void __thiscall CApaDoor::RestoreL(class CStreamStore const &,class TStreamId) + ?SendKey@TApaTask@@QAEXABUTKeyEvent@@@Z @ 76 NONAME ; public: void __thiscall TApaTask::SendKey(struct TKeyEvent const &) + ?SendKey@TApaTask@@QAEXHH@Z @ 77 NONAME ; public: void __thiscall TApaTask::SendKey(int,int) + ?SendMessage@TApaTask@@QAEHVTUid@@ABVTDesC8@@@Z @ 78 NONAME ; public: int __thiscall TApaTask::SendMessage(class TUid,class TDesC8 const &) + ?SendSystemEvent@TApaTask@@QAEXW4TApaSystemEvent@@@Z @ 79 NONAME ; public: void __thiscall TApaTask::SendSystemEvent(enum TApaSystemEvent) + ?SendToBackground@TApaTask@@QAEXXZ @ 80 NONAME ; public: void __thiscall TApaTask::SendToBackground(void) + ?SetAppUid@CApaWindowGroupName@@QAEXVTUid@@@Z @ 81 NONAME ; public: void __thiscall CApaWindowGroupName::SetAppUid(class TUid) + ?SetBusy@CApaWindowGroupName@@QAEXH@Z @ 82 NONAME ; public: void __thiscall CApaWindowGroupName::SetBusy(int) + ?SetCapability@CApaAppInfoFileWriter@@QAEHABVTDesC8@@@Z @ 83 NONAME ABSENT ; public: int __thiscall CApaAppInfoFileWriter::SetCapability(class TDesC8 const &) + ?SetCaptionL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 84 NONAME ; public: void __thiscall CApaWindowGroupName::SetCaptionL(class TDesC16 const &) + ?SetDocNameIsAFile@CApaWindowGroupName@@QAEXH@Z @ 85 NONAME ; public: void __thiscall CApaWindowGroupName::SetDocNameIsAFile(int) + ?SetDocNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 86 NONAME ; public: void __thiscall CApaWindowGroupName::SetDocNameL(class TDesC16 const &) + ?SetFormatToGlassL@CApaDoor@@QAEXXZ @ 87 NONAME ; public: void __thiscall CApaDoor::SetFormatToGlassL(void) + ?SetFormatToIconL@CApaDoor@@QAEXXZ @ 88 NONAME ; public: void __thiscall CApaDoor::SetFormatToIconL(void) + ?SetFormatToTemporaryIconL@CApaDoor@@QAEXH@Z @ 89 NONAME ; public: void __thiscall CApaDoor::SetFormatToTemporaryIconL(int) + ?SetRespondsToShutdownEvent@CApaWindowGroupName@@QAEXH@Z @ 90 NONAME ; public: void __thiscall CApaWindowGroupName::SetRespondsToShutdownEvent(int) + ?SetRespondsToSwitchFilesEvent@CApaWindowGroupName@@QAEXH@Z @ 91 NONAME ; public: void __thiscall CApaWindowGroupName::SetRespondsToSwitchFilesEvent(int) + ?SetSystem@CApaWindowGroupName@@QAEXH@Z @ 92 NONAME ; public: void __thiscall CApaWindowGroupName::SetSystem(int) + ?SetWgId@TApaTask@@QAEXH@Z @ 93 NONAME ; public: void __thiscall TApaTask::SetWgId(int) + ?SetWindowGroupName@CApaWindowGroupName@@QAEXPAVHBufC16@@@Z @ 94 NONAME ; public: void __thiscall CApaWindowGroupName::SetWindowGroupName(class HBufC16 *) + ?SetWindowGroupName@CApaWindowGroupName@@QBEHAAVRWindowGroup@@@Z @ 95 NONAME ; public: int __thiscall CApaWindowGroupName::SetWindowGroupName(class RWindowGroup &)const + ?SetWindowGroupNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 96 NONAME ; public: void __thiscall CApaWindowGroupName::SetWindowGroupNameL(class TDesC16 const &) + ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@@Z @ 97 NONAME ; public: int __thiscall RApaLsSession::StartApp(class CApaCommandLine const &) + ?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 98 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::StoreL(void) + ?StretchDrawL@CApaAppInfoFileReader@@SAXPAVCFbsBitmap@@0VTSize@@@Z @ 99 NONAME ABSENT ; public: static void __cdecl CApaAppInfoFileReader::StretchDrawL(class CFbsBitmap *,class CFbsBitmap *,class TSize) + ?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 100 NONAME ; public: int __thiscall TApaTask::SwitchCreateFile(class TDesC16 const &) + ?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 101 NONAME ; public: int __thiscall TApaTask::SwitchOpenFile(class TDesC16 const &) + ?ThreadId@TApaTask@@QBE?AVTThreadId@@XZ @ 102 NONAME ; public: class TThreadId __thiscall TApaTask::ThreadId(void)const + ?UpdateCounter@CApaAppList@@QBEHXZ @ 103 NONAME ABSENT ; public: int __thiscall CApaAppList::UpdateCounter(void)const + ?UpdateL@CApaAppList@@QAEXXZ @ 104 NONAME ABSENT ; public: void __thiscall CApaAppList::UpdateL(void) + ?Version@RApaLsSession@@QBE?AVTVersion@@XZ @ 105 NONAME ; public: class TVersion __thiscall RApaLsSession::Version(void)const + ?WgId@TApaTask@@QBEHXZ @ 106 NONAME ; public: int __thiscall TApaTask::WgId(void)const + ?WindowGroupName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 107 NONAME ; public: class TPtrC16 __thiscall CApaWindowGroupName::WindowGroupName(void)const + ??1CApaSystemControlList@@UAE@XZ @ 108 NONAME ; public: virtual __thiscall CApaSystemControlList::~CApaSystemControlList(void) + ?Caption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 109 NONAME ; public: class TPtrC16 __thiscall CApaSystemControl::Caption(void)const + ?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@H@Z @ 110 NONAME ; public: class CApaSystemControl * __thiscall CApaSystemControlList::Control(int)const + ?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@VTUid@@@Z @ 111 NONAME ; public: class CApaSystemControl * __thiscall CApaSystemControlList::Control(class TUid)const + ?Count@CApaSystemControlList@@QBEHXZ @ 112 NONAME ; public: int __thiscall CApaSystemControlList::Count(void)const + ?CreateL@CApaSystemControl@@QAEXXZ @ 113 NONAME ; public: void __thiscall CApaSystemControl::CreateL(void) + ?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 114 NONAME ; public: class TBuf<256> __thiscall CApaSystemControl::FileName(void)const + ?Icon@CApaSystemControl@@QBEPAVCApaMaskedBitmap@@XZ @ 115 NONAME ; public: class CApaMaskedBitmap * __thiscall CApaSystemControl::Icon(void)const + ?Index@CApaSystemControlList@@QBEHVTUid@@@Z @ 116 NONAME ; public: int __thiscall CApaSystemControlList::Index(class TUid)const + ?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@AAVCApaAppFinder@@ABVTDesC16@@@Z @ 117 NONAME ABSENT ; public: static class CApaSystemControlList * __cdecl CApaSystemControlList::NewL(class RFs &,class CApaAppFinder &,class TDesC16 const &) + ?Type@CApaSystemControl@@QBE?AVTUid@@XZ @ 118 NONAME ; public: class TUid __thiscall CApaSystemControl::Type(void)const + ?UpdateL@CApaSystemControlList@@QAEXXZ @ 119 NONAME ; public: void __thiscall CApaSystemControlList::UpdateL(void) + ?AddDataTypeL@CApaAppInfoFileWriter@@QAEXABVTDataTypeWithPriority@@@Z @ 120 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddDataTypeL(class TDataTypeWithPriority const &) + ?AppForDataType@RApaLsSession@@QBEHABVTDataType@@AAVTUid@@@Z @ 121 NONAME ; public: int __thiscall RApaLsSession::AppForDataType(class TDataType const &,class TUid &)const + ?AppForDocument@RApaLsSession@@QBEHABVTDesC16@@AAVTUid@@AAVTDataType@@@Z @ 122 NONAME ; public: int __thiscall RApaLsSession::AppForDocument(class TDesC16 const &,class TUid &,class TDataType &)const + ?CreateDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 123 NONAME ; public: int __thiscall RApaLsSession::CreateDocument(class TDesC16 const &,class TUid,class TThreadId &,enum RApaLsSession::TLaunchType) + ?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 124 NONAME ABSENT ; long CApaAppData::DataType(class TDataType const &) const + ?DataTypesSupportedL@CApaAppInfoFileReader@@QBEXAAV?$CArrayFix@VTDataTypeWithPriority@@@@@Z @ 125 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::DataTypesSupportedL(class CArrayFix &)const + ?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 126 NONAME ; public: int __thiscall RApaLsSession::GetAcceptedConfidence(int &)const + ?GetAppIcon@RApaLsSession@@QBEHVTUid@@HAAVCApaMaskedBitmap@@@Z @ 127 NONAME ; public: int __thiscall RApaLsSession::GetAppIcon(class TUid,int,class CApaMaskedBitmap &)const + ?GetMaxDataBufSize@RApaLsSession@@QBEHAAH@Z @ 128 NONAME ; public: int __thiscall RApaLsSession::GetMaxDataBufSize(int &)const + ?GetSupportedDataTypesL@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTDataType@@@@@Z @ 129 NONAME ; public: int __thiscall RApaLsSession::GetSupportedDataTypesL(class CArrayFixFlat &)const + ?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 130 NONAME ; public: int __thiscall RApaLsSession::IsProgram(class TDesC16 const &,int &)const + ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 131 NONAME ABSENT ; public: class TUid __thiscall CApaAppList::PreferredDataHandlerL(class TDataType const &)const + ?RecognizeData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 132 NONAME ; public: int __thiscall RApaLsSession::RecognizeData(class TDesC16 const &,class TDesC8 const &,class TDataRecognitionResult &)const + ?RecognizeSpecificData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@ABVTDataType@@AAH@Z @ 133 NONAME ; public: int __thiscall RApaLsSession::RecognizeSpecificData(class TDesC16 const &,class TDesC8 const &,class TDataType const &,int &)const + ?SetAcceptedConfidence@RApaLsSession@@QAEHH@Z @ 134 NONAME ; public: int __thiscall RApaLsSession::SetAcceptedConfidence(int) + ?SetMaxDataBufSize@RApaLsSession@@QAEHH@Z @ 135 NONAME ; public: int __thiscall RApaLsSession::SetMaxDataBufSize(int) + ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@AAVTThreadId@@W4TLaunchType@1@@Z @ 136 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TThreadId &,enum RApaLsSession::TLaunchType) + ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@ABVTDataType@@AAVTThreadId@@W4TLaunchType@1@@Z @ 137 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TDataType const &,class TThreadId &,enum RApaLsSession::TLaunchType) + ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 138 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TUid,class TThreadId &,enum RApaLsSession::TLaunchType) + ?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 139 NONAME ABSENT ; public: void __thiscall CApaAppList::StartIdleUpdateL(void) + ??1CApaAppListNotifier@@UAE@XZ @ 140 NONAME ; public: virtual __thiscall CApaAppListNotifier::~CApaAppListNotifier(void) + ?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 141 NONAME ; public: static class CApaAppListNotifier * __cdecl CApaAppListNotifier::NewL(class MApaAppListServObserver *,enum CActive::TPriority) + ?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 142 NONAME ABSENT ; public: void __thiscall CApaAppList::StartIdleUpdateL(class MApaAppListObserver *) + ?GetAppIcon@RApaLsSession@@QBEHVTUid@@VTSize@@AAVCApaMaskedBitmap@@@Z @ 143 NONAME ; public: int __thiscall RApaLsSession::GetAppIcon(class TUid,class TSize,class CApaMaskedBitmap &)const + ?GetAppIconSizes@RApaLsSession@@QBEHVTUid@@AAV?$CArrayFixFlat@VTSize@@@@@Z @ 144 NONAME ; public: int __thiscall RApaLsSession::GetAppIconSizes(class TUid,class CArrayFixFlat &)const + ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 145 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppData::Icon(class TSize)const + ?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 146 NONAME ABSENT ; public: class CArrayFixFlat * __thiscall CApaAppData::IconSizesL(void)const + ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 147 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppData::Icon(int)const + ?Hidden@CApaWindowGroupName@@QBEHXZ @ 148 NONAME ; int CApaWindowGroupName::Hidden(void) const + ?SetHidden@CApaWindowGroupName@@QAEXH@Z @ 149 NONAME ; public: void __thiscall CApaWindowGroupName::SetHidden(int) + ?AddViewCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@VTUid@@@Z @ 150 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewCaptionL(enum TLanguage,class TDesC16 const &,class TUid) + ?AddViewIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@VTUid@@@Z @ 151 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewIconL(class CApaMaskedBitmap &,class TUid) + ?AddViewL@CApaAppInfoFileWriter@@QAEXVTUid@@@Z @ 152 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewL(class TUid) + ?CaptionL@CApaAIFViewData@@QBE?AV?$TBuf@$0BAA@@@W4TLanguage@@@Z @ 153 NONAME ABSENT ; public: class TBuf<256> __thiscall CApaAIFViewData::CaptionL(enum TLanguage)const + ?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0ABVTSize@@AAVCApaMaskedBitmap@@@Z @ 154 NONAME ; public: int __thiscall RApaLsSession::GetAppViewIcon(class TUid,class TUid,class TSize const &,class CApaMaskedBitmap &)const + ?GetAppViews@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTApaAppViewInfo@@@@VTUid@@@Z @ 155 NONAME ; public: int __thiscall RApaLsSession::GetAppViews(class CArrayFixFlat &,class TUid)const + ?GetViewsL@CApaAppInfoFileReader@@QBEXAAV?$CArrayPtr@VCApaAIFViewData@@@@@Z @ 156 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::GetViewsL(class CArrayPtr &)const + ?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 157 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppViewData::Icon(class TSize const &)const + ?IconByIndexL@CApaAIFViewData@@QBEPAVCApaMaskedBitmap@@H@Z @ 158 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAIFViewData::IconByIndexL(int)const + ?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 159 NONAME ABSENT ; public: class CArrayFixFlat * __thiscall CApaAppViewData::IconSizesL(void)const + ?NumberOfIcons@CApaAIFViewData@@QBEHXZ @ 160 NONAME ABSENT ; public: int __thiscall CApaAIFViewData::NumberOfIcons(void)const + ?StoreViewL@CApaAppInfoFileWriter@@QAEXVTUid@@@Z @ 161 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::StoreViewL(class TUid) + ?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 162 NONAME ABSENT ; public: class TUid __thiscall CApaAppViewData::Uid(void)const + ?ViewUid@CApaAIFViewData@@QBE?AVTUid@@XZ @ 163 NONAME ABSENT ; public: class TUid __thiscall CApaAIFViewData::ViewUid(void)const + ?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 164 NONAME ABSENT ; public: class CArrayPtrFlat * __thiscall CApaAppData::Views(void)const + ?AddOwnedFileL@CApaAppInfoFileWriter@@QAEXABVTDesC16@@@Z @ 165 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddOwnedFileL(class TDesC16 const &) + ?GetOwnedFilesL@CApaAppInfoFileReader@@QBEXAAVCDesC16Array@@@Z @ 166 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::GetOwnedFilesL(class CDesC16Array &)const + ?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 167 NONAME ABSENT ; public: class CDesC16Array * __thiscall CApaAppData::OwnedFiles(void)const + ?GetAppOwnedFiles@RApaLsSession@@QBEHAAVCDesC16Array@@VTUid@@@Z @ 168 NONAME ; public: int __thiscall RApaLsSession::GetAppOwnedFiles(class CDesC16Array &,class TUid)const + ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@@Z @ 169 NONAME ; public: int __thiscall RApaLsSession::StartApp(class CApaCommandLine const &,class TThreadId &) + ?GetAifFileName@AppInfoFileUtils@@SAXABVRFs@@AAVTDes16@@@Z @ 170 NONAME ABSENT ; public: static void __cdecl AppInfoFileUtils::GetAifFileName(class RFs const &,class TDes16 &) + ?AddViewL@CApaAppInfoFileWriter@@QAEXVTUid@@H@Z @ 171 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewL(class TUid,int) + ?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 172 NONAME ABSENT ; public: int __thiscall CApaAppData::CanUseScreenMode(int) + ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 173 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::FirstApp(int)const + ?GetAllApps@RApaLsSession@@QBEHH@Z @ 174 NONAME ; public: int __thiscall RApaLsSession::GetAllApps(int)const + ?GetEmbeddableApps@RApaLsSession@@QBEHH@Z @ 175 NONAME ; public: int __thiscall RApaLsSession::GetEmbeddableApps(int)const + ?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@H@Z @ 176 NONAME ; public: int __thiscall RApaLsSession::GetNextApp(class TApaAppInfo &,int)const + ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 177 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::NextApp(class CApaAppData const *,int)const + ?ScreenMode@CApaAIFViewData@@QBEHXZ @ 178 NONAME ABSENT ; public: int __thiscall CApaAIFViewData::ScreenMode(void)const + ?ScreenMode@CApaAppViewData@@QBEHXZ @ 179 NONAME ABSENT ; public: int __thiscall CApaAppViewData::ScreenMode(void)const + ?ShortCaption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 180 NONAME ; public: class TPtrC16 __thiscall CApaSystemControl::ShortCaption(void)const + ?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 181 NONAME ABSENT ; public: int __thiscall CApaAppList::IsIdleUpdateComplete(void)const + ?IsAppReady@CApaWindowGroupName@@QBEHXZ @ 182 NONAME ; public: int __thiscall CApaWindowGroupName::IsAppReady(void)const + ?SetAppReady@CApaWindowGroupName@@QAEXH@Z @ 183 NONAME ; public: void __thiscall CApaWindowGroupName::SetAppReady(int) + ?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 184 NONAME ABSENT ; public: void __thiscall CApaAppList::InitListL(class MApaAppListObserver *) + ?NumberOfBitmaps@CApaAppInfoFileReader@@QBEHXZ @ 185 NONAME ABSENT ; public: int __thiscall CApaAppInfoFileReader::NumberOfBitmaps(void)const + ?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 186 NONAME ABSENT ; public: int __thiscall CApaAppList::IsFirstScanComplete(void)const + ?SetMaskBitmap@CApaMaskedBitmap@@QAEXPAVCFbsBitmap@@@Z @ 187 NONAME ; public: void __thiscall CApaMaskedBitmap::SetMaskBitmap(class CFbsBitmap *) + ?GetAppInfo_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@VTUid@@@Z @ 188 NONAME ABSENT ; int RApaLsSession::GetAppInfo_7_0(class TApaAppInfo_7_0 &, class TUid) const + ?GetNextApp_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@@Z @ 189 NONAME ABSENT ; int RApaLsSession::GetNextApp_7_0(class TApaAppInfo_7_0 &) const + ?GetNextApp_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@H@Z @ 190 NONAME ABSENT ; int RApaLsSession::GetNextApp_7_0(class TApaAppInfo_7_0 &, int) const + ?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 191 NONAME ABSENT ; void CApaAppData::GetIconInfo(int &, int &) const + ?NumberOfOwnDefinedIcons@RApaLsSession@@QBEHVTUid@@AAH@Z @ 192 NONAME ; public: int __thiscall RApaLsSession::NumberOfOwnDefinedIcons(class TUid,int &)const + ?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@@Z @ 193 NONAME ; public: int __thiscall RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &)const + ?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@H@Z @ 194 NONAME ; public: int __thiscall RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &,int)const + ?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppFinder@@PAVCApaAppRegFinder@@H@Z @ 195 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppFinder *, class CApaAppRegFinder *, int) + ?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 196 NONAME ABSENT ; unsigned int CApaAppData::DefaultScreenNumber(void) const + ?GetFilteredApps@RApaLsSession@@QBEHII@Z @ 197 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int) const + ?GetFilteredApps@RApaLsSession@@QBEHIIH@Z @ 198 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int, int) const + ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 199 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const + ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAPAVHBufC16@@@Z @ 200 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class HBufC16 * &) const + ?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 201 NONAME ABSENT ; class TPtrC16 CApaAppData::IconFileName(void) const + ?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0AAPAVHBufC16@@@Z @ 202 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class HBufC16 * &) const + ?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 203 NONAME ABSENT ; class TPtrC16 CApaAppViewData::IconFileName(void) const + ?NonMbmIconFile@CApaAppData@@QBEHXZ @ 204 NONAME ABSENT ; int CApaAppData::NonMbmIconFile(void) const + ?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 205 NONAME ABSENT ; int CApaAppViewData::NonMbmIconFile(void) const + ?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 206 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &) + ?StartupApaServerProcess@@YAHXZ @ 207 NONAME ; int StartupApaServerProcess(void) + ?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@@Z @ 208 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &) + ?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@@Z @ 209 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid) + ?InsertDataMappingIfHigher@RApaLsSession@@QAEHABVTDataType@@JVTUid@@AAH@Z @ 210 NONAME ; int RApaLsSession::InsertDataMappingIfHigher(class TDataType const &, long, class TUid, int &) + ?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 211 NONAME ABSENT ; enum TLanguage CApaAppData::ApplicationLanguage(void) const + ?ApplicationLanguage@RApaLsSession@@QBEHVTUid@@AAW4TLanguage@@@Z @ 212 NONAME ; int RApaLsSession::ApplicationLanguage(class TUid, enum TLanguage &) const + ?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@@Z @ 213 NONAME ; class CApaSystemControlList * CApaSystemControlList::NewL(class RFs &) + ?AppForDataTypeAndService@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 214 NONAME ; int RApaLsSession::AppForDataTypeAndService(class TDataType const &, class TUid, class TUid &) const + ?AppForDocumentAndService@RApaLsSession@@QBEHABVRFile@@VTUid@@AAV3@AAVTDataType@@@Z @ 215 NONAME ; int RApaLsSession::AppForDocumentAndService(class RFile const &, class TUid, class TUid &, class TDataType &) const + ?AppForDocumentAndService@RApaLsSession@@QBEHABVTDesC16@@VTUid@@AAV3@AAVTDataType@@@Z @ 216 NONAME ; int RApaLsSession::AppForDocumentAndService(class TDesC16 const &, class TUid, class TUid &, class TDataType &) const + ?GetAppServiceOpaqueDataLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@0@Z @ 217 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServiceOpaqueDataLC(class TUid, class TUid) const + ?GetAppServicesL@RApaLsSession@@QBEXVTUid@@AAV?$CArrayFixFlat@VTUid@@@@@Z @ 218 NONAME ; void RApaLsSession::GetAppServicesL(class TUid, class CArrayFixFlat &) const + ?GetAppServicesLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 219 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServicesLC(class TUid) const + ?GetServerApps@RApaLsSession@@QBEHVTUid@@@Z @ 220 NONAME ; int RApaLsSession::GetServerApps(class TUid) const + ?GetServerApps@RApaLsSession@@QBEHVTUid@@H@Z @ 221 NONAME ; int RApaLsSession::GetServerApps(class TUid, int) const + ?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 222 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid) const + ?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 223 NONAME ABSENT ; int CApaAppData::ImplementsService(class TUid) const + ?OpaqueData@TApaAppServiceInfo@@QBEABVTDesC8@@XZ @ 224 NONAME ABSENT ; class TDesC8 const & TApaAppServiceInfo::OpaqueData(void) const + ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 225 NONAME ABSENT ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const + ?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 226 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const + ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 227 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const + ?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 228 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const + ?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 229 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const + ?Uid@TApaAppServiceInfo@@QBE?AVTUid@@XZ @ 230 NONAME ABSENT ; class TUid TApaAppServiceInfo::Uid(void) const + ?StartDocument@RApaLsSession@@QAEHAAVRFile@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 231 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TThreadId &, class TRequestStatus *) + ?CreateMaskedBitmapByIndexLC@CApaAppInfoFileReader@@QAEPAVCApaMaskedBitmap@@H@Z @ 232 NONAME ABSENT ; class CApaMaskedBitmap * CApaAppInfoFileReader::CreateMaskedBitmapByIndexLC(int) + ?CancelListPopulationCompleteObserver@RApaLsSession@@QBEHXZ @ 233 NONAME ; int RApaLsSession::CancelListPopulationCompleteObserver(void) const + ?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 234 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const + ?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 235 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int) + ?CheckInterimFormatFileNotCorruptL@ForJavaMIDletInstaller@@SAXAAVRFile@@@Z @ 236 NONAME ABSENT ; void ForJavaMIDletInstaller::CheckInterimFormatFileNotCorruptL(class RFile &) + ?RegisterJavaMIDletViaIterimFormat@RApaLsSession@@QAEHABVTDesC16@@AAVRFile@@@Z @ 237 NONAME ABSENT ; int RApaLsSession::RegisterJavaMIDletViaIterimFormat(class TDesC16 const &, class RFile &) + ?DeregisterJavaMIDlet@RApaLsSession@@QAEHABVTDesC16@@@Z @ 238 NONAME ABSENT ; int RApaLsSession::DeregisterJavaMIDlet(class TDesC16 const &) + ?AppForDocument@RApaLsSession@@QBEHABVRFile@@AAVTUid@@AAVTDataType@@@Z @ 239 NONAME ; int RApaLsSession::AppForDocument(class RFile const &, class TUid &, class TDataType &) const + ?ClearFsSession@RApaLsSession@@SAXXZ @ 240 NONAME ; void RApaLsSession::ClearFsSession(void) + ?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 241 NONAME ; class RFs * RApaLsSession::FsSession(void) + ?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 242 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const + ?RecognizeSpecificData@RApaLsSession@@QBEHABVRFile@@ABVTDataType@@AAH@Z @ 243 NONAME ; int RApaLsSession::RecognizeSpecificData(class RFile const &, class TDataType const &, int &) const + ?SetFsSessionL@RApaLsSession@@SAXAAVRFs@@@Z @ 244 NONAME ; void RApaLsSession::SetFsSessionL(class RFs &) + ?StartDocument@RApaLsSession@@QAEHAAVRFile@@ABVTDataType@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 245 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TDataType const &, class TThreadId &, class TRequestStatus *) + ?StartDocument@RApaLsSession@@QAEHAAVRFile@@VTUid@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 246 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TUid, class TThreadId &, class TRequestStatus *) + ?GetPreferredBufSize@RApaLsSession@@QBEHAAH@Z @ 247 NONAME ; public: int __thiscall RApaLsSession::GetPreferredBufSize(int &)const + ?GetJavaMIDletInfoL@ForJavaMIDletInstaller@@SAXAAVRFs@@ABVTDesC16@@AAK2@Z @ 248 NONAME ABSENT ; void ForJavaMIDletInstaller::GetJavaMIDletInfoL(class RFs &, class TDesC16 const &, unsigned long &, unsigned long &) + ?HandleAsRegistrationFile@ApaUtils@@SAHABVTUidType@@@Z @ 249 NONAME ABSENT ; int ApaUtils::HandleAsRegistrationFile(class TUidType const &) + ?DataTypes@TApaAppServiceInfo@@QBEABV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 250 NONAME ABSENT ; class CArrayFixFlat const & TApaAppServiceInfo::DataTypes(void) const + ?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@ABVTDataType@@@Z @ 251 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid, class TDataType const &) const + ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 252 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const + ?Close@RApaLsSession@@QAEXXZ @ 253 NONAME ; void RApaLsSession::Close(void) + ??0MApaAppListServObserver@@IAE@XZ @ 254 NONAME ; MApaAppListServObserver::MApaAppListServObserver(void) + ??0TApaPictureFactory@@IAE@XZ @ 255 NONAME ; TApaPictureFactory::TApaPictureFactory(void) + ?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 256 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void) + ?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 257 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void) + ?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 258 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void) + ?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 259 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void) + ??0CDataRecognitionResultArray@@QAE@XZ @ 260 NONAME ; CDataRecognitionResultArray::CDataRecognitionResultArray(void) + ??1CDataRecognitionResultArray@@UAE@XZ @ 261 NONAME ; CDataRecognitionResultArray::~CDataRecognitionResultArray(void) + ?CancelRecognizeFiles@RApaLsSession@@QAEXXZ @ 262 NONAME ; void RApaLsSession::CancelRecognizeFiles(void) + ?Count@CDataRecognitionResultArray@@QBEIXZ @ 263 NONAME ; unsigned int CDataRecognitionResultArray::Count(void) const + ?GetDataRecognitionResultL@CDataRecognitionResultArray@@QBEXAAVTDataRecognitionResult@@I@Z @ 264 NONAME ; void CDataRecognitionResultArray::GetDataRecognitionResultL(class TDataRecognitionResult &, unsigned int) const + ?GetFileNameL@CDataRecognitionResultArray@@QBEXAAV?$TBuf@$0BAA@@@I@Z @ 265 NONAME ; void CDataRecognitionResultArray::GetFileNameL(class TBuf<256> &, unsigned int) const + ?Path@CDataRecognitionResultArray@@QBEABV?$TBuf@$0BAA@@@XZ @ 266 NONAME ; class TBuf<256> const & CDataRecognitionResultArray::Path(void) const + ?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@AAVCDataRecognitionResultArray@@@Z @ 267 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &) const + ?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@@Z @ 268 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &) const + ?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 269 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &, class TRequestStatus &) + ?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 270 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &, class TRequestStatus &) + ?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@1@Z @ 271 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid, class TUid) + ?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@VTUid@@@Z @ 272 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &, class TUid) + ?GetAppByDataType@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 273 NONAME ; int RApaLsSession::GetAppByDataType(class TDataType const &, class TUid, class TUid &) const + ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 274 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &, class TRequestStatus *) + ?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 275 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &) + ?DeregisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@@Z @ 276 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationTypeL(class TUid) + ?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 277 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *) + ?DeregisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@@Z @ 278 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationL(class TUid) + ?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 279 NONAME ABSENT ; class CApaAppData* CApaAppList::AppDataByFileName(class TDesC16 const &) const + ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 280 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const + ?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 281 NONAME ABSENT ; class TPtrC8 CApaAppData::OpaqueData(void) const + ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 282 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const + ?GetDefaultScreenNumber@RApaLsSession@@QBEHAAHVTUid@@@Z @ 283 NONAME ; int RApaLsSession::GetDefaultScreenNumber(int &, class TUid) const + ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 284 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid) + ?MatchesSecurityPolicy@RApaLsSession@@QBEHAAHVTUid@@ABVTSecurityPolicy@@@Z @ 285 NONAME ; int RApaLsSession::MatchesSecurityPolicy(int &, class TUid, class TSecurityPolicy const &) const + ?AddDataTypeL@CApaRegistrationResourceFileWriter@@QAEXHABVTDesC8@@@Z @ 286 NONAME ; void CApaRegistrationResourceFileWriter::AddDataTypeL(int, class TDesC8 const &) + ?AddFileOwnershipInfoL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 287 NONAME ; void CApaRegistrationResourceFileWriter::AddFileOwnershipInfoL(class TDesC16 const &) + ?NewL@CApaLocalisableResourceFileWriter@@SAPAV1@ABVTDesC16@@0H0@Z @ 288 NONAME ; class CApaLocalisableResourceFileWriter * CApaLocalisableResourceFileWriter::NewL(class TDesC16 const &, class TDesC16 const &, int, class TDesC16 const &) + ?NewL@CApaRegistrationResourceFileWriter@@SAPAV1@VTUid@@ABVTDesC16@@I@Z @ 289 NONAME ; class CApaRegistrationResourceFileWriter * CApaRegistrationResourceFileWriter::NewL(class TUid, class TDesC16 const &, unsigned int) + ?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 290 NONAME ABSENT ; class TUid CApaAppData::NonNativeApplicationType(void) const + ?SetAppIsHiddenL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 291 NONAME ; void CApaRegistrationResourceFileWriter::SetAppIsHiddenL(int) + ?SetDefaultScreenNumberL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 292 NONAME ; void CApaRegistrationResourceFileWriter::SetDefaultScreenNumberL(int) + ?SetEmbeddabilityL@CApaRegistrationResourceFileWriter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 293 NONAME ; void CApaRegistrationResourceFileWriter::SetEmbeddabilityL(enum TApaAppCapability::TEmbeddability) + ?SetGroupNameL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 294 NONAME ; void CApaRegistrationResourceFileWriter::SetGroupNameL(class TDesC16 const &) + ?SetLaunchInBackgroundL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 295 NONAME ; void CApaRegistrationResourceFileWriter::SetLaunchInBackgroundL(int) + ?SetOpaqueDataL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC8@@@Z @ 296 NONAME ; void CApaRegistrationResourceFileWriter::SetOpaqueDataL(class TDesC8 const &) + ?SetSupportsNewFileL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 297 NONAME ; void CApaRegistrationResourceFileWriter::SetSupportsNewFileL(int) + ??1CApaLocalisableResourceFileWriter@@UAE@XZ @ 298 NONAME ; CApaLocalisableResourceFileWriter::~CApaLocalisableResourceFileWriter(void) + ??1CApaRegistrationResourceFileWriter@@UAE@XZ @ 299 NONAME ; CApaRegistrationResourceFileWriter::~CApaRegistrationResourceFileWriter(void) + ?AppScanInProgress@CApaAppList@@QBEHXZ @ 300 NONAME ABSENT ; int CApaAppList::AppScanInProgress(void) const + ?CancelNotify@RApaLsSession@@QAEXXZ @ 301 NONAME ; void RApaLsSession::CancelNotify(void) + ?SetNotify@RApaLsSession@@QAEXHAAVTRequestStatus@@@Z @ 302 NONAME ; void RApaLsSession::SetNotify(int, class TRequestStatus &) + ?CancelNotifyOnDataMappingChange@RApaLsSession@@QAEXXZ @ 303 NONAME ; void RApaLsSession::CancelNotifyOnDataMappingChange(void) + ?NotifyOnDataMappingChange@RApaLsSession@@QAEXAAVTRequestStatus@@@Z @ 304 NONAME ; void RApaLsSession::NotifyOnDataMappingChange(class TRequestStatus &) + ?GetAppType@RApaLsSession@@QBEHAAVTUid@@V2@@Z @ 305 NONAME ; int RApaLsSession::GetAppType(class TUid &, class TUid) const + ?CommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 306 NONAME ; void RApaLsSession::CommitNonNativeApplicationsUpdatesL(void) + ?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 307 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void) + ?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 308 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void) + ?SetUpdatedAppsList@CApaAppList@@QAEXPAVCUpdatedAppsList@@@Z @ 309 NONAME ABSENT ; void CApaAppList::SetUpdatedAppsList(class CUpdatedAppsList *) + ?UpdatedAppsList@CApaAppList@@QAEPAVCUpdatedAppsList@@XZ @ 310 NONAME ABSENT ; class CUpdatedAppsList * CApaAppList::UpdatedAppsList(void) + ??1CApaAppData@@UAE@XZ @ 311 NONAME ABSENT ; CApaAppData::~CApaAppData(void) + ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 312 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &) + ?Self@CApaAppList@@SAPAV1@XZ @ 313 NONAME ABSENT ; class CApaAppList * CApaAppList::Self(void) + ?ShareProtectedFileServer@CApaAppList@@QAEAAVRFs@@XZ @ 314 NONAME ABSENT ; class RFs & CApaAppList::ShareProtectedFileServer(void) + X @ 315 NONAME ABSENT ; Old @internalComponent function that never needed to be exported + X @ 316 NONAME ABSENT ; Old @internalComponent function that never needed to be exported + X @ 317 NONAME ABSENT ; Old @internalComponent function that never needed to be exported + X @ 318 NONAME ABSENT ; Old @internalComponent function that never needed to be exported + ?SetAppShortCaption@RApaLsSession@@QAEHABVTDesC16@@W4TLanguage@@VTUid@@@Z @ 319 NONAME ; int RApaLsSession::SetAppShortCaption(class TDesC16 const &, enum TLanguage, class TUid) + ?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 320 NONAME ABSENT ; void CApaAppData::SetShortCaptionL(class TDesC16 const &) + ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 321 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray const &) + ?AddForcedRegistrationL@CApaAppList@@QAEXPAVHBufC16@@@Z @ 322 NONAME ABSENT ; void CApaAppList::AddForcedRegistrationL(class HBufC16 *) + ?CompareStrings@CApaAppList@@SAHABVHBufC16@@0@Z @ 323 NONAME ABSENT ; int CApaAppList::CompareStrings(class HBufC16 const &, class HBufC16 const &) + ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 324 NONAME ABSENT ; void CApaAppList::ResetForcedRegistrations(void) + ?RestartScanL@CApaAppList@@QAEXXZ @ 325 NONAME ABSENT ; void CApaAppList::RestartScanL(void) + ?StopScan@CApaAppList@@QAEXXZ @ 326 NONAME ABSENT ; void CApaAppList::StopScan(void) + ?MinApplicationStackSize@@YAIXZ @ 327 NONAME ; unsigned int MinApplicationStackSize(void) + ?KMinApplicationStackSize@@3HB @ 328 NONAME ; int const KMinApplicationStackSize + ?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 329 NONAME ABSENT ; int CApaAppList::IsLanguageChangePending(void) const + ?IsPending@CApaAppData@@QBEHXZ @ 330 NONAME ABSENT ; int CApaAppData::IsPending(void) const + ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 331 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const + ?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 332 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &) + X @ 333 NONAME ABSENT ; + X @ 334 NONAME ABSENT ; + ?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 335 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void) + ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @336 NONAME;TInt RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const + X @ 337 NONAME ABSENT ; + X @ 338 NONAME ABSENT ; + X @ 339 NONAME ABSENT ; + X @ 340 NONAME ABSENT ; + X @ 341 NONAME ABSENT ; + X @ 342 NONAME ABSENT ; + X @ 343 NONAME ABSENT ; \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/aplist_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/aplist_legacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,87 @@ +EXPORTS + ??0TApaAppEntry@@QAE@XZ @ 1 NONAME ; TApaAppEntry::TApaAppEntry(void) + ??1CApaAppData@@UAE@XZ @ 2 NONAME ; CApaAppData::~CApaAppData(void) + ??1CApaAppList@@UAE@XZ @ 3 NONAME ; CApaAppList::~CApaAppList(void) + ??1CAppSidChecker@@UAE@XZ @ 4 NONAME ; CAppSidChecker::~CAppSidChecker(void) + ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 5 NONAME ; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &) + ?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 6 NONAME ; class CApaAppData * CApaAppList::AppDataByFileName(class TDesC16 const &) const + ?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 7 NONAME ; class CApaAppData * CApaAppList::AppDataByUid(class TUid) const + ?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 8 NONAME ; class TApaAppEntry CApaAppData::AppEntry(void) const + ?AppScanInProgress@CApaAppList@@QBEHXZ @ 9 NONAME ; int CApaAppList::AppScanInProgress(void) const + ?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 10 NONAME ; enum TLanguage CApaAppData::ApplicationLanguage(void) const + ?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 11 NONAME ; int CApaAppData::CanUseScreenMode(int) + ?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 12 NONAME ; void CApaAppData::Capability(class TDes8 &) const + ?Count@CApaAppList@@QBEHXZ @ 13 NONAME ; int CApaAppList::Count(void) const + ?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 14 NONAME ; long CApaAppData::DataType(class TDataType const &) const + ?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 15 NONAME ; unsigned int CApaAppData::DefaultScreenNumber(void) const + ?DriveList@CApaAppRegFinder@@QBE?AV?$TArray@$$CBVTDriveUnitInfo@@@@XZ @ 16 NONAME ; class TArray CApaAppRegFinder::DriveList(void) const + ?FindAllAppsL@CApaAppRegFinder@@QAEXW4TScanScope@1@@Z @ 17 NONAME ; void CApaAppRegFinder::FindAllAppsL(enum CApaAppRegFinder::TScanScope) + ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 18 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid) + ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 19 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const + ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 20 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const + ?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 21 NONAME ; void CApaAppData::GetIconInfo(int &, int &) const + ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 22 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(int) const + ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 23 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(class TSize) const + ?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 24 NONAME ; class CApaMaskedBitmap * CApaAppViewData::Icon(class TSize const &) const + ?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 25 NONAME ; class TPtrC16 CApaAppData::IconFileName(void) const + ?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 26 NONAME ; class TPtrC16 CApaAppViewData::IconFileName(void) const + ?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 27 NONAME ; class CArrayFixFlat * CApaAppData::IconSizesL(void) const + ?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 28 NONAME ; class CArrayFixFlat * CApaAppViewData::IconSizesL(void) const + ?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 29 NONAME ; int CApaAppData::ImplementsService(class TUid) const + ?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 30 NONAME ; void CApaAppList::InitListL(class MApaAppListObserver *) + ?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 31 NONAME ; int CApaAppList::IsFirstScanComplete(void) const + ?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 32 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const + ?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 33 NONAME ; int CApaAppList::IsLanguageChangePending(void) const + ?IsPending@CApaAppData@@QBEHXZ @ 34 NONAME ; int CApaAppData::IsPending(void) const + ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 35 NONAME ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const + ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 36 NONAME ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &) + ?NewL@CApaAppList@@SAPAV1@AAVRFs@@HH@Z @ 37 NONAME ; class CApaAppList * CApaAppList::NewL(class RFs &, int, int) + ?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &) + ?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 39 NONAME ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &) + ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 40 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *) const + ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 41 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *, int) const + ?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABVCDesC16Array@@@Z @ 42 NONAME ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class CDesC16Array const &) + ?NonMbmIconFile@CApaAppData@@QBEHXZ @ 43 NONAME ; int CApaAppData::NonMbmIconFile(void) const + ?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 44 NONAME ; int CApaAppViewData::NonMbmIconFile(void) const + ?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 45 NONAME ; class TUid CApaAppData::NonNativeApplicationType(void) const + ?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 46 NONAME ; class TPtrC8 CApaAppData::OpaqueData(void) const + ?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 47 NONAME ; class CDesC16Array * CApaAppData::OwnedFiles(void) const + ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 48 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const + ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 49 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const + ?PurgeL@CApaAppList@@QAEXXZ @ 50 NONAME ; void CApaAppList::PurgeL(void) + ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 51 NONAME ; class TPtrC16 CApaAppData::RegistrationFileName(void) const + ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 52 NONAME ; int CApaAppData::RegistrationFileUsed(void) const + ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 53 NONAME ; void CApaAppList::ResetForcedRegistrations(void) + ?RestartScanL@CApaAppList@@QAEXXZ @ 54 NONAME ; void CApaAppList::RestartScanL(void) + ?ScreenMode@CApaAppViewData@@QBEHXZ @ 55 NONAME ; int CApaAppViewData::ScreenMode(void) const + ?Self@CApaAppList@@SAPAV1@XZ @ 56 NONAME ; class CApaAppList * CApaAppList::Self(void) + ?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 57 NONAME ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const + ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 58 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const + ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 59 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const + ?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 60 NONAME ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const + ?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 61 NONAME ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const + ?SetRescanCallBackL@CAppSidChecker@@UAEXABVTCallBack@@@Z @ 62 NONAME ; void CAppSidChecker::SetRescanCallBackL(class TCallBack const &) + ?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 63 NONAME ; void CApaAppData::SetShortCaptionL(class TDesC16 const &) + ?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 64 NONAME ; void CApaAppList::StartIdleUpdateL(class MApaAppListObserver *) + ?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 65 NONAME ; void CApaAppList::StartIdleUpdateL(void) + ?StopScan@CApaAppList@@QAEXH@Z @ 66 NONAME ; void CApaAppList::StopScan(int) + ?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 67 NONAME ; class TUid CApaAppViewData::Uid(void) const + ?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 68 NONAME ; class CArrayPtrFlat * CApaAppData::Views(void) const + ?reserved1@CAppSidChecker@@EAEXXZ @ 69 NONAME ; void CAppSidChecker::reserved1(void) + ?reserved2@CAppSidChecker@@EAEXXZ @ 70 NONAME ; void CAppSidChecker::reserved2(void) + ?reserved3@CAppSidChecker@@EAEXXZ @ 71 NONAME ; void CAppSidChecker::reserved3(void) + ?AddCustomAppInfoInListL@CApaAppList@@QAEXVTUid@@W4TLanguage@@ABVTDesC16@@@Z @ 72 NONAME ; void CApaAppList::AddCustomAppInfoInListL(class TUid, enum TLanguage, class TDesC16 const &) + ?UpdateAppListByShortCaptionL@CApaAppList@@QAEXXZ @ 73 NONAME ; void CApaAppList::UpdateAppListByShortCaptionL(void) + ?SetCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 74 NONAME ; void CApaAppData::SetCaptionL(class TDesC16 const &) + ?UpdateAppListByIconCaptionOverridesL@CApaAppList@@QAEXXZ @ 75 NONAME ; void CApaAppList::UpdateAppListByIconCaptionOverridesL(void) + ?SetIconsL@CApaAppData@@QAEXABVTDesC16@@H@Z @ 76 NONAME ; void CApaAppData::SetIconsL(class TDesC16 const &, int) + ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 77 NONAME ; int CApaAppList::AppListUpdatePending(void) + ?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 78 NONAME ; class CArrayFixFlat * CApaAppList::UninstalledAppArray(void) + X @ 79 NONAME ABSENT ; + X @ 80 NONAME ABSENT ; + X @ 81 NONAME ABSENT ; + X @ 82 NONAME ABSENT ; + X @ 83 NONAME ABSENT ; + X @ 84 NONAME ABSENT ; + X @ 85 NONAME ABSENT ; + X @ 86 NONAME ABSENT ; diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/aplistu.def --- a/appfw/apparchitecture/bwins/aplistu.def Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/bwins/aplistu.def Thu Jun 24 13:52:58 2010 +0100 @@ -3,7 +3,7 @@ ??1CApaAppData@@UAE@XZ @ 2 NONAME ; CApaAppData::~CApaAppData(void) ??1CApaAppList@@UAE@XZ @ 3 NONAME ; CApaAppList::~CApaAppList(void) ??1CAppSidChecker@@UAE@XZ @ 4 NONAME ; CAppSidChecker::~CAppSidChecker(void) - ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 5 NONAME ; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &) + ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 5 NONAME ABSENT; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &) ?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 6 NONAME ; class CApaAppData * CApaAppList::AppDataByFileName(class TDesC16 const &) const ?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 7 NONAME ; class CApaAppData * CApaAppList::AppDataByUid(class TUid) const ?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 8 NONAME ; class TApaAppEntry CApaAppData::AppEntry(void) const @@ -14,9 +14,9 @@ ?Count@CApaAppList@@QBEHXZ @ 13 NONAME ; int CApaAppList::Count(void) const ?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 14 NONAME ; long CApaAppData::DataType(class TDataType const &) const ?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 15 NONAME ; unsigned int CApaAppData::DefaultScreenNumber(void) const - ?DriveList@CApaAppRegFinder@@QBE?AV?$TArray@$$CBVTDriveUnitInfo@@@@XZ @ 16 NONAME ; class TArray CApaAppRegFinder::DriveList(void) const - ?FindAllAppsL@CApaAppRegFinder@@QAEXW4TScanScope@1@@Z @ 17 NONAME ; void CApaAppRegFinder::FindAllAppsL(enum CApaAppRegFinder::TScanScope) - ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 18 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid) + ?DriveList@CApaAppRegFinder@@QBE?AV?$TArray@$$CBVTDriveUnitInfo@@@@XZ @ 16 NONAME ABSENT ; class TArray CApaAppRegFinder::DriveList(void) const + ?FindAllAppsL@CApaAppRegFinder@@QAEXW4TScanScope@1@@Z @ 17 NONAME ABSENT ; void CApaAppRegFinder::FindAllAppsL(enum CApaAppRegFinder::TScanScope) + ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 18 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid) ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 19 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 20 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const ?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 21 NONAME ; void CApaAppData::GetIconInfo(int &, int &) const @@ -32,15 +32,15 @@ ?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 31 NONAME ; int CApaAppList::IsFirstScanComplete(void) const ?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 32 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const ?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 33 NONAME ; int CApaAppList::IsLanguageChangePending(void) const - ?IsPending@CApaAppData@@QBEHXZ @ 34 NONAME ; int CApaAppData::IsPending(void) const - ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 35 NONAME ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const - ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 36 NONAME ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &) + ?IsPending@CApaAppData@@QBEHXZ @ 34 NONAME ABSENT ; int CApaAppData::IsPending(void) const + ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 35 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const + ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 36 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &) ?NewL@CApaAppList@@SAPAV1@AAVRFs@@HH@Z @ 37 NONAME ; class CApaAppList * CApaAppList::NewL(class RFs &, int, int) - ?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &) - ?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 39 NONAME ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &) + ?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &) + ?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 39 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &) ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 40 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *) const ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 41 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *, int) const - ?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABVCDesC16Array@@@Z @ 42 NONAME ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class CDesC16Array const &) + ?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABVCDesC16Array@@@Z @ 42 NONAME ABSENT ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class CDesC16Array const &) ?NonMbmIconFile@CApaAppData@@QBEHXZ @ 43 NONAME ; int CApaAppData::NonMbmIconFile(void) const ?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 44 NONAME ; int CApaAppViewData::NonMbmIconFile(void) const ?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 45 NONAME ; class TUid CApaAppData::NonNativeApplicationType(void) const @@ -48,11 +48,11 @@ ?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 47 NONAME ; class CDesC16Array * CApaAppData::OwnedFiles(void) const ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 48 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 49 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const - ?PurgeL@CApaAppList@@QAEXXZ @ 50 NONAME ; void CApaAppList::PurgeL(void) - ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 51 NONAME ; class TPtrC16 CApaAppData::RegistrationFileName(void) const - ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 52 NONAME ; int CApaAppData::RegistrationFileUsed(void) const - ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 53 NONAME ; void CApaAppList::ResetForcedRegistrations(void) - ?RestartScanL@CApaAppList@@QAEXXZ @ 54 NONAME ; void CApaAppList::RestartScanL(void) + ?PurgeL@CApaAppList@@QAEXXZ @ 50 NONAME ABSENT ; void CApaAppList::PurgeL(void) + ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 51 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const + ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 52 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const + ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 53 NONAME ABSENT; void CApaAppList::ResetForcedRegistrations(void) + ?RestartScanL@CApaAppList@@QAEXXZ @ 54 NONAME ABSENT ; void CApaAppList::RestartScanL(void) ?ScreenMode@CApaAppViewData@@QBEHXZ @ 55 NONAME ; int CApaAppViewData::ScreenMode(void) const ?Self@CApaAppList@@SAPAV1@XZ @ 56 NONAME ; class CApaAppList * CApaAppList::Self(void) ?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 57 NONAME ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const @@ -64,7 +64,7 @@ ?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 63 NONAME ; void CApaAppData::SetShortCaptionL(class TDesC16 const &) ?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 64 NONAME ; void CApaAppList::StartIdleUpdateL(class MApaAppListObserver *) ?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 65 NONAME ; void CApaAppList::StartIdleUpdateL(void) - ?StopScan@CApaAppList@@QAEXH@Z @ 66 NONAME ; void CApaAppList::StopScan(int) + ?StopScan@CApaAppList@@QAEXH@Z @ 66 NONAME ABSENT ; void CApaAppList::StopScan(int) ?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 67 NONAME ; class TUid CApaAppViewData::Uid(void) const ?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 68 NONAME ; class CArrayPtrFlat * CApaAppData::Views(void) const ?reserved1@CAppSidChecker@@EAEXXZ @ 69 NONAME ; void CAppSidChecker::reserved1(void) @@ -75,6 +75,13 @@ ?SetCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 74 NONAME ; void CApaAppData::SetCaptionL(class TDesC16 const &) ?UpdateAppListByIconCaptionOverridesL@CApaAppList@@QAEXXZ @ 75 NONAME ; void CApaAppList::UpdateAppListByIconCaptionOverridesL(void) ?SetIconsL@CApaAppData@@QAEXABVTDesC16@@H@Z @ 76 NONAME ; void CApaAppData::SetIconsL(class TDesC16 const &, int) - ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 77 NONAME ; int CApaAppList::AppListUpdatePending(void) + ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 77 NONAME ABSENT ; int CApaAppList::AppListUpdatePending(void) ?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 78 NONAME ; class CArrayFixFlat * CApaAppList::UninstalledAppArray(void) + ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@VTUid@@@Z @ 79 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class TUid) + ?NewL@CApaAppData@@SAPAV1@ABVCApplicationRegistrationData@Usif@@AAVRFs@@ABVRSoftwareComponentRegistry@3@@Z @ 80 NONAME ; class CApaAppData * CApaAppData::NewL(class Usif::CApplicationRegistrationData const &, class RFs &, class Usif::RSoftwareComponentRegistry const &) + ?UpdateApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@PAV?$RArray@VTApaAppUpdateInfo@@@@VTUid@@@Z @ 81 NONAME ; void CApaAppList::UpdateApplistL(class MApaAppListObserver *, class RArray *, class TUid) + ?InitializeApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 82 NONAME ; void CApaAppList::InitializeApplistL(class MApaAppListObserver *) + ?UpdateApplistByForceRegAppsL@CApaAppList@@QAEXAAV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 83 NONAME ; void CApaAppList::UpdateApplistByForceRegAppsL(class RPointerArray &) + ?UpdatedAppsInfo@CApaAppList@@QAEPAV?$CArrayFixFlat@VTApaAppUpdateInfo@@@@XZ @ 84 NONAME ; class CArrayFixFlat * CApaAppList::UpdatedAppsInfo(void) + ?IsLangChangePending@CApaAppData@@QAEHXZ @ 85 NONAME ; int CApaAppData::IsLangChangePending(void) diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/apserv_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/apserv_legacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,27 @@ +EXPORTS + ??1CApaAppArcServer@@UAE@XZ @ 1 NONAME ; public: virtual __thiscall CApaAppArcServer::~CApaAppArcServer(void) + ?NewL@CApaAppArcServer@@SAPAV1@PAVCApaAppList@@PAVCApaFileRecognizer@@@Z @ 2 NONAME ABSENT ; public: static class CApaAppArcServer * __cdecl CApaAppArcServer::NewL(class CApaAppList *,class CApaFileRecognizer *) + ??1CApaFsMonitor@@UAE@XZ @ 3 NONAME ; public: virtual __thiscall CApaFsMonitor::~CApaFsMonitor(void) + ?NameApaServServerThread@@YA?AVTPtrC16@@XZ @ 4 NONAME ; class TPtrC16 __cdecl NameApaServServerThread(void) + ?NameApaServStartSemaphore@@YA?AVTPtrC16@@XZ @ 5 NONAME ; class TPtrC16 __cdecl NameApaServStartSemaphore(void) + ?NewL@CApaAppArcServer@@SAPAV1@XZ @ 6 NONAME ; class CApaAppArcServer * CApaAppArcServer::NewL(void) + ?NewL@CApaFsMonitor@@SAPAV1@AAVRFs@@ABVTDesC16@@VTCallBack@@@Z @ 7 NONAME ; public: static class CApaFsMonitor * __cdecl CApaFsMonitor::NewL(class RFs &,class TDesC16 const &,class TCallBack) + ?NotifyType@CApaFsMonitor@@QBE?AW4TNotifyType@@XZ @ 8 NONAME ; public: enum TNotifyType __thiscall CApaFsMonitor::NotifyType(void)const + ?SetBlocked@CApaFsMonitor@@QAEXH@Z @ 9 NONAME ; public: void __thiscall CApaFsMonitor::SetBlocked(int) + ?Start@CApaFsMonitor@@QAEXW4TNotifyType@@@Z @ 10 NONAME ; public: void __thiscall CApaFsMonitor::Start(enum TNotifyType) + ?Self@CApaAppArcServer@@SAPAV1@XZ @ 11 NONAME ; class CApaAppArcServer * CApaAppArcServer::Self(void) + ?AddLocationL@CApaFsMonitor@@QAEXABVTDesC16@@@Z @ 12 NONAME ; void CApaFsMonitor::AddLocationL(class TDesC16 const &) + ?Cancel@CApaFsMonitor@@QAEXXZ @ 13 NONAME ; void CApaFsMonitor::Cancel(void) + ?ApaServThreadStart@@YAHPAX@Z @ 14 NONAME ; int ApaServThreadStart(void *) + ??1CUpdatedAppsList@@UAE@XZ @ 15 NONAME ABSENT ; CUpdatedAppsList::~CUpdatedAppsList(void) + ?CloseAndDeletePermanentStore@CUpdatedAppsList@@QAEXXZ @ 16 NONAME ABSENT ; void CUpdatedAppsList::CloseAndDeletePermanentStore(void) + ?IsInList@CUpdatedAppsList@@QBEHABVTDesC16@@@Z @ 17 NONAME ABSENT ; int CUpdatedAppsList::IsInList(class TDesC16 const &) const + ?RescanCallBack@CApaAppArcServer@@QAE?AVTCallBack@@XZ @ 18 NONAME ; class TCallBack CApaAppArcServer::RescanCallBack(void) + ?KApaLoadDataRecognizersOnDemand@@3HB @ 19 NONAME DATA 4 ; int const KApaLoadDataRecognizersOnDemand + ?KApaUnloadRecognizersTimeout@@3HB @ 20 NONAME DATA 4 ; int const KApaUnloadRecognizersTimeout + ?HandleInstallationEndEventL@CApaAppArcServer@@QAEXXZ @ 21 NONAME ; void CApaAppArcServer::HandleEndUninstallEventL(void) + ?HandleInstallationStartEvent@CApaAppArcServer@@QAEXXZ @ 22 NONAME ; void CApaAppArcServer::HandleStartUninstallEvent(void) + ?KApaDrivesToMonitor@@3HB @ 23 NONAME ; int const KApaDrivesToMonitor + ?KApaLoadMbmIconsOnDemand@@3HB @ 24 NONAME ; int const KApaLoadMbmIconsOnDemand + + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/distribution.policy.s60 --- a/appfw/apparchitecture/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/bwins/ticonforleaks_leagacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/ticonforleaks_leagacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,351 @@ +EXPORTS + ??0CDataRecognitionResultArray@@QAE@XZ @ 1 NONAME ; CDataRecognitionResultArray::CDataRecognitionResultArray(void) + ??0MApaAppListServObserver@@IAE@XZ @ 2 NONAME ; MApaAppListServObserver::MApaAppListServObserver(void) + ??0RApaLsSession@@QAE@XZ @ 3 NONAME ; RApaLsSession::RApaLsSession(void) + ??0TApaPictureFactory@@IAE@XZ @ 4 NONAME ; TApaPictureFactory::TApaPictureFactory(void) + ??0TApaPictureFactory@@QAE@PAVCApaProcess@@@Z @ 5 NONAME ; TApaPictureFactory::TApaPictureFactory(class CApaProcess *) + ??0TApaTask@@QAE@AAVRWsSession@@@Z @ 6 NONAME ; TApaTask::TApaTask(class RWsSession &) + ??0TApaTaskList@@QAE@AAVRWsSession@@@Z @ 7 NONAME ; TApaTaskList::TApaTaskList(class RWsSession &) + ??1CApaAppData@@UAE@XZ @ 8 NONAME ; CApaAppData::~CApaAppData(void) + ??1CApaAppInfoFileWriter@@UAE@XZ @ 9 NONAME ABSENT ; CApaAppInfoFileWriter::~CApaAppInfoFileWriter(void) + ??1CApaAppList@@UAE@XZ @ 10 NONAME ; CApaAppList::~CApaAppList(void) + ??1CApaAppListNotifier@@UAE@XZ @ 11 NONAME ; CApaAppListNotifier::~CApaAppListNotifier(void) + ??1CApaDoor@@UAE@XZ @ 12 NONAME ; CApaDoor::~CApaDoor(void) + ??1CApaLocalisableResourceFileWriter@@UAE@XZ @ 13 NONAME ; CApaLocalisableResourceFileWriter::~CApaLocalisableResourceFileWriter(void) + ??1CApaMaskedBitmap@@UAE@XZ @ 14 NONAME ; CApaMaskedBitmap::~CApaMaskedBitmap(void) + ??1CApaRegistrationResourceFileWriter@@UAE@XZ @ 15 NONAME ; CApaRegistrationResourceFileWriter::~CApaRegistrationResourceFileWriter(void) + ??1CApaSystemControlList@@UAE@XZ @ 16 NONAME ; CApaSystemControlList::~CApaSystemControlList(void) + ??1CApaWindowGroupName@@UAE@XZ @ 17 NONAME ; CApaWindowGroupName::~CApaWindowGroupName(void) + ??1CDataRecognitionResultArray@@UAE@XZ @ 18 NONAME ; CDataRecognitionResultArray::~CDataRecognitionResultArray(void) + ?AddCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@@Z @ 19 NONAME ABSENT ; void CApaAppInfoFileWriter::AddCaptionL(enum TLanguage, class TDesC16 const &) + ?AddDataTypeL@CApaAppInfoFileWriter@@QAEXABVTDataTypeWithPriority@@@Z @ 20 NONAME ABSENT ; void CApaAppInfoFileWriter::AddDataTypeL(class TDataTypeWithPriority const &) + ?AddDataTypeL@CApaRegistrationResourceFileWriter@@QAEXHABVTDesC8@@@Z @ 21 NONAME ; void CApaRegistrationResourceFileWriter::AddDataTypeL(int, class TDesC8 const &) + ?AddFileOwnershipInfoL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 22 NONAME ; void CApaRegistrationResourceFileWriter::AddFileOwnershipInfoL(class TDesC16 const &) + ?AddForcedRegistrationL@CApaAppList@@QAEXPAVHBufC16@@@Z @ 23 NONAME ABSENT ; void CApaAppList::AddForcedRegistrationL(class HBufC16 *) + ?AddIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@@Z @ 24 NONAME ABSENT ; void CApaAppInfoFileWriter::AddIconL(class CApaMaskedBitmap &) + ?AppCount@RApaLsSession@@QBEHAAH@Z @ 25 NONAME ; int RApaLsSession::AppCount(int &) const + ?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 26 NONAME ; class CApaAppData * CApaAppList::AppDataByFileName(class TDesC16 const &) const + ?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 27 NONAME ; class CApaAppData * CApaAppList::AppDataByUid(class TUid) const + ?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 28 NONAME ; class TApaAppEntry CApaAppData::AppEntry(void) const + ?AppForDataType@RApaLsSession@@QBEHABVTDataType@@AAVTUid@@@Z @ 29 NONAME ; int RApaLsSession::AppForDataType(class TDataType const &, class TUid &) const + ?AppForDataTypeAndService@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 30 NONAME ; int RApaLsSession::AppForDataTypeAndService(class TDataType const &, class TUid, class TUid &) const + ?AppForDocument@RApaLsSession@@QBEHABVRFile@@AAVTUid@@AAVTDataType@@@Z @ 31 NONAME ; int RApaLsSession::AppForDocument(class RFile const &, class TUid &, class TDataType &) const + ?AppForDocument@RApaLsSession@@QBEHABVTDesC16@@AAVTUid@@AAVTDataType@@@Z @ 32 NONAME ; int RApaLsSession::AppForDocument(class TDesC16 const &, class TUid &, class TDataType &) const + ?AppForDocumentAndService@RApaLsSession@@QBEHABVRFile@@VTUid@@AAV3@AAVTDataType@@@Z @ 33 NONAME ; int RApaLsSession::AppForDocumentAndService(class RFile const &, class TUid, class TUid &, class TDataType &) const + ?AppForDocumentAndService@RApaLsSession@@QBEHABVTDesC16@@VTUid@@AAV3@AAVTDataType@@@Z @ 34 NONAME ; int RApaLsSession::AppForDocumentAndService(class TDesC16 const &, class TUid, class TUid &, class TDataType &) const + ?AppScanInProgress@CApaAppList@@QBEHXZ @ 35 NONAME ; int CApaAppList::AppScanInProgress(void) const + ?AppUid@CApaWindowGroupName@@QBE?AVTUid@@XZ @ 36 NONAME ; class TUid CApaWindowGroupName::AppUid(void) const + ?AppUidL@CApaDoor@@QBE?AVTUid@@XZ @ 37 NONAME ; class TUid CApaDoor::AppUidL(void) const + ?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 38 NONAME ; enum TLanguage CApaAppData::ApplicationLanguage(void) const + ?ApplicationLanguage@RApaLsSession@@QBEHVTUid@@AAW4TLanguage@@@Z @ 39 NONAME ; int RApaLsSession::ApplicationLanguage(class TUid, enum TLanguage &) const + ?BringToForeground@TApaTask@@QAEXXZ @ 40 NONAME ; void TApaTask::BringToForeground(void) + ?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 41 NONAME ; int CApaAppData::CanUseScreenMode(int) + ?CancelListPopulationCompleteObserver@RApaLsSession@@QBEHXZ @ 42 NONAME ; int RApaLsSession::CancelListPopulationCompleteObserver(void) const + ?CancelNotify@RApaLsSession@@QAEXXZ @ 43 NONAME ; void RApaLsSession::CancelNotify(void) + ?CancelNotifyOnDataMappingChange@RApaLsSession@@QAEXXZ @ 44 NONAME ; void RApaLsSession::CancelNotifyOnDataMappingChange(void) + ?CancelRecognizeFiles@RApaLsSession@@QAEXXZ @ 45 NONAME ; void RApaLsSession::CancelRecognizeFiles(void) + ?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 46 NONAME ; void CApaAppData::Capability(class TDes8 &) const + ?Caption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 47 NONAME ; class TPtrC16 CApaSystemControl::Caption(void) const + ?Caption@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 48 NONAME ; class TPtrC16 CApaWindowGroupName::Caption(void) const + ?CheckInterimFormatFileNotCorruptL@ForJavaMIDletInstaller@@SAXAAVRFile@@@Z @ 49 NONAME ABSENT ; void ForJavaMIDletInstaller::CheckInterimFormatFileNotCorruptL(class RFile &) + ?ClearFsSession@RApaLsSession@@SAXXZ @ 50 NONAME ; void RApaLsSession::ClearFsSession(void) + ?Close@RApaLsSession@@QAEXXZ @ 51 NONAME ; void RApaLsSession::Close(void) + ?CommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 52 NONAME ; void RApaLsSession::CommitNonNativeApplicationsUpdatesL(void) + ?CompareStrings@CApaAppList@@SAHABVHBufC16@@0@Z @ 53 NONAME ABSENT ; int CApaAppList::CompareStrings(class HBufC16 const &, class HBufC16 const &) + ?Connect@RApaLsSession@@QAEHXZ @ 54 NONAME ; int RApaLsSession::Connect(void) + ?ConstructFromWgIdL@CApaWindowGroupName@@QAEXH@Z @ 55 NONAME ; void CApaWindowGroupName::ConstructFromWgIdL(int) + ?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@H@Z @ 56 NONAME ; class CApaSystemControl * CApaSystemControlList::Control(int) const + ?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@VTUid@@@Z @ 57 NONAME ; class CApaSystemControl * CApaSystemControlList::Control(class TUid) const + ?Count@CApaAppList@@QBEHXZ @ 58 NONAME ; int CApaAppList::Count(void) const + ?Count@CApaSystemControlList@@QBEHXZ @ 59 NONAME ; int CApaSystemControlList::Count(void) const + ?Count@CDataRecognitionResultArray@@QBEIXZ @ 60 NONAME ; unsigned int CDataRecognitionResultArray::Count(void) const + ?CreateDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 61 NONAME ; int RApaLsSession::CreateDocument(class TDesC16 const &, class TUid, class TThreadId &, enum RApaLsSession::TLaunchType) + ?CreateL@CApaSystemControl@@QAEXXZ @ 62 NONAME ; void CApaSystemControl::CreateL(void) + ?CycleTasks@TApaTaskList@@QAEHVTUid@@W4TCycleDirection@1@@Z @ 63 NONAME ; int TApaTaskList::CycleTasks(class TUid, enum TApaTaskList::TCycleDirection) + ?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 64 NONAME ; long CApaAppData::DataType(class TDataType const &) const + ?DataTypes@TApaAppServiceInfo@@QBEABV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 65 NONAME ; class CArrayFixFlat const & TApaAppServiceInfo::DataTypes(void) const + ?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 66 NONAME ; unsigned int CApaAppData::DefaultScreenNumber(void) const + ?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@@Z @ 67 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &) + ?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@VTUid@@@Z @ 68 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &, class TUid) + ?DeregisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@@Z @ 69 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationL(class TUid) + ?DeregisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@@Z @ 70 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationTypeL(class TUid) + ?DocName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 71 NONAME ; class TPtrC16 CApaWindowGroupName::DocName(void) const + ?DocNameIsAFile@CApaWindowGroupName@@QBEHXZ @ 72 NONAME ; int CApaWindowGroupName::DocNameIsAFile(void) const + ?DocumentL@CApaDoor@@QAEPAVCApaDocument@@H@Z @ 73 NONAME ; class CApaDocument * CApaDoor::DocumentL(int) + ?EmbeddableAppCount@RApaLsSession@@QBEHAAH@Z @ 74 NONAME ; int RApaLsSession::EmbeddableAppCount(int &) const + ?EndTask@TApaTask@@QAEXXZ @ 75 NONAME ; void TApaTask::EndTask(void) + ?Exists@TApaTask@@QBEHXZ @ 76 NONAME ; int TApaTask::Exists(void) const + ?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 77 NONAME ; void CApaMaskedBitmap::ExternalizeL(class RWriteStream &) const + ?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 78 NONAME ; class TBuf<256> CApaSystemControl::FileName(void) const + ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 79 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid) + ?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 80 NONAME ; class TApaTask TApaTaskList::FindApp(class TDesC16 const &) + ?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 81 NONAME ; class TApaTask TApaTaskList::FindApp(class TUid) + ?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 82 NONAME ; void CApaWindowGroupName::FindByAppUid(class TUid, class RWsSession &, int &) + ?FindByCaption@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 83 NONAME ; void CApaWindowGroupName::FindByCaption(class TDesC16 const &, class RWsSession &, int &) + ?FindByDocName@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 84 NONAME ; void CApaWindowGroupName::FindByDocName(class TDesC16 const &, class RWsSession &, int &) + ?FindByPos@TApaTaskList@@QAE?AVTApaTask@@H@Z @ 85 NONAME ; class TApaTask TApaTaskList::FindByPos(int) + ?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 86 NONAME ; class TApaTask TApaTaskList::FindDoc(class TDesC16 const &) + ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 87 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const + ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 88 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const + ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 89 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray const &) + ?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 90 NONAME ; class RFs * RApaLsSession::FsSession(void) + ?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 91 NONAME ; int RApaLsSession::GetAcceptedConfidence(int &) const + ?GetAllApps@RApaLsSession@@QBEHH@Z @ 92 NONAME ; int RApaLsSession::GetAllApps(int) const + ?GetAllApps@RApaLsSession@@QBEHXZ @ 93 NONAME ; int RApaLsSession::GetAllApps(void) const + ?GetAppByDataType@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 94 NONAME ; int RApaLsSession::GetAppByDataType(class TDataType const &, class TUid, class TUid &) const + ?GetAppCapability@RApaLsSession@@QBEHAAVTDes8@@VTUid@@@Z @ 95 NONAME ; int RApaLsSession::GetAppCapability(class TDes8 &, class TUid) const + ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAPAVHBufC16@@@Z @ 96 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class HBufC16 * &) const + ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 97 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const + ?GetAppIcon@RApaLsSession@@QBEHVTUid@@HAAVCApaMaskedBitmap@@@Z @ 98 NONAME ; int RApaLsSession::GetAppIcon(class TUid, int, class CApaMaskedBitmap &) const + ?GetAppIcon@RApaLsSession@@QBEHVTUid@@VTSize@@AAVCApaMaskedBitmap@@@Z @ 99 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class TSize, class CApaMaskedBitmap &) const + ?GetAppIconSizes@RApaLsSession@@QBEHVTUid@@AAV?$CArrayFixFlat@VTSize@@@@@Z @ 100 NONAME ; int RApaLsSession::GetAppIconSizes(class TUid, class CArrayFixFlat &) const + ?GetAppInfo@RApaLsSession@@QBEHAAVTApaAppInfo@@VTUid@@@Z @ 101 NONAME ; int RApaLsSession::GetAppInfo(class TApaAppInfo &, class TUid) const + ?GetAppOwnedFiles@RApaLsSession@@QBEHAAVCDesC16Array@@VTUid@@@Z @ 102 NONAME ; int RApaLsSession::GetAppOwnedFiles(class CDesC16Array &, class TUid) const + ?GetAppServiceOpaqueDataLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@0@Z @ 103 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServiceOpaqueDataLC(class TUid, class TUid) const + ?GetAppServicesL@RApaLsSession@@QBEXVTUid@@AAV?$CArrayFixFlat@VTUid@@@@@Z @ 104 NONAME ; void RApaLsSession::GetAppServicesL(class TUid, class CArrayFixFlat &) const + ?GetAppServicesLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 105 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServicesLC(class TUid) const + ?GetAppType@RApaLsSession@@QBEHAAVTUid@@V2@@Z @ 106 NONAME ; int RApaLsSession::GetAppType(class TUid &, class TUid) const + ?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0AAPAVHBufC16@@@Z @ 107 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class HBufC16 * &) const + ?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0ABVTSize@@AAVCApaMaskedBitmap@@@Z @ 108 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class TSize const &, class CApaMaskedBitmap &) const + ?GetAppViews@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTApaAppViewInfo@@@@VTUid@@@Z @ 109 NONAME ; int RApaLsSession::GetAppViews(class CArrayFixFlat &, class TUid) const + ?GetDataRecognitionResultL@CDataRecognitionResultArray@@QBEXAAVTDataRecognitionResult@@I@Z @ 110 NONAME ; void CDataRecognitionResultArray::GetDataRecognitionResultL(class TDataRecognitionResult &, unsigned int) const + ?GetDefaultScreenNumber@RApaLsSession@@QBEHAAHVTUid@@@Z @ 111 NONAME ; int RApaLsSession::GetDefaultScreenNumber(int &, class TUid) const + ?GetEmbeddableApps@RApaLsSession@@QBEHH@Z @ 112 NONAME ; int RApaLsSession::GetEmbeddableApps(int) const + ?GetEmbeddableApps@RApaLsSession@@QBEHXZ @ 113 NONAME ; int RApaLsSession::GetEmbeddableApps(void) const + ?GetFileNameL@CDataRecognitionResultArray@@QBEXAAV?$TBuf@$0BAA@@@I@Z @ 114 NONAME ; void CDataRecognitionResultArray::GetFileNameL(class TBuf<256> &, unsigned int) const + ?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@@Z @ 115 NONAME ; int RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &) const + ?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@H@Z @ 116 NONAME ; int RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &, int) const + ?GetFilteredApps@RApaLsSession@@QBEHII@Z @ 117 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int) const + ?GetFilteredApps@RApaLsSession@@QBEHIIH@Z @ 118 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int, int) const + ?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 119 NONAME ; void CApaAppData::GetIconInfo(int &, int &) const + ?GetJavaMIDletInfoL@ForJavaMIDletInstaller@@SAXAAVRFs@@ABVTDesC16@@AAK2@Z @ 120 NONAME ABSENT ; void ForJavaMIDletInstaller::GetJavaMIDletInfoL(class RFs &, class TDesC16 const &, unsigned long &, unsigned long &) + ?GetMaxDataBufSize@RApaLsSession@@QBEHAAH@Z @ 121 NONAME ; int RApaLsSession::GetMaxDataBufSize(int &) const + ?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@@Z @ 122 NONAME ; int RApaLsSession::GetNextApp(class TApaAppInfo &) const + ?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@H@Z @ 123 NONAME ; int RApaLsSession::GetNextApp(class TApaAppInfo &, int) const + ?GetPreferredBufSize@RApaLsSession@@QBEHAAH@Z @ 124 NONAME ; int RApaLsSession::GetPreferredBufSize(int &) const + ?GetServerApps@RApaLsSession@@QBEHVTUid@@@Z @ 125 NONAME ; int RApaLsSession::GetServerApps(class TUid) const + ?GetServerApps@RApaLsSession@@QBEHVTUid@@H@Z @ 126 NONAME ; int RApaLsSession::GetServerApps(class TUid, int) const + ?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 127 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid) const + ?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@ABVTDataType@@@Z @ 128 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid, class TDataType const &) const + ?GetSupportedDataTypesL@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTDataType@@@@@Z @ 129 NONAME ; int RApaLsSession::GetSupportedDataTypesL(class CArrayFixFlat &) const + ?HandleAsRegistrationFile@ApaUtils@@SAHABVTUidType@@@Z @ 130 NONAME ABSENT ; int ApaUtils::HandleAsRegistrationFile(class TUidType const &) + ?Hidden@CApaWindowGroupName@@QBEHXZ @ 131 NONAME ; int CApaWindowGroupName::Hidden(void) const + ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 132 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(int) const + ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 133 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(class TSize) const + ?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 134 NONAME ; class CApaMaskedBitmap * CApaAppViewData::Icon(class TSize const &) const + ?Icon@CApaSystemControl@@QBEPAVCApaMaskedBitmap@@XZ @ 135 NONAME ; class CApaMaskedBitmap * CApaSystemControl::Icon(void) const + ?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 136 NONAME ; class TPtrC16 CApaAppData::IconFileName(void) const + ?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 137 NONAME ; class TPtrC16 CApaAppViewData::IconFileName(void) const + ?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 138 NONAME ; class CArrayFixFlat * CApaAppData::IconSizesL(void) const + ?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 139 NONAME ; class CArrayFixFlat * CApaAppViewData::IconSizesL(void) const + ?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 140 NONAME ; int CApaAppData::ImplementsService(class TUid) const + ?Index@CApaSystemControlList@@QBEHVTUid@@@Z @ 141 NONAME ; int CApaSystemControlList::Index(class TUid) const + ?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 142 NONAME ; void CApaAppList::InitListL(class MApaAppListObserver *) + ?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@1@Z @ 143 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid, class TUid) + ?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@@Z @ 144 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid) + ?InsertDataMappingIfHigher@RApaLsSession@@QAEHABVTDataType@@JVTUid@@AAH@Z @ 145 NONAME ; int RApaLsSession::InsertDataMappingIfHigher(class TDataType const &, long, class TUid, int &) + ?InternalizeL@CApaMaskedBitmap@@QAEXAAVRReadStream@@@Z @ 146 NONAME ; void CApaMaskedBitmap::InternalizeL(class RReadStream &) + ?IsAppReady@CApaWindowGroupName@@QBEHXZ @ 147 NONAME ; int CApaWindowGroupName::IsAppReady(void) const + ?IsBusy@CApaWindowGroupName@@QBEHXZ @ 148 NONAME ; int CApaWindowGroupName::IsBusy(void) const + ?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 149 NONAME ; int CApaAppList::IsFirstScanComplete(void) const + ?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 150 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const + ?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 151 NONAME ; int CApaAppList::IsLanguageChangePending(void) const + ?IsPending@CApaAppData@@QBEHXZ @ 152 NONAME ; int CApaAppData::IsPending(void) const + ?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 153 NONAME ; int RApaLsSession::IsProgram(class TDesC16 const &, int &) const + ?IsSystem@CApaWindowGroupName@@QBEHXZ @ 154 NONAME ; int CApaWindowGroupName::IsSystem(void) const + ?KillTask@TApaTask@@QAEXXZ @ 155 NONAME ; void TApaTask::KillTask(void) + ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 156 NONAME ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const + ?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 157 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void) + ?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 158 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void) + ?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 159 NONAME ; class CFbsBitmap * CApaMaskedBitmap::Mask(void) const + ?MatchesSecurityPolicy@RApaLsSession@@QBEHAAHVTUid@@ABVTSecurityPolicy@@@Z @ 160 NONAME ; int RApaLsSession::MatchesSecurityPolicy(int &, class TUid, class TSecurityPolicy const &) const + ?MinApplicationStackSize@@YAIXZ @ 161 NONAME ; unsigned int MinApplicationStackSize(void) + ?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 162 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::New(class RWsSession const &, class HBufC16 *) + ?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 163 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int) + ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 164 NONAME ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &) + ?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 165 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int) + ?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 166 NONAME ; class CApaAppListNotifier * CApaAppListNotifier::NewL(class MApaAppListServObserver *, enum CActive::TPriority) + ?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 167 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CApaDocument &, class TSize const &) + ?NewL@CApaDoor@@SAPAV1@AAVRFs@@ABVCStreamStore@@VTStreamId@@AAVCApaProcess@@@Z @ 168 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CStreamStore const &, class TStreamId, class CApaProcess &) + ?NewL@CApaLocalisableResourceFileWriter@@SAPAV1@ABVTDesC16@@0H0@Z @ 169 NONAME ; class CApaLocalisableResourceFileWriter * CApaLocalisableResourceFileWriter::NewL(class TDesC16 const &, class TDesC16 const &, int, class TDesC16 const &) + ?NewL@CApaMaskedBitmap@@SAPAV1@PBV1@@Z @ 170 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewL(class CApaMaskedBitmap const *) + ?NewL@CApaRegistrationResourceFileWriter@@SAPAV1@VTUid@@ABVTDesC16@@I@Z @ 171 NONAME ; class CApaRegistrationResourceFileWriter * CApaRegistrationResourceFileWriter::NewL(class TUid, class TDesC16 const &, unsigned int) + ?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@@Z @ 172 NONAME ; class CApaSystemControlList * CApaSystemControlList::NewL(class RFs &) + ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 173 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &) + ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 174 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &, class TDesC16 const &) + ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 175 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &, int) + ?NewLC@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 176 NONAME ; class CApaDoor * CApaDoor::NewLC(class RFs &, class CApaDocument &, class TSize const &) + ?NewLC@CApaMaskedBitmap@@SAPAV1@XZ @ 177 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewLC(void) + ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 178 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &) + ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 179 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &, class TDesC16 const &) + ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 180 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &, int) + ?NewPictureL@TApaPictureFactory@@UBEXAAVTPictureHeader@@ABVCStreamStore@@@Z @ 181 NONAME ; void TApaPictureFactory::NewPictureL(class TPictureHeader &, class CStreamStore const &) const + ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 182 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *) const + ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 183 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *, int) const + ?NonMbmIconFile@CApaAppData@@QBEHXZ @ 184 NONAME ; int CApaAppData::NonMbmIconFile(void) const + ?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 185 NONAME ; int CApaAppViewData::NonMbmIconFile(void) const + ?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 186 NONAME ; class TUid CApaAppData::NonNativeApplicationType(void) const + ?NotifyOnDataMappingChange@RApaLsSession@@QAEXAAVTRequestStatus@@@Z @ 187 NONAME ; void RApaLsSession::NotifyOnDataMappingChange(class TRequestStatus &) + ?NumberOfOwnDefinedIcons@RApaLsSession@@QBEHVTUid@@AAH@Z @ 188 NONAME ; int RApaLsSession::NumberOfOwnDefinedIcons(class TUid, int &) const + ?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 189 NONAME ; class TPtrC8 CApaAppData::OpaqueData(void) const + ?OpaqueData@TApaAppServiceInfo@@QBEABVTDesC8@@XZ @ 190 NONAME ; class TDesC8 const & TApaAppServiceInfo::OpaqueData(void) const + ?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 191 NONAME ; class CDesC16Array * CApaAppData::OwnedFiles(void) const + ?Path@CDataRecognitionResultArray@@QBEABV?$TBuf@$0BAA@@@XZ @ 192 NONAME ; class TBuf<256> const & CDataRecognitionResultArray::Path(void) const + ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 193 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const + ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 194 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const + ?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 195 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void) + ?PurgeL@CApaAppList@@QAEXXZ @ 196 NONAME ; void CApaAppList::PurgeL(void) + ?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 197 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void) + ?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 198 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void) + ?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 199 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const + ?RecognizeData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 200 NONAME ; int RApaLsSession::RecognizeData(class TDesC16 const &, class TDesC8 const &, class TDataRecognitionResult &) const + ?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 201 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &, class TRequestStatus &) + ?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 202 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &, class TRequestStatus &) + ?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@AAVCDataRecognitionResultArray@@@Z @ 203 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &) const + ?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@@Z @ 204 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &) const + ?RecognizeSpecificData@RApaLsSession@@QBEHABVRFile@@ABVTDataType@@AAH@Z @ 205 NONAME ; int RApaLsSession::RecognizeSpecificData(class RFile const &, class TDataType const &, int &) const + ?RecognizeSpecificData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@ABVTDataType@@AAH@Z @ 206 NONAME ; int RApaLsSession::RecognizeSpecificData(class TDesC16 const &, class TDesC8 const &, class TDataType const &, int &) const + ?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 207 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const + ?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 208 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *) + ?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 209 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &) + ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 210 NONAME ; class TPtrC16 CApaAppData::RegistrationFileName(void) const + ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 211 NONAME ; int CApaAppData::RegistrationFileUsed(void) const + ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 212 NONAME ; void CApaAppList::ResetForcedRegistrations(void) + ?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 213 NONAME ; int CApaWindowGroupName::RespondsToShutdownEvent(void) const + ?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 214 NONAME ; int CApaWindowGroupName::RespondsToSwitchFilesEvent(void) const + ?RestartScanL@CApaAppList@@QAEXXZ @ 215 NONAME ; void CApaAppList::RestartScanL(void) + ?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 216 NONAME ; void CApaDoor::RestoreL(class CStreamStore const &, class TStreamId) + ?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 217 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void) + ?ScreenMode@CApaAppViewData@@QBEHXZ @ 218 NONAME ; int CApaAppViewData::ScreenMode(void) const + ?Self@CApaAppList@@SAPAV1@XZ @ 219 NONAME ; class CApaAppList * CApaAppList::Self(void) + ?SendKey@TApaTask@@QAEXABUTKeyEvent@@@Z @ 220 NONAME ; void TApaTask::SendKey(struct TKeyEvent const &) + ?SendKey@TApaTask@@QAEXHH@Z @ 221 NONAME ; void TApaTask::SendKey(int, int) + ?SendMessage@TApaTask@@QAEHVTUid@@ABVTDesC8@@@Z @ 222 NONAME ; int TApaTask::SendMessage(class TUid, class TDesC8 const &) + ?SendSystemEvent@TApaTask@@QAEXW4TApaSystemEvent@@@Z @ 223 NONAME ; void TApaTask::SendSystemEvent(enum TApaSystemEvent) + ?SendToBackground@TApaTask@@QAEXXZ @ 224 NONAME ; void TApaTask::SendToBackground(void) + ?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 225 NONAME ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const + ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 226 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const + ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 227 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const + ?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 228 NONAME ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const + ?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 229 NONAME ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const + ?SetAcceptedConfidence@RApaLsSession@@QAEHH@Z @ 230 NONAME ; int RApaLsSession::SetAcceptedConfidence(int) + ?SetAppIsHiddenL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 231 NONAME ; void CApaRegistrationResourceFileWriter::SetAppIsHiddenL(int) + ?SetAppReady@CApaWindowGroupName@@QAEXH@Z @ 232 NONAME ; void CApaWindowGroupName::SetAppReady(int) + ?SetAppShortCaption@RApaLsSession@@QAEHABVTDesC16@@W4TLanguage@@VTUid@@@Z @ 233 NONAME ; int RApaLsSession::SetAppShortCaption(class TDesC16 const &, enum TLanguage, class TUid) + ?SetAppUid@CApaWindowGroupName@@QAEXVTUid@@@Z @ 234 NONAME ; void CApaWindowGroupName::SetAppUid(class TUid) + ?SetBusy@CApaWindowGroupName@@QAEXH@Z @ 235 NONAME ; void CApaWindowGroupName::SetBusy(int) + ?SetCapability@CApaAppInfoFileWriter@@QAEHABVTDesC8@@@Z @ 236 NONAME ABSENT ; int CApaAppInfoFileWriter::SetCapability(class TDesC8 const &) + ?SetCaptionL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 237 NONAME ; void CApaWindowGroupName::SetCaptionL(class TDesC16 const &) + ?SetDefaultScreenNumberL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 238 NONAME ; void CApaRegistrationResourceFileWriter::SetDefaultScreenNumberL(int) + ?SetDocNameIsAFile@CApaWindowGroupName@@QAEXH@Z @ 239 NONAME ; void CApaWindowGroupName::SetDocNameIsAFile(int) + ?SetDocNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 240 NONAME ; void CApaWindowGroupName::SetDocNameL(class TDesC16 const &) + ?SetEmbeddabilityL@CApaRegistrationResourceFileWriter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 241 NONAME ; void CApaRegistrationResourceFileWriter::SetEmbeddabilityL(enum TApaAppCapability::TEmbeddability) + ?SetFormatToGlassL@CApaDoor@@QAEXXZ @ 242 NONAME ; void CApaDoor::SetFormatToGlassL(void) + ?SetFormatToIconL@CApaDoor@@QAEXXZ @ 243 NONAME ; void CApaDoor::SetFormatToIconL(void) + ?SetFormatToTemporaryIconL@CApaDoor@@QAEXH@Z @ 244 NONAME ; void CApaDoor::SetFormatToTemporaryIconL(int) + ?SetFsSessionL@RApaLsSession@@SAXAAVRFs@@@Z @ 245 NONAME ; void RApaLsSession::SetFsSessionL(class RFs &) + ?SetGroupNameL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 246 NONAME ; void CApaRegistrationResourceFileWriter::SetGroupNameL(class TDesC16 const &) + ?SetHidden@CApaWindowGroupName@@QAEXH@Z @ 247 NONAME ; void CApaWindowGroupName::SetHidden(int) + ?SetLaunchInBackgroundL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 248 NONAME ; void CApaRegistrationResourceFileWriter::SetLaunchInBackgroundL(int) + ?SetMaskBitmap@CApaMaskedBitmap@@QAEXPAVCFbsBitmap@@@Z @ 249 NONAME ; void CApaMaskedBitmap::SetMaskBitmap(class CFbsBitmap *) + ?SetMaxDataBufSize@RApaLsSession@@QAEHH@Z @ 250 NONAME ; int RApaLsSession::SetMaxDataBufSize(int) + ?SetNotify@RApaLsSession@@QAEXHAAVTRequestStatus@@@Z @ 251 NONAME ; void RApaLsSession::SetNotify(int, class TRequestStatus &) + ?SetOpaqueDataL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC8@@@Z @ 252 NONAME ; void CApaRegistrationResourceFileWriter::SetOpaqueDataL(class TDesC8 const &) + ?SetRespondsToShutdownEvent@CApaWindowGroupName@@QAEXH@Z @ 253 NONAME ; void CApaWindowGroupName::SetRespondsToShutdownEvent(int) + ?SetRespondsToSwitchFilesEvent@CApaWindowGroupName@@QAEXH@Z @ 254 NONAME ; void CApaWindowGroupName::SetRespondsToSwitchFilesEvent(int) + ?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 255 NONAME ; void CApaAppData::SetShortCaptionL(class TDesC16 const &) + ?SetSupportsNewFileL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 256 NONAME ; void CApaRegistrationResourceFileWriter::SetSupportsNewFileL(int) + ?SetSystem@CApaWindowGroupName@@QAEXH@Z @ 257 NONAME ; void CApaWindowGroupName::SetSystem(int) + ?SetUpdatedAppsList@CApaAppList@@QAEXPAVCUpdatedAppsList@@@Z @ 258 NONAME ABSENT ; void CApaAppList::SetUpdatedAppsList(class CUpdatedAppsList *) + ?SetWgId@TApaTask@@QAEXH@Z @ 259 NONAME ; void TApaTask::SetWgId(int) + ?SetWindowGroupName@CApaWindowGroupName@@QAEXPAVHBufC16@@@Z @ 260 NONAME ; void CApaWindowGroupName::SetWindowGroupName(class HBufC16 *) + ?SetWindowGroupName@CApaWindowGroupName@@QBEHAAVRWindowGroup@@@Z @ 261 NONAME ; int CApaWindowGroupName::SetWindowGroupName(class RWindowGroup &) const + ?SetWindowGroupNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 262 NONAME ; void CApaWindowGroupName::SetWindowGroupNameL(class TDesC16 const &) + ?ShortCaption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 263 NONAME ; class TPtrC16 CApaSystemControl::ShortCaption(void) const + ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@@Z @ 264 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &) + ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@@Z @ 265 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &) + ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 266 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &, class TRequestStatus *) + ?StartDocument@RApaLsSession@@QAEHAAVRFile@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 267 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TThreadId &, class TRequestStatus *) + ?StartDocument@RApaLsSession@@QAEHAAVRFile@@ABVTDataType@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 268 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TDataType const &, class TThreadId &, class TRequestStatus *) + ?StartDocument@RApaLsSession@@QAEHAAVRFile@@VTUid@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 269 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TUid, class TThreadId &, class TRequestStatus *) + ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@AAVTThreadId@@W4TLaunchType@1@@Z @ 270 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TThreadId &, enum RApaLsSession::TLaunchType) + ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@ABVTDataType@@AAVTThreadId@@W4TLaunchType@1@@Z @ 271 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TDataType const &, class TThreadId &, enum RApaLsSession::TLaunchType) + ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 272 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TUid, class TThreadId &, enum RApaLsSession::TLaunchType) + ?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 273 NONAME ; void CApaAppList::StartIdleUpdateL(class MApaAppListObserver *) + ?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 274 NONAME ; void CApaAppList::StartIdleUpdateL(void) + ?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 275 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &) + ?StartupApaServerProcess@@YAHXZ @ 276 NONAME ; int StartupApaServerProcess(void) + ?StopScan@CApaAppList@@QAEXH@Z @ 277 NONAME ; void CApaAppList::StopScan(int) + ?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 278 NONAME ABSENT ; void CApaAppInfoFileWriter::StoreL(void) + ?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 279 NONAME ; int TApaTask::SwitchCreateFile(class TDesC16 const &) + ?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 280 NONAME ; int TApaTask::SwitchOpenFile(class TDesC16 const &) + ?TestIconLoaderAndIconArrayL@TIconLoaderAndIconArrayForLeaks@@SAXXZ @ 281 NONAME ; void TIconLoaderAndIconArrayForLeaks::TestIconLoaderAndIconArrayL(void) + ?ThreadId@TApaTask@@QBE?AVTThreadId@@XZ @ 282 NONAME ; class TThreadId TApaTask::ThreadId(void) const + ?Type@CApaSystemControl@@QBE?AVTUid@@XZ @ 283 NONAME ; class TUid CApaSystemControl::Type(void) const + ?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 284 NONAME ; class TUid CApaAppViewData::Uid(void) const + ?Uid@TApaAppServiceInfo@@QBE?AVTUid@@XZ @ 285 NONAME ; class TUid TApaAppServiceInfo::Uid(void) const + ?UpdateL@CApaSystemControlList@@QAEXXZ @ 286 NONAME ; void CApaSystemControlList::UpdateL(void) + ?UpdatedAppsList@CApaAppList@@QAEPAVCUpdatedAppsList@@XZ @ 287 NONAME ABSENT ; class CUpdatedAppsList * CApaAppList::UpdatedAppsList(void) + ?Version@RApaLsSession@@QBE?AVTVersion@@XZ @ 288 NONAME ; class TVersion RApaLsSession::Version(void) const + ?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 289 NONAME ; class CArrayPtrFlat * CApaAppData::Views(void) const + ?WgId@TApaTask@@QBEHXZ @ 290 NONAME ; int TApaTask::WgId(void) const + ?WindowGroupName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 291 NONAME ; class TPtrC16 CApaWindowGroupName::WindowGroupName(void) const + ?KMinApplicationStackSize@@3HB @ 292 NONAME ; int const KMinApplicationStackSize + ?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 293 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &) + ?SetCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 294 NONAME ; void CApaAppData::SetCaptionL(class TDesC16 const &) + ?SetIconsL@CApaAppData@@QAEXABVTDesC16@@H@Z @ 295 NONAME ; void CApaAppData::SetIconsL(class TDesC16 const &, int) + ?TestIconCaptionOverridesL@TIconLoaderAndIconArrayForLeaks@@SAXXZ @ 296 NONAME ; void TIconLoaderAndIconArrayForLeaks::TestIconCaptionOverridesL(void) + ?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 297 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void) + ?DataTypes@TApaAppServiceInfo@@QAEAAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 298 NONAME ; class CArrayFixFlat & TApaAppServiceInfo::DataTypes(void) + ??0TApaAppIdentifier@@QAE@XZ @ 299 NONAME ; TApaAppIdentifier::TApaAppIdentifier(void) + ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 300 NONAME ; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &) + ?ExternalizeL@TApaAppCapability@@QBEXAAVRWriteStream@@@Z @ 301 NONAME ; void TApaAppCapability::ExternalizeL(class RWriteStream &) const + ??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@11@Z @ 302 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &, class TBuf<256> const &) + ?AddEmbeddability@TApaEmbeddabilityFilter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 303 NONAME ; void TApaEmbeddabilityFilter::AddEmbeddability(enum TApaAppCapability::TEmbeddability) + ?InternalizeL@TApaAppServiceInfo@@QAEXAAVRReadStream@@@Z @ 304 NONAME ; void TApaAppServiceInfo::InternalizeL(class RReadStream &) + ?InternalizeL@TApaAppViewInfo@@QAEXAAVRReadStream@@@Z @ 305 NONAME ; void TApaAppViewInfo::InternalizeL(class RReadStream &) + ?MatchesEmbeddability@TApaEmbeddabilityFilter@@QBEHW4TEmbeddability@TApaAppCapability@@@Z @ 306 NONAME ; int TApaEmbeddabilityFilter::MatchesEmbeddability(enum TApaAppCapability::TEmbeddability) const + ?ExternalizeL@TApaAppServiceInfo@@QBEXAAVRWriteStream@@@Z @ 307 NONAME ; void TApaAppServiceInfo::ExternalizeL(class RWriteStream &) const + ??0CApaAppServiceInfoArray@@IAE@XZ @ 308 NONAME ; CApaAppServiceInfoArray::CApaAppServiceInfoArray(void) + ??0TApaAppIdentifier@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@@Z @ 309 NONAME ; TApaAppIdentifier::TApaAppIdentifier(class TUid, class TBuf<256> const &) + ?CopyCapability@TApaAppCapability@@SAXAAVTDes8@@ABVTDesC8@@@Z @ 310 NONAME ; void TApaAppCapability::CopyCapability(class TDes8 &, class TDesC8 const &) + ??0TApaAppServiceInfo@@QAE@XZ @ 311 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(void) + ?Release@TApaAppServiceInfo@@QAEXXZ @ 312 NONAME ; void TApaAppServiceInfo::Release(void) + ?UpdateAppListByShortCaptionL@CApaAppList@@QAEXXZ @ 313 NONAME ; void CApaAppList::UpdateAppListByShortCaptionL(void) + ?ExternalizeL@TApaAppIdentifier@@QBEXAAVRWriteStream@@@Z @ 314 NONAME ; void TApaAppIdentifier::ExternalizeL(class RWriteStream &) const + ?ExternalizeL@TApaAppViewInfo@@QBEXAAVRWriteStream@@@Z @ 315 NONAME ; void TApaAppViewInfo::ExternalizeL(class RWriteStream &) const + ?NewL@CApaAppList@@SAPAV1@AAVRFs@@HH@Z @ 316 NONAME ; class CApaAppList * CApaAppList::NewL(class RFs &, int, int) + ?CApaAppServiceInfoArray_Reserved1@CApaAppServiceInfoArray@@EAEXXZ @ 317 NONAME ; void CApaAppServiceInfoArray::CApaAppServiceInfoArray_Reserved1(void) + ?ExternalizeL@TApaAppInfo@@QBEXAAVRWriteStream@@@Z @ 318 NONAME ; void TApaAppInfo::ExternalizeL(class RWriteStream &) const + ?InternalizeL@TApaAppCapability@@QAEXAAVRReadStream@@@Z @ 319 NONAME ; void TApaAppCapability::InternalizeL(class RReadStream &) + ??0TApaAppEntry@@QAE@XZ @ 320 NONAME ; TApaAppEntry::TApaAppEntry(void) + ?AddCustomAppInfoInListL@CApaAppList@@QAEXVTUid@@W4TLanguage@@ABVTDesC16@@@Z @ 321 NONAME ; void CApaAppList::AddCustomAppInfoInListL(class TUid, enum TLanguage, class TDesC16 const &) + ?CApaAppServiceInfoArray_Reserved2@CApaAppServiceInfoArray@@EAEXXZ @ 322 NONAME ; void CApaAppServiceInfoArray::CApaAppServiceInfoArray_Reserved2(void) + ?UpdateAppListByIconCaptionOverridesL@CApaAppList@@QAEXXZ @ 323 NONAME ; void CApaAppList::UpdateAppListByIconCaptionOverridesL(void) + ??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@1@Z @ 324 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &) + ?InternalizeL@TApaAppInfo@@QAEXAAVRReadStream@@@Z @ 325 NONAME ; void TApaAppInfo::InternalizeL(class RReadStream &) + ??0TApaEmbeddabilityFilter@@QAE@XZ @ 326 NONAME ; TApaEmbeddabilityFilter::TApaEmbeddabilityFilter(void) + ?InternalizeL@TApaAppIdentifier@@QAEXAAVRReadStream@@@Z @ 327 NONAME ; void TApaAppIdentifier::InternalizeL(class RReadStream &) + ??0TApaAppViewInfo@@QAE@XZ @ 328 NONAME ; TApaAppViewInfo::TApaAppViewInfo(void) + ??0TApaAppInfo@@QAE@XZ @ 329 NONAME ; TApaAppInfo::TApaAppInfo(void) + ??0TApaAppViewInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@H@Z @ 330 NONAME ; TApaAppViewInfo::TApaAppViewInfo(class TUid, class TBuf<256> const &, int) + ??0TApaAppServiceInfo@@QAE@VTUid@@PAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@PAVHBufC8@@@Z @ 331 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(class TUid, class CArrayFixFlat *, class HBufC8 *) + ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 332 NONAME ; int CApaAppList::AppListUpdatePending(void) + ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @333 NONAME ; TInt RecognizeData(class TDesC8 const &, class TDataRecognitionResult & ) const + ?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 334 NONAME ; class CArrayFixFlat * CApaAppList::UninstalledAppArray(void) + X @ 335 NONAME ABSENT ; + X @ 336 NONAME ABSENT ; + X @ 337 NONAME ABSENT ; + X @ 338 NONAME ABSENT ; + X @ 339 NONAME ABSENT ; + X @ 340 NONAME ABSENT ; + X @ 341 NONAME ABSENT ; + X @ 342 NONAME ABSENT ; + X @ 343 NONAME ABSENT ; + X @ 344 NONAME ABSENT ; + X @ 345 NONAME ABSENT ; + X @ 346 NONAME ABSENT ; + X @ 347 NONAME ABSENT ; + X @ 348 NONAME ABSENT ; + X @ 349 NONAME ABSENT ; + \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/conf/apparchitecture_closedcontentextinfo.confml Binary file appfw/apparchitecture/conf/apparchitecture_closedcontentextinfo.confml has changed diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/conf/apparchitecture_closedcontentextinfo_10003a3f.crml Binary file appfw/apparchitecture/conf/apparchitecture_closedcontentextinfo_10003a3f.crml has changed diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/conf/distribution.policy.s60 --- a/appfw/apparchitecture/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/APFILEU.DEF --- a/appfw/apparchitecture/eabi/APFILEU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/eabi/APFILEU.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -92,11 +92,11 @@ _ZTV14CAppSidChecker @ 91 NONAME ABSENT ; ## _ZNK16CApaAppRegFinder9DriveListEv @ 92 NONAME ABSENT _ZN16CApaAppRegFinder26FindAllRemovableMediaAppsLEv @ 93 NONAME ABSENT - _ZN26CApaAppInstallationMonitor4NewLEP16CApaAppArcServer @ 94 NONAME - _ZN26CApaAppInstallationMonitor5StartEv @ 95 NONAME - _ZN26CApaAppInstallationMonitorD0Ev @ 96 NONAME - _ZN26CApaAppInstallationMonitorD1Ev @ 97 NONAME - _ZN26CApaAppInstallationMonitorD2Ev @ 98 NONAME + _ZN26CApaAppInstallationMonitor4NewLEP16CApaAppArcServer @ 94 NONAME ABSENT + _ZN26CApaAppInstallationMonitor5StartEv @ 95 NONAME ABSENT + _ZN26CApaAppInstallationMonitorD0Ev @ 96 NONAME ABSENT + _ZN26CApaAppInstallationMonitorD1Ev @ 97 NONAME ABSENT + _ZN26CApaAppInstallationMonitorD2Ev @ 98 NONAME ABSENT _ZN21CApfMimeContentPolicy12IsClosedTypeERK7TDesC16 @ 99 NONAME _ZN21CApfMimeContentPolicy13IsClosedFileLER5RFile @ 100 NONAME _ZN21CApfMimeContentPolicy13IsClosedFileLERK7TDesC16 @ 101 NONAME diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/APGRFXU.DEF --- a/appfw/apparchitecture/eabi/APGRFXU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/eabi/APGRFXU.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -433,3 +433,13 @@ X @ 432 NONAME ABSENT _ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 433 NONAME _ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 434 NONAME + _ZN13RApaLsSession14UpdateAppListLER6RArrayI17TApaAppUpdateInfoE @ 435 NONAME + _ZN17TApaAppUpdateInfo12InternalizeLER11RReadStream @ 436 NONAME + _ZN17TApaAppUpdateInfoC1Ev @ 437 NONAME + _ZN17TApaAppUpdateInfoC2Ev @ 438 NONAME + _ZNK17TApaAppUpdateInfo12ExternalizeLER12RWriteStream @ 439 NONAME + _ZN17TApaAppUpdateInfoC1E4TUidNS_13TApaAppActionE @ 440 NONAME + _ZN17TApaAppUpdateInfoC2E4TUidNS_13TApaAppActionE @ 441 NONAME + _ZN13RApaLsSession16UpdatedAppsInfoLER6RArrayI17TApaAppUpdateInfoE @ 442 NONAME + _ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 443 NONAME + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/APSERVU.DEF --- a/appfw/apparchitecture/eabi/APSERVU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/eabi/APSERVU.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -56,13 +56,13 @@ _ZNK16CUpdatedAppsList8IsInListERK7TDesC16 @ 55 NONAME ABSENT _ZTIN16CUpdatedAppsList15CUpdatedAppInfoE @ 56 NONAME ABSENT ; ## _ZTVN16CUpdatedAppsList15CUpdatedAppInfoE @ 57 NONAME ABSENT ; ## - _ZN16CApaAppArcServer14RescanCallBackEv @ 58 NONAME + _ZN16CApaAppArcServer14RescanCallBackEv @ 58 NONAME ABSENT _ZTI18CCustomAppInfoData @ 59 NONAME ABSENT ; ## _ZTV18CCustomAppInfoData @ 60 NONAME ABSENT ; ## KApaLoadDataRecognizersOnDemand @ 61 NONAME DATA 4 KApaUnloadRecognizersTimeout @ 62 NONAME DATA 4 - _ZN16CApaAppArcServer27HandleInstallationEndEventLEv @ 63 NONAME - _ZN16CApaAppArcServer28HandleInstallationStartEventEv @ 64 NONAME + _ZN16CApaAppArcServer27HandleInstallationEndEventLEv @ 63 NONAME ABSENT + _ZN16CApaAppArcServer28HandleInstallationStartEventEv @ 64 NONAME ABSENT KApaDrivesToMonitor @ 65 NONAME DATA 4 KApaLoadMbmIconsOnDemand @ 66 NONAME DATA 4 _ZTI21CApaAppArcServSession @ 67 NONAME diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF --- a/appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -5,23 +5,23 @@ _Z23StartupApaServerProcessv @ 4 NONAME _ZN11CApaAppData16CanUseScreenModeEi @ 5 NONAME _ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 6 NONAME - _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 7 NONAME + _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 7 NONAME ABSENT _ZN11CApaAppDataD0Ev @ 8 NONAME _ZN11CApaAppDataD1Ev @ 9 NONAME _ZN11CApaAppDataD2Ev @ 10 NONAME - _ZN11CApaAppList12RestartScanLEv @ 11 NONAME + _ZN11CApaAppList12RestartScanLEv @ 11 NONAME ABSENT _ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 12 NONAME ABSENT _ZN11CApaAppList15UpdatedAppsListEv @ 13 NONAME ABSENT _ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 14 NONAME _ZN11CApaAppList16StartIdleUpdateLEv @ 15 NONAME _ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 16 NONAME ABSENT _ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 17 NONAME ABSENT - _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 18 NONAME - _ZN11CApaAppList24ResetForcedRegistrationsEv @ 19 NONAME + _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 18 NONAME ABSENT + _ZN11CApaAppList24ResetForcedRegistrationsEv @ 19 NONAME ABSENT _ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 20 NONAME ABSENT _ZN11CApaAppList4SelfEv @ 21 NONAME - _ZN11CApaAppList6PurgeLEv @ 22 NONAME - _ZN11CApaAppList8StopScanEi @ 23 NONAME + _ZN11CApaAppList6PurgeLEv @ 22 NONAME ABSENT + _ZN11CApaAppList8StopScanEi @ 23 NONAME ABSENT _ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 24 NONAME _ZN11CApaAppListD0Ev @ 25 NONAME _ZN11CApaAppListD1Ev @ 26 NONAME @@ -194,16 +194,16 @@ _ZNK11CApaAppData17ImplementsServiceE4TUid @ 193 NONAME _ZNK11CApaAppData19ApplicationLanguageEv @ 194 NONAME _ZNK11CApaAppData19DefaultScreenNumberEv @ 195 NONAME - _ZNK11CApaAppData20RegistrationFileNameEv @ 196 NONAME - _ZNK11CApaAppData20RegistrationFileUsedEv @ 197 NONAME + _ZNK11CApaAppData20RegistrationFileNameEv @ 196 NONAME ABSENT + _ZNK11CApaAppData20RegistrationFileUsedEv @ 197 NONAME ABSENT _ZNK11CApaAppData24NonNativeApplicationTypeEv @ 198 NONAME - _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 199 NONAME + _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 199 NONAME ABSENT _ZNK11CApaAppData4IconE5TSize @ 200 NONAME _ZNK11CApaAppData4IconEi @ 201 NONAME _ZNK11CApaAppData5ViewsEv @ 202 NONAME _ZNK11CApaAppData8AppEntryEv @ 203 NONAME _ZNK11CApaAppData8DataTypeERK9TDataType @ 204 NONAME - _ZNK11CApaAppData9IsPendingEv @ 205 NONAME + _ZNK11CApaAppData9IsPendingEv @ 205 NONAME ABSENT _ZNK11CApaAppList12AppDataByUidE4TUid @ 206 NONAME _ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 207 NONAME _ZNK11CApaAppList17AppScanInProgressEv @ 208 NONAME @@ -320,7 +320,7 @@ _ZNK8TApaTask6ExistsEv @ 319 NONAME _ZNK8TApaTask8ThreadIdEv @ 320 NONAME _ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 321 NONAME - _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 322 NONAME + _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 322 NONAME ABSENT _ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 323 NONAME _ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 324 NONAME _ZN11CApaAppList4NewLER3RFsii @ 325 NONAME @@ -411,6 +411,23 @@ _ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 410 NONAME _ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 411 NONAME _ZN31TIconLoaderAndIconArrayForLeaks25TestIconCaptionOverridesLEv @ 412 NONAME - _ZN11CApaAppList20AppListUpdatePendingEv @ 413 NONAME + _ZN11CApaAppList20AppListUpdatePendingEv @ 413 NONAME ABSENT _ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 414 NONAME _ZN11CApaAppList19UninstalledAppArrayEv @ 415 NONAME + _ZN11CApaAppData4NewLERKN4Usif28CApplicationRegistrationDataER3RFsRKNS0_26RSoftwareComponentRegistryE @ 416 NONAME + _ZN11CApaAppList18InitializeApplistLEP19MApaAppListObserver @ 417 NONAME + _ZN11CApaAppList22FindAndAddSpecificAppLE4TUid @ 418 NONAME + _ZN13RApaLsSession14UpdateAppListLER6RArrayI17TApaAppUpdateInfoE @ 419 NONAME + _ZN17TApaAppUpdateInfo12InternalizeLER11RReadStream @ 420 NONAME + _ZN17TApaAppUpdateInfoC1Ev @ 421 NONAME + _ZN17TApaAppUpdateInfoC2Ev @ 422 NONAME + _ZNK17TApaAppUpdateInfo12ExternalizeLER12RWriteStream @ 423 NONAME + _ZN17TApaAppUpdateInfoC1E4TUidNS_13TApaAppActionE @ 424 NONAME + _ZN17TApaAppUpdateInfoC2E4TUidNS_13TApaAppActionE @ 425 NONAME + _ZN11CApaAppData19IsLangChangePendingEv @ 426 NONAME + _ZN11CApaAppList14UpdateApplistLEP19MApaAppListObserverP6RArrayI17TApaAppUpdateInfoE4TUid @ 427 NONAME + _ZN11CApaAppList15UpdatedAppsInfoEv @ 428 NONAME + _ZN11CApaAppList28UpdateApplistByForceRegAppsLER13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 429 NONAME + _ZN13RApaLsSession16UpdatedAppsInfoLER6RArrayI17TApaAppUpdateInfoE @ 430 NONAME + _ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 431 NONAME + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/apfile_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/apfile_legacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,115 @@ +EXPORTS + _ZN19CApaAppLocatorProxy16GetAppEntryByUidER12TApaAppEntry4TUid @ 1 NONAME ABSENT + _ZN19CApaAppLocatorProxy21GetAppCapabilityByUidER5TDes84TUid @ 2 NONAME ABSENT + _ZN19CApaAppLocatorProxy4NewLER3RFs @ 3 NONAME ABSENT + _ZN19CApaAppLocatorProxyD0Ev @ 4 NONAME ABSENT + _ZN19CApaAppLocatorProxyD1Ev @ 5 NONAME ABSENT + _ZN19CApaAppLocatorProxyD2Ev @ 6 NONAME ABSENT + _ZN21CApaScanningAppFinder12FindAllAppsLEv @ 7 NONAME ABSENT + _ZN21CApaScanningAppFinder4NewLERK3RFs @ 8 NONAME ABSENT + _ZN21CApaScanningAppFinder5NewLCERK3RFs @ 9 NONAME ABSENT + _ZN21CApaScanningAppFinder5NextLER12TApaAppEntry @ 10 NONAME ABSENT + _ZN21CApaScanningAppFinder8FindAppLERK7TDesC164TUid @ 11 NONAME ABSENT + _ZN21CApaScanningAppFinderD0Ev @ 12 NONAME ABSENT + _ZN21CApaScanningAppFinderD1Ev @ 13 NONAME ABSENT + _ZN21CApaScanningAppFinderD2Ev @ 14 NONAME ABSENT + _ZN25CApaScanningControlFinder12FindAllAppsLEv @ 15 NONAME ABSENT + _ZN25CApaScanningControlFinder4NewLERK3RFs @ 16 NONAME ABSENT + _ZN25CApaScanningControlFinder5NewLCERK3RFs @ 17 NONAME ABSENT + _ZN25CApaScanningControlFinder5NextLER12TApaAppEntry @ 18 NONAME ABSENT + _ZN25CApaScanningControlFinder8FindAppLERK7TDesC164TUid @ 19 NONAME ABSENT + _ZN25CApaScanningControlFinderD0Ev @ 20 NONAME ABSENT + _ZN25CApaScanningControlFinderD1Ev @ 21 NONAME ABSENT + _ZN25CApaScanningControlFinderD2Ev @ 22 NONAME ABSENT + _ZN26CApaScanningFileRecognizer10ConstructLEv @ 23 NONAME ABSENT + _ZN26CApaScanningFileRecognizer14SetRecognizerLERKNS_11TRecognizerE @ 24 NONAME ABSENT + _ZN26CApaScanningFileRecognizer15RecognizerCountEv @ 25 NONAME ABSENT + _ZN26CApaScanningFileRecognizer19ScanForRecognizersLEv @ 26 NONAME ABSENT + _ZN26CApaScanningFileRecognizer23SetRecognizersFromListLERK13CArrayFixFlatINS_11TRecognizerEE @ 27 NONAME ABSENT + _ZN26CApaScanningFileRecognizer4NewLER3RFsP14MApaAppStarter @ 28 NONAME ABSENT + _ZN26CApaScanningFileRecognizerC1ER3RFsP14MApaAppStarter @ 29 NONAME ABSENT + _ZN26CApaScanningFileRecognizerC2ER3RFsP14MApaAppStarter @ 30 NONAME ABSENT + _ZN26CApaScanningFileRecognizerD0Ev @ 31 NONAME ABSENT + _ZN26CApaScanningFileRecognizerD1Ev @ 32 NONAME ABSENT + _ZN26CApaScanningFileRecognizerD2Ev @ 33 NONAME ABSENT + _ZN6Apfile8TempPathEv @ 34 NONAME ABSENT + _ZNK21CApaScanningAppFinder22DefaultAppInfoFileNameEv @ 35 NONAME ABSENT + _ZNK21CApaScanningAppFinder8TempPathEv @ 36 NONAME ABSENT + _ZNK25CApaScanningControlFinder22DefaultAppInfoFileNameEv @ 37 NONAME ABSENT + _ZNK25CApaScanningControlFinder8TempPathEv @ 38 NONAME ABSENT + _ZNK26CApaScanningFileRecognizer13UpdateCounterEv @ 39 NONAME ABSENT + _ZNK26CApaScanningFileRecognizer16RecognizerListLCEv @ 40 NONAME ABSENT + _ZNK26CApaScanningFileRecognizerixEi @ 41 NONAME ABSENT + _ZTI26CApaScanningFileRecognizer @ 42 NONAME ABSENT ; ## + _ZTV26CApaScanningFileRecognizer @ 43 NONAME ABSENT ; ## + _ZN26CApaScanningFileRecognizer18SetEcomRecognizerLERKNS_11TRecognizerE @ 44 NONAME ABSENT + _ZN26CApaScanningFileRecognizer27SetEcomRecognizersFromListLERK13CArrayFixFlatINS_11TRecognizerEE @ 45 NONAME ABSENT + _ZTI17CApaRecognizerDll @ 46 NONAME ABSENT ; ## + _ZTI19CApaAppLocatorProxy @ 47 NONAME ABSENT ; ## + _ZTI21CApaScanningAppFinder @ 48 NONAME ABSENT ; ## + _ZTI25CApaScanningControlFinder @ 49 NONAME ABSENT ; ## + _ZTIN26CApaScanningFileRecognizer27CApaBackupOperationObserverE @ 50 NONAME ABSENT ; ## + _ZTV17CApaRecognizerDll @ 51 NONAME ABSENT ; ## + _ZTV19CApaAppLocatorProxy @ 52 NONAME ABSENT ; ## + _ZTV21CApaScanningAppFinder @ 53 NONAME ABSENT ; ## + _ZTV25CApaScanningControlFinder @ 54 NONAME ABSENT ; ## + _ZTVN26CApaScanningFileRecognizer27CApaBackupOperationObserverE @ 55 NONAME ABSENT ; ## + _ZN16CApaAppRegFinder12FindAllAppsLEv @ 56 NONAME ABSENT + _ZN16CApaAppRegFinder4NewLERK3RFs @ 57 NONAME ABSENT + _ZN16CApaAppRegFinder5NewLCERK3RFs @ 58 NONAME ABSENT + _ZN16CApaAppRegFinder5NextLER12TApaAppEntry @ 59 NONAME ABSENT + _ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK13RPointerArrayI7HBufC16E @ 60 NONAME ABSENT + _ZNK16CApaAppRegFinder8TempPathEv @ 61 NONAME ABSENT + _ZTI16CApaAppRegFinder @ 62 NONAME ABSENT ; ## + _ZTV16CApaAppRegFinder @ 63 NONAME ABSENT ; ## + _ZN17CAppLaunchChecker10Reserved_1Ev @ 64 NONAME + _ZN17CAppLaunchChecker10Reserved_2Ev @ 65 NONAME + _ZN17CAppLaunchChecker10Reserved_3Ev @ 66 NONAME + _ZN17CAppLaunchCheckerD0Ev @ 67 NONAME + _ZN17CAppLaunchCheckerD1Ev @ 68 NONAME + _ZN17CAppLaunchCheckerD2Ev @ 69 NONAME + _ZN28CApaScanningRuleBasedPlugIns4NewLEv @ 70 NONAME + _ZNK28CApaScanningRuleBasedPlugInsixEi @ 71 NONAME + _ZTI16CApaRuleBasedDll @ 72 NONAME ; ## + _ZTI17CAppLaunchChecker @ 73 NONAME ; ## + _ZTV16CApaRuleBasedDll @ 74 NONAME ; ## + _ZTV17CAppLaunchChecker @ 75 NONAME ; ## + _ZN28CApaScanningRuleBasedPlugInsD0Ev @ 76 NONAME + _ZN28CApaScanningRuleBasedPlugInsD1Ev @ 77 NONAME + _ZN28CApaScanningRuleBasedPlugInsD2Ev @ 78 NONAME + _ZTI28CApaScanningRuleBasedPlugIns @ 79 NONAME ; ## + _ZTV28CApaScanningRuleBasedPlugIns @ 80 NONAME ; ## + _ZN28CApaScanningRuleBasedPlugIns24ScanForRuleBasedPlugInsLEv @ 81 NONAME + _ZNK28CApaScanningRuleBasedPlugIns19ImplementationCountEv @ 82 NONAME + _ZN14CAppSidChecker18SetRescanCallBackLERK9TCallBack @ 83 NONAME ABSENT + _ZN14CAppSidChecker9reserved1Ev @ 84 NONAME ABSENT + _ZN14CAppSidChecker9reserved2Ev @ 85 NONAME ABSENT + _ZN14CAppSidChecker9reserved3Ev @ 86 NONAME ABSENT + _ZN14CAppSidCheckerD0Ev @ 87 NONAME ABSENT + _ZN14CAppSidCheckerD1Ev @ 88 NONAME ABSENT + _ZN14CAppSidCheckerD2Ev @ 89 NONAME ABSENT + _ZTI14CAppSidChecker @ 90 NONAME ABSENT ; ## + _ZTV14CAppSidChecker @ 91 NONAME ABSENT ; ## + _ZNK16CApaAppRegFinder9DriveListEv @ 92 NONAME ABSENT + _ZN16CApaAppRegFinder26FindAllRemovableMediaAppsLEv @ 93 NONAME ABSENT + _ZN26CApaAppInstallationMonitor4NewLEP16CApaAppArcServer @ 94 NONAME + _ZN26CApaAppInstallationMonitor5StartEv @ 95 NONAME + _ZN26CApaAppInstallationMonitorD0Ev @ 96 NONAME + _ZN26CApaAppInstallationMonitorD1Ev @ 97 NONAME + _ZN26CApaAppInstallationMonitorD2Ev @ 98 NONAME + _ZN21CApfMimeContentPolicy12IsClosedTypeERK7TDesC16 @ 99 NONAME + _ZN21CApfMimeContentPolicy13IsClosedFileLER5RFile @ 100 NONAME + _ZN21CApfMimeContentPolicy13IsClosedFileLERK7TDesC16 @ 101 NONAME + _ZN21CApfMimeContentPolicy14IsDRMEnvelopeLER5RFile @ 102 NONAME + _ZN21CApfMimeContentPolicy14IsDRMEnvelopeLERK7TDesC16 @ 103 NONAME + _ZN21CApfMimeContentPolicy17IsClosedExtensionERK7TDesC16 @ 104 NONAME + _ZN21CApfMimeContentPolicy4NewLER3RFs @ 105 NONAME + _ZN21CApfMimeContentPolicy4NewLEv @ 106 NONAME + _ZN21CApfMimeContentPolicy5NewLCER3RFs @ 107 NONAME + _ZN21CApfMimeContentPolicy5NewLCEv @ 108 NONAME + _ZN21CApfMimeContentPolicyD0Ev @ 109 NONAME + _ZN21CApfMimeContentPolicyD1Ev @ 110 NONAME + _ZN21CApfMimeContentPolicyD2Ev @ 111 NONAME + _ZTI21CApfMimeContentPolicy @ 112 NONAME + _ZTV21CApfMimeContentPolicy @ 113 NONAME + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/apgrfx_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/apgrfx_legacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,445 @@ +EXPORTS + _ZNK11CApaAppData11GetIconInfoERiS0_ @ 1 NONAME ABSENT + _ZN11CApaAppData16CanUseScreenModeEi @ 2 NONAME ABSENT + _ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 3 NONAME ABSENT + _ZN11CApaAppList16StartIdleUpdateLEv @ 4 NONAME ABSENT + _ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 5 NONAME ABSENT + _ZN11CApaAppList6PurgeLEv @ 6 NONAME ABSENT + _ZN11CApaAppList7UpdateLEv @ 7 NONAME ABSENT + _ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 8 NONAME ABSENT + _ZN11CApaAppListD0Ev @ 9 NONAME ABSENT + _ZN11CApaAppListD1Ev @ 10 NONAME ABSENT + _ZN11CApaAppListD2Ev @ 11 NONAME ABSENT + _ZN12TApaTaskList10CycleTasksE4TUidNS_15TCycleDirectionE @ 12 NONAME + _ZN12TApaTaskList7FindAppE4TUid @ 13 NONAME + _ZN12TApaTaskList7FindAppERK7TDesC16 @ 14 NONAME + _ZN12TApaTaskList7FindDocERK7TDesC16 @ 15 NONAME + _ZN12TApaTaskList9FindByPosEi @ 16 NONAME + _ZN12TApaTaskListC1ER10RWsSession @ 17 NONAME + _ZN12TApaTaskListC2ER10RWsSession @ 18 NONAME + _ZN13RApaLsSession13StartDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 19 NONAME + _ZN13RApaLsSession13StartDocumentERK7TDesC16R9TThreadIdNS_11TLaunchTypeE @ 20 NONAME + _ZN13RApaLsSession13StartDocumentERK7TDesC16RK9TDataTypeR9TThreadIdNS_11TLaunchTypeE @ 21 NONAME + _ZN13RApaLsSession14CreateDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 22 NONAME + _ZN13RApaLsSession17SetMaxDataBufSizeEi @ 23 NONAME + _ZN13RApaLsSession21SetAcceptedConfidenceEi @ 24 NONAME + _ZN13RApaLsSession7ConnectEv @ 25 NONAME + _ZN13RApaLsSession8StartAppERK15CApaCommandLine @ 26 NONAME + _ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadId @ 27 NONAME + _ZN13RApaLsSessionC1Ev @ 28 NONAME + _ZN13RApaLsSessionC2Ev @ 29 NONAME + _ZN16AppInfoFileUtils14GetAifFileNameERK3RFsR6TDes16 @ 30 NONAME ABSENT + _ZN16CApaMaskedBitmap12InternalizeLER11RReadStream @ 31 NONAME + _ZN16CApaMaskedBitmap13SetMaskBitmapEP10CFbsBitmap @ 32 NONAME + _ZN16CApaMaskedBitmap4NewLEPKS_ @ 33 NONAME + _ZN16CApaMaskedBitmap5NewLCEv @ 34 NONAME + _ZN16CApaMaskedBitmapD0Ev @ 35 NONAME + _ZN16CApaMaskedBitmapD1Ev @ 36 NONAME + _ZN16CApaMaskedBitmapD2Ev @ 37 NONAME + _ZN17CApaSystemControl7CreateLEv @ 38 NONAME + _ZN18TApaPictureFactoryC1EP11CApaProcess @ 39 NONAME + _ZN18TApaPictureFactoryC2EP11CApaProcess @ 40 NONAME + _ZN19CApaAppListNotifier4NewLEP23MApaAppListServObserverN7CActive9TPriorityE @ 41 NONAME + _ZN19CApaAppListNotifierD0Ev @ 42 NONAME + _ZN19CApaAppListNotifierD1Ev @ 43 NONAME + _ZN19CApaAppListNotifierD2Ev @ 44 NONAME + _ZN19CApaWindowGroupName11SetAppReadyEi @ 45 NONAME + _ZN19CApaWindowGroupName11SetCaptionLERK7TDesC16 @ 46 NONAME + _ZN19CApaWindowGroupName11SetDocNameLERK7TDesC16 @ 47 NONAME + _ZN19CApaWindowGroupName12FindByAppUidE4TUidR10RWsSessionRi @ 48 NONAME + _ZN19CApaWindowGroupName13FindByCaptionERK7TDesC16R10RWsSessionRi @ 49 NONAME + _ZN19CApaWindowGroupName13FindByDocNameERK7TDesC16R10RWsSessionRi @ 50 NONAME + _ZN19CApaWindowGroupName17SetDocNameIsAFileEi @ 51 NONAME + _ZN19CApaWindowGroupName18ConstructFromWgIdLEi @ 52 NONAME + _ZN19CApaWindowGroupName18SetWindowGroupNameEP7HBufC16 @ 53 NONAME + _ZN19CApaWindowGroupName19SetWindowGroupNameLERK7TDesC16 @ 54 NONAME + _ZN19CApaWindowGroupName26SetRespondsToShutdownEventEi @ 55 NONAME + _ZN19CApaWindowGroupName29SetRespondsToSwitchFilesEventEi @ 56 NONAME + _ZN19CApaWindowGroupName3NewERK10RWsSessionP7HBufC16 @ 57 NONAME + _ZN19CApaWindowGroupName4NewLERK10RWsSession @ 58 NONAME + _ZN19CApaWindowGroupName4NewLERK10RWsSessionRK7TDesC16 @ 59 NONAME + _ZN19CApaWindowGroupName4NewLERK10RWsSessioni @ 60 NONAME + _ZN19CApaWindowGroupName5NewLCERK10RWsSession @ 61 NONAME + _ZN19CApaWindowGroupName5NewLCERK10RWsSessionRK7TDesC16 @ 62 NONAME + _ZN19CApaWindowGroupName5NewLCERK10RWsSessioni @ 63 NONAME + _ZNK19CApaWindowGroupName6HiddenEv @ 64 NONAME + _ZN19CApaWindowGroupName7SetBusyEi @ 65 NONAME + _ZN19CApaWindowGroupName9SetAppUidE4TUid @ 66 NONAME + _ZN19CApaWindowGroupName9SetHiddenEi @ 67 NONAME + _ZN19CApaWindowGroupName9SetSystemEi @ 68 NONAME + _ZN19CApaWindowGroupNameD0Ev @ 69 NONAME + _ZN19CApaWindowGroupNameD1Ev @ 70 NONAME + _ZN19CApaWindowGroupNameD2Ev @ 71 NONAME + _ZN21CApaAppInfoFileReader12StretchDrawLEP10CFbsBitmapS1_5TSize @ 72 NONAME ABSENT + _ZN21CApaAppInfoFileReader19CreateMaskedBitmapLEi @ 73 NONAME ABSENT + _ZN21CApaAppInfoFileReader4NewLER3RFsRK7TDesC164TUid @ 74 NONAME ABSENT + _ZN21CApaAppInfoFileReader5NewLCER3RFsRK7TDesC164TUid @ 75 NONAME ABSENT + _ZN21CApaAppInfoFileReader8CaptionLE9TLanguage @ 76 NONAME ABSENT + _ZN21CApaAppInfoFileReaderD0Ev @ 77 NONAME ABSENT + _ZN21CApaAppInfoFileReaderD1Ev @ 78 NONAME ABSENT + _ZN21CApaAppInfoFileReaderD2Ev @ 79 NONAME ABSENT + _ZN21CApaAppInfoFileWriter10StoreViewLE4TUid @ 80 NONAME ABSENT + _ZN21CApaAppInfoFileWriter11AddCaptionLE9TLanguageRK7TDesC16 @ 81 NONAME ABSENT + _ZN21CApaAppInfoFileWriter12AddDataTypeLERK21TDataTypeWithPriority @ 82 NONAME ABSENT + _ZN21CApaAppInfoFileWriter12AddViewIconLER16CApaMaskedBitmap4TUid @ 83 NONAME ABSENT + _ZN21CApaAppInfoFileWriter13AddOwnedFileLERK7TDesC16 @ 84 NONAME ABSENT + _ZN21CApaAppInfoFileWriter13SetCapabilityERK6TDesC8 @ 85 NONAME ABSENT + _ZN21CApaAppInfoFileWriter15AddViewCaptionLE9TLanguageRK7TDesC164TUid @ 86 NONAME ABSENT + _ZN21CApaAppInfoFileWriter5NewLCER3RFsRK7TDesC164TUid @ 87 NONAME ABSENT + _ZN21CApaAppInfoFileWriter6StoreLEv @ 88 NONAME ABSENT + _ZN21CApaAppInfoFileWriter8AddIconLER16CApaMaskedBitmap @ 89 NONAME ABSENT + _ZN21CApaAppInfoFileWriter8AddIconLERK7TDesC16 @ 90 NONAME ABSENT + _ZN21CApaAppInfoFileWriter8AddViewLE4TUid @ 91 NONAME ABSENT + _ZN21CApaAppInfoFileWriter8AddViewLE4TUidi @ 92 NONAME ABSENT + _ZN21CApaAppInfoFileWriterD0Ev @ 93 NONAME ABSENT + _ZN21CApaAppInfoFileWriterD1Ev @ 94 NONAME ABSENT + _ZN21CApaAppInfoFileWriterD2Ev @ 95 NONAME ABSENT + _ZN21CApaSystemControlList4NewLER3RFsR13CApaAppFinderRK7TDesC16 @ 96 NONAME ABSENT + _ZN21CApaSystemControlList7UpdateLEv @ 97 NONAME + _ZN21CApaSystemControlListD0Ev @ 98 NONAME + _ZN21CApaSystemControlListD1Ev @ 99 NONAME + _ZN21CApaSystemControlListD2Ev @ 100 NONAME + _ZN8CApaDoor16SetFormatToIconLEv @ 101 NONAME + _ZN8CApaDoor17SetFormatToGlassLEv @ 102 NONAME + _ZN8CApaDoor25SetFormatToTemporaryIconLEi @ 103 NONAME + _ZN8CApaDoor4NewLER3RFsR12CApaDocumentRK5TSize @ 104 NONAME + _ZN8CApaDoor4NewLER3RFsRK12CStreamStore9TStreamIdR11CApaProcess @ 105 NONAME + _ZN8CApaDoor5NewLCER3RFsR12CApaDocumentRK5TSize @ 106 NONAME + _ZN8CApaDoor8RestoreLERK12CStreamStore9TStreamId @ 107 NONAME + _ZN8CApaDoor9DocumentLEi @ 108 NONAME + _ZN8CApaDoorD0Ev @ 109 NONAME + _ZN8CApaDoorD1Ev @ 110 NONAME + _ZN8CApaDoorD2Ev @ 111 NONAME + _ZN8TApaTask11SendMessageE4TUidRK6TDesC8 @ 112 NONAME + _ZN8TApaTask14SwitchOpenFileERK7TDesC16 @ 113 NONAME + _ZN8TApaTask15SendSystemEventE15TApaSystemEvent @ 114 NONAME + _ZN8TApaTask16SendToBackgroundEv @ 115 NONAME + _ZN8TApaTask16SwitchCreateFileERK7TDesC16 @ 116 NONAME + _ZN8TApaTask17BringToForegroundEv @ 117 NONAME + _ZN8TApaTask7EndTaskEv @ 118 NONAME + _ZN8TApaTask7SendKeyERK9TKeyEvent @ 119 NONAME + _ZN8TApaTask7SendKeyEii @ 120 NONAME + _ZN8TApaTask7SetWgIdEi @ 121 NONAME + _ZN8TApaTask8KillTaskEv @ 122 NONAME + _ZN8TApaTaskC1ER10RWsSession @ 123 NONAME + _ZN8TApaTaskC2ER10RWsSession @ 124 NONAME + _ZNK11CApaAppData10CapabilityER5TDes8 @ 125 NONAME ABSENT + _ZNK11CApaAppData10IconSizesLEv @ 126 NONAME ABSENT + _ZNK11CApaAppData10OwnedFilesEv @ 127 NONAME ABSENT + _ZNK11CApaAppData4IconE5TSize @ 128 NONAME ABSENT + _ZNK11CApaAppData4IconEi @ 129 NONAME ABSENT + _ZNK11CApaAppData5ViewsEv @ 130 NONAME ABSENT + _ZNK11CApaAppData8AppEntryEv @ 131 NONAME ABSENT + _ZNK11CApaAppData8DataTypeERK9TDataType @ 132 NONAME ABSENT + _ZNK11CApaAppList12AppDataByUidE4TUid @ 133 NONAME ABSENT + _ZNK11CApaAppList13UpdateCounterEv @ 134 NONAME ABSENT + _ZNK11CApaAppList19IsFirstScanCompleteEv @ 135 NONAME ABSENT + _ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 136 NONAME ABSENT + _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 137 NONAME ABSENT + _ZNK11CApaAppList5CountEv @ 138 NONAME ABSENT + _ZNK11CApaAppList7NextAppEPK11CApaAppData @ 139 NONAME ABSENT + _ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 140 NONAME ABSENT + _ZNK11CApaAppList8FirstAppEi @ 141 NONAME ABSENT + _ZNK11CApaAppList8FirstAppEv @ 142 NONAME ABSENT + _ZNK13RApaLsSession10GetAllAppsEi @ 143 NONAME + _ZNK13RApaLsSession10GetAllAppsEv @ 144 NONAME + _ZNK13RApaLsSession10GetAppIconE4TUid5TSizeR16CApaMaskedBitmap @ 145 NONAME + _ZNK13RApaLsSession10GetAppIconE4TUidiR16CApaMaskedBitmap @ 146 NONAME + _ZNK13RApaLsSession10GetAppInfoER11TApaAppInfo4TUid @ 147 NONAME + _ZNK13RApaLsSession10GetNextAppER11TApaAppInfo @ 148 NONAME + _ZNK13RApaLsSession10GetNextAppER11TApaAppInfoi @ 149 NONAME + _ZNK13RApaLsSession11GetAppViewsER13CArrayFixFlatI15TApaAppViewInfoE4TUid @ 150 NONAME + _ZNK13RApaLsSession13RecognizeDataERK7TDesC16RK6TDesC8R22TDataRecognitionResult @ 151 NONAME + _ZNK13RApaLsSession14AppForDataTypeERK9TDataTypeR4TUid @ 152 NONAME + _ZNK13RApaLsSession14AppForDocumentERK7TDesC16R4TUidR9TDataType @ 153 NONAME + _ZNK13RApaLsSession14GetAppInfo_7_0ER15TApaAppInfo_7_04TUid @ 154 NONAME ABSENT + _ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RK5TSizeR16CApaMaskedBitmap @ 155 NONAME + _ZNK13RApaLsSession14GetNextApp_7_0ER15TApaAppInfo_7_0 @ 156 NONAME ABSENT + _ZNK13RApaLsSession14GetNextApp_7_0ER15TApaAppInfo_7_0i @ 157 NONAME ABSENT + _ZNK13RApaLsSession15GetAppIconSizesE4TUidR13CArrayFixFlatI5TSizeE @ 158 NONAME + _ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilter @ 159 NONAME + _ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilteri @ 160 NONAME + _ZNK13RApaLsSession16GetAppCapabilityER5TDes84TUid @ 161 NONAME + _ZNK13RApaLsSession16GetAppOwnedFilesER12CDesC16Array4TUid @ 162 NONAME + _ZNK13RApaLsSession17GetEmbeddableAppsEi @ 163 NONAME + _ZNK13RApaLsSession17GetEmbeddableAppsEv @ 164 NONAME + _ZNK13RApaLsSession17GetMaxDataBufSizeERi @ 165 NONAME + _ZNK13RApaLsSession18EmbeddableAppCountERi @ 166 NONAME + _ZNK13RApaLsSession21GetAcceptedConfidenceERi @ 167 NONAME + _ZNK13RApaLsSession21RecognizeSpecificDataERK7TDesC16RK6TDesC8RK9TDataTypeRi @ 168 NONAME + _ZNK13RApaLsSession22GetSupportedDataTypesLER13CArrayFixFlatI9TDataTypeE @ 169 NONAME + _ZNK13RApaLsSession23NumberOfOwnDefinedIconsE4TUidRi @ 170 NONAME + _ZNK13RApaLsSession7VersionEv @ 171 NONAME + _ZNK13RApaLsSession8AppCountERi @ 172 NONAME + _ZNK13RApaLsSession9IsProgramERK7TDesC16Ri @ 173 NONAME + _ZNK15CApaAIFViewData10ScreenModeEv @ 174 NONAME ABSENT + _ZNK15CApaAIFViewData12IconByIndexLEi @ 175 NONAME ABSENT + _ZNK15CApaAIFViewData13NumberOfIconsEv @ 176 NONAME ABSENT + _ZNK15CApaAIFViewData7ViewUidEv @ 177 NONAME ABSENT + _ZNK15CApaAIFViewData8CaptionLE9TLanguage @ 178 NONAME ABSENT + _ZNK15CApaAppViewData10IconSizesLEv @ 179 NONAME ABSENT + _ZNK15CApaAppViewData10ScreenModeEv @ 180 NONAME ABSENT + _ZNK15CApaAppViewData3UidEv @ 181 NONAME ABSENT + _ZNK15CApaAppViewData4IconERK5TSize @ 182 NONAME ABSENT + _ZNK16CApaMaskedBitmap12ExternalizeLER12RWriteStream @ 183 NONAME + _ZNK16CApaMaskedBitmap4MaskEv @ 184 NONAME + _ZNK17CApaSystemControl12ShortCaptionEv @ 185 NONAME + _ZNK17CApaSystemControl4IconEv @ 186 NONAME + _ZNK17CApaSystemControl4TypeEv @ 187 NONAME + _ZNK17CApaSystemControl7CaptionEv @ 188 NONAME + _ZNK17CApaSystemControl8FileNameEv @ 189 NONAME + _ZNK18TApaPictureFactory11NewPictureLER14TPictureHeaderRK12CStreamStore @ 190 NONAME + _ZNK19CApaWindowGroupName10IsAppReadyEv @ 191 NONAME + _ZNK19CApaWindowGroupName14DocNameIsAFileEv @ 192 NONAME + _ZNK19CApaWindowGroupName15WindowGroupNameEv @ 193 NONAME + _ZNK19CApaWindowGroupName18SetWindowGroupNameER12RWindowGroup @ 194 NONAME + _ZNK19CApaWindowGroupName23RespondsToShutdownEventEv @ 195 NONAME + _ZNK19CApaWindowGroupName26RespondsToSwitchFilesEventEv @ 196 NONAME + _ZNK19CApaWindowGroupName6AppUidEv @ 197 NONAME + _ZNK19CApaWindowGroupName6IsBusyEv @ 198 NONAME + _ZNK19CApaWindowGroupName7CaptionEv @ 199 NONAME + _ZNK19CApaWindowGroupName7DocNameEv @ 200 NONAME + _ZNK19CApaWindowGroupName8IsSystemEv @ 201 NONAME + _ZNK21CApaAppInfoFileReader10CapabilityER5TDes8 @ 202 NONAME ABSENT + _ZNK21CApaAppInfoFileReader14GetOwnedFilesLER12CDesC16Array @ 203 NONAME ABSENT + _ZNK21CApaAppInfoFileReader15NumberOfBitmapsEv @ 204 NONAME ABSENT + _ZNK21CApaAppInfoFileReader19DataTypesSupportedLER9CArrayFixI21TDataTypeWithPriorityE @ 205 NONAME ABSENT + _ZNK21CApaAppInfoFileReader9GetViewsLER9CArrayPtrI15CApaAIFViewDataE @ 206 NONAME ABSENT + _ZNK21CApaSystemControlList5CountEv @ 207 NONAME + _ZNK21CApaSystemControlList5IndexE4TUid @ 208 NONAME + _ZNK21CApaSystemControlList7ControlE4TUid @ 209 NONAME + _ZNK21CApaSystemControlList7ControlEi @ 210 NONAME + _ZNK8CApaDoor7AppUidLEv @ 211 NONAME + _ZNK8TApaTask4WgIdEv @ 212 NONAME + _ZNK8TApaTask6ExistsEv @ 213 NONAME + _ZNK8TApaTask8ThreadIdEv @ 214 NONAME + _ZTI18TApaPictureFactory @ 215 NONAME ; ## + _ZTV18TApaPictureFactory @ 216 NONAME ; ## + _ZTI11CApaAppData @ 217 NONAME ABSENT ; ## + _ZTI11CApaAppList @ 218 NONAME ABSENT ; ## + _ZTI12CApaAppEntry @ 219 NONAME ABSENT ; ## + _ZTI14CApaAIFCaption @ 220 NONAME ABSENT ; ## + _ZTI15CApaAIFViewData @ 221 NONAME ABSENT ; ## + _ZTI15CApaAppInfoFile @ 222 NONAME ABSENT ; ## + _ZTI15CApaAppViewData @ 223 NONAME ABSENT ; ## + _ZTI15CApaIconPicture @ 224 NONAME ; ## + _ZTI16CApaMaskedBitmap @ 225 NONAME ; ## + _ZTI16TDesCArrayFiller @ 226 NONAME ABSENT ; ## + _ZTI16TSizeArrayFiller @ 227 NONAME ABSENT ; ## + _ZTI17CApaSystemControl @ 228 NONAME ; ## + _ZTI19CApaAppListNotifier @ 229 NONAME ; ## + _ZTI19CApaWindowGroupName @ 230 NONAME ; ## + _ZTI20TViewDataArrayFiller @ 231 NONAME ABSENT ; ## + _ZTI21CApaAppInfoFileReader @ 232 NONAME ABSENT ; ## + _ZTI21CApaAppInfoFileWriter @ 233 NONAME ABSENT ; ## + _ZTI21CApaSystemControlList @ 234 NONAME ; ## + _ZTI7HBufBuf @ 235 NONAME ; ## + _ZTI8CApaDoor @ 236 NONAME ; ## + _ZTV11CApaAppData @ 237 NONAME ABSENT ; ## + _ZTV11CApaAppList @ 238 NONAME ABSENT ; ## + _ZTV12CApaAppEntry @ 239 NONAME ABSENT ; ## + _ZTV14CApaAIFCaption @ 240 NONAME ABSENT ; ## + _ZTV15CApaAIFViewData @ 241 NONAME ABSENT ; ## + _ZTV15CApaAppInfoFile @ 242 NONAME ABSENT ; ## + _ZTV15CApaAppViewData @ 243 NONAME ABSENT ; ## + _ZTV15CApaIconPicture @ 244 NONAME ; ## + _ZTV16CApaMaskedBitmap @ 245 NONAME ; ## + _ZTV16TDesCArrayFiller @ 246 NONAME ABSENT ; ## + _ZTV16TSizeArrayFiller @ 247 NONAME ABSENT ; ## + _ZTV17CApaSystemControl @ 248 NONAME ; ## + _ZTV19CApaAppListNotifier @ 249 NONAME ; ## + _ZTV19CApaWindowGroupName @ 250 NONAME ; ## + _ZTV20TViewDataArrayFiller @ 251 NONAME ABSENT ; ## + _ZTV21CApaAppInfoFileReader @ 252 NONAME ABSENT ; ## + _ZTV21CApaAppInfoFileWriter @ 253 NONAME ABSENT ; ## + _ZTV21CApaSystemControlList @ 254 NONAME ; ## + _ZTV7HBufBuf @ 255 NONAME ; ## + _ZTV8CApaDoor @ 256 NONAME ; ## + _ZN11CApaAppList4NewLER3RFsP13CApaAppFinderP16CApaAppRegFinderi @ 257 NONAME ABSENT + _ZNK11CApaAppData12IconFileNameEv @ 258 NONAME ABSENT + _ZNK11CApaAppData14NonMbmIconFileEv @ 259 NONAME ABSENT + _ZNK11CApaAppData19DefaultScreenNumberEv @ 260 NONAME ABSENT + _ZNK11CApaAppData20RegistrationFileUsedEv @ 261 NONAME ABSENT + _ZNK13RApaLsSession10GetAppIconE4TUidRP7HBufC16 @ 262 NONAME + _ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RP7HBufC16 @ 263 NONAME + _ZNK13RApaLsSession15GetFilteredAppsEjj @ 264 NONAME + _ZNK13RApaLsSession15GetFilteredAppsEjji @ 265 NONAME + _ZNK15CApaAppViewData12IconFileNameEv @ 266 NONAME ABSENT + _ZNK15CApaAppViewData14NonMbmIconFileEv @ 267 NONAME ABSENT + _ZTI17CApaAppInfoReader @ 268 NONAME ABSENT ; ## + _ZTI19CApaAppInfoReaderV1 @ 269 NONAME ABSENT ; ## + _ZTI19CApaAppInfoReaderV2 @ 270 NONAME ABSENT ; ## + _ZTV17CApaAppInfoReader @ 271 NONAME ABSENT ; ## + _ZTV19CApaAppInfoReaderV1 @ 272 NONAME ABSENT ; ## + _ZTV19CApaAppInfoReaderV2 @ 273 NONAME ABSENT ; ## + _Z16StartupApaServerR14MApaAppStarter @ 274 NONAME ABSENT + _Z23StartupApaServerProcessv @ 275 NONAME + _ZN13RApaLsSession17DeleteDataMappingERK9TDataType @ 276 NONAME + _ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUid @ 277 NONAME + _ZN13RApaLsSession25InsertDataMappingIfHigherERK9TDataTypel4TUidRi @ 278 NONAME + _ZNK11CApaAppData19ApplicationLanguageEv @ 279 NONAME ABSENT + _ZNK13RApaLsSession19ApplicationLanguageE4TUidR9TLanguage @ 280 NONAME + _ZN21CApaSystemControlList4NewLER3RFs @ 281 NONAME + _ZNK11CApaAppData17ImplementsServiceE4TUid @ 282 NONAME ABSENT + _ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 283 NONAME ABSENT + _ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 284 NONAME ABSENT + _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 285 NONAME ABSENT + _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 286 NONAME ABSENT + _ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 287 NONAME ABSENT + _ZNK13RApaLsSession13GetServerAppsE4TUid @ 288 NONAME + _ZNK13RApaLsSession13GetServerAppsE4TUidi @ 289 NONAME + _ZNK13RApaLsSession15GetAppServicesLE4TUidR13CArrayFixFlatIS0_E @ 290 NONAME + _ZNK13RApaLsSession16GetAppServicesLCE4TUid @ 291 NONAME + _ZNK13RApaLsSession24AppForDataTypeAndServiceERK9TDataType4TUidRS3_ @ 292 NONAME + _ZNK13RApaLsSession24AppForDocumentAndServiceERK5RFile4TUidRS3_R9TDataType @ 293 NONAME + _ZNK13RApaLsSession24AppForDocumentAndServiceERK7TDesC164TUidRS3_R9TDataType @ 294 NONAME + _ZNK13RApaLsSession25GetAppServiceOpaqueDataLCE4TUidS0_ @ 295 NONAME + _ZNK13RApaLsSession27GetServiceImplementationsLCE4TUid @ 296 NONAME + _ZNK18TApaAppServiceInfo10OpaqueDataEv @ 297 NONAME ABSENT + _ZNK18TApaAppServiceInfo3UidEv @ 298 NONAME ABSENT + _ZTI30CApaAppServiceInfoArrayWrapper @ 299 NONAME ABSENT ; ## + _ZTV30CApaAppServiceInfoArrayWrapper @ 300 NONAME ABSENT ; ## + _ZN13RApaLsSession13StartDocumentER5RFileR9TThreadIdP14TRequestStatus @ 301 NONAME + _ZN21CApaAppInfoFileReader27CreateMaskedBitmapByIndexLCEi @ 302 NONAME ABSENT + _ZNK13RApaLsSession36CancelListPopulationCompleteObserverEv @ 303 NONAME + _ZNK13RApaLsSession38RegisterListPopulationCompleteObserverER14TRequestStatus @ 304 NONAME + _ZN8ApaUtils24HandleAsRegistrationFileERK8TUidType @ 305 NONAME ABSENT + _ZN13RApaLsSession33RegisterJavaMIDletViaIterimFormatERK7TDesC16R5RFile @ 306 NONAME ABSENT + _ZN22ForJavaMIDletInstaller33CheckInterimFormatFileNotCorruptLER5RFile @ 307 NONAME ABSENT + _ZN13RApaLsSession20DeregisterJavaMIDletERK7TDesC16 @ 308 NONAME ABSENT + _ZN13RApaLsSession13SetFsSessionLER3RFs @ 309 NONAME + _ZN13RApaLsSession13StartDocumentER5RFile4TUidR9TThreadIdP14TRequestStatus @ 310 NONAME + _ZN13RApaLsSession13StartDocumentER5RFileRK9TDataTypeR9TThreadIdP14TRequestStatus @ 311 NONAME + _ZN13RApaLsSession14ClearFsSessionEv @ 312 NONAME + _ZN13RApaLsSession9FsSessionEv @ 313 NONAME + _ZNK13RApaLsSession13RecognizeDataERK5RFileR22TDataRecognitionResult @ 314 NONAME + _ZNK13RApaLsSession14AppForDocumentERK5RFileR4TUidR9TDataType @ 315 NONAME + _ZNK13RApaLsSession21RecognizeSpecificDataERK5RFileRK9TDataTypeRi @ 316 NONAME + _ZNK13RApaLsSession19GetPreferredBufSizeERi @ 317 NONAME + _ZN22ForJavaMIDletInstaller18GetJavaMIDletInfoLER3RFsRK7TDesC16RmS5_ @ 318 NONAME ABSENT + _ZN22ForJavaMIDletInstaller28NewInterimFormatFileWriterLCER3RFsRK7TDesC164TUidmi @ 319 NONAME ABSENT + _ZNK18TApaAppServiceInfo9DataTypesEv @ 320 NONAME ABSENT + _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 321 NONAME ABSENT + _ZNK13RApaLsSession27GetServiceImplementationsLCE4TUidRK9TDataType @ 322 NONAME + _ZN13RApaLsSession5CloseEv @ 323 NONAME + _ZTI22CApaLsSessionExtension @ 324 NONAME ABSENT ; ## + _ZTV22CApaLsSessionExtension @ 325 NONAME ABSENT ; ## + _ZN13RApaLsSession23RApaLsSession_Reserved1Ev @ 326 NONAME + _ZN13RApaLsSession23RApaLsSession_Reserved2Ev @ 327 NONAME + _ZN18TApaPictureFactoryC1Ev @ 328 NONAME + _ZN18TApaPictureFactoryC2Ev @ 329 NONAME + _ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved1Ev @ 330 NONAME + _ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved2Ev @ 331 NONAME + _ZN23MApaAppListServObserverC2Ev @ 332 NONAME + _ZTI13RApaLsSession @ 333 NONAME ; ## + _ZTI23MApaAppListServObserver @ 334 NONAME ; ## + _ZTV13RApaLsSession @ 335 NONAME ; ## + _ZTV23MApaAppListServObserver @ 336 NONAME ; ## + _ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArray @ 337 NONAME + _ZN13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArrayR14TRequestStatus @ 338 NONAME + _ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArray @ 339 NONAME + _ZN13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArrayR14TRequestStatus @ 340 NONAME + _ZN13RApaLsSession20CancelRecognizeFilesEv @ 341 NONAME + _ZN27CDataRecognitionResultArrayC1Ev @ 342 NONAME + _ZN27CDataRecognitionResultArrayC2Ev @ 343 NONAME + _ZN27CDataRecognitionResultArrayD0Ev @ 344 NONAME + _ZN27CDataRecognitionResultArrayD1Ev @ 345 NONAME + _ZN27CDataRecognitionResultArrayD2Ev @ 346 NONAME + _ZNK27CDataRecognitionResultArray12GetFileNameLER4TBufILi256EEj @ 347 NONAME + _ZNK27CDataRecognitionResultArray25GetDataRecognitionResultLER22TDataRecognitionResultj @ 348 NONAME + _ZNK27CDataRecognitionResultArray4PathEv @ 349 NONAME + _ZNK27CDataRecognitionResultArray5CountEv @ 350 NONAME + _ZTI21CAsyncFileRecognition @ 351 NONAME ABSENT ; ## + _ZTI27CDataRecognitionResultArray @ 352 NONAME ; ## + _ZTI32CDataRecognitionResultArrayEntry @ 353 NONAME ABSENT ; ## + _ZTV21CAsyncFileRecognition @ 354 NONAME ABSENT ; ## + _ZTV27CDataRecognitionResultArray @ 355 NONAME ; ## + _ZTV32CDataRecognitionResultArrayEntry @ 356 NONAME ABSENT ; ## + _ZNK13RApaLsSession16GetAppByDataTypeERK9TDataType4TUidRS3_ @ 357 NONAME + _ZN13RApaLsSession17DeleteDataMappingERK9TDataType4TUid @ 358 NONAME + _ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUidS3_ @ 359 NONAME + _ZN13RApaLsSession29RegisterNonNativeApplicationLE4TUidRK10TDriveUnitR34CApaRegistrationResourceFileWriterP33CApaLocalisableResourceFileWriterPK5RFile @ 360 NONAME + _ZN13RApaLsSession31DeregisterNonNativeApplicationLE4TUid @ 361 NONAME + _ZN13RApaLsSession33RegisterNonNativeApplicationTypeLE4TUidRK7TDesC16 @ 362 NONAME + _ZN13RApaLsSession35DeregisterNonNativeApplicationTypeLE4TUid @ 363 NONAME + _ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadIdP14TRequestStatus @ 364 NONAME + _ZNK11CApaAppData10OpaqueDataEv @ 365 NONAME ABSENT + _ZNK11CApaAppData20RegistrationFileNameEv @ 366 NONAME ABSENT + _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 367 NONAME ABSENT + _ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 368 NONAME ABSENT + _ZNK13RApaLsSession22GetDefaultScreenNumberERi4TUid @ 369 NONAME + _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 370 NONAME ABSENT + _ZNK13RApaLsSession21MatchesSecurityPolicyERi4TUidRK15TSecurityPolicy @ 371 NONAME + _ZN33CApaLocalisableResourceFileWriterD1Ev @ 372 NONAME + _ZN33CApaLocalisableResourceFileWriterD2Ev @ 373 NONAME + _ZN34CApaRegistrationResourceFileWriter12AddDataTypeLEiRK6TDesC8 @ 374 NONAME + _ZN34CApaRegistrationResourceFileWriter13SetGroupNameLERK7TDesC16 @ 375 NONAME + _ZN34CApaRegistrationResourceFileWriter14SetOpaqueDataLERK6TDesC8 @ 376 NONAME + _ZN34CApaRegistrationResourceFileWriter15SetAppIsHiddenLEi @ 377 NONAME + _ZN34CApaRegistrationResourceFileWriter17SetEmbeddabilityLEN17TApaAppCapability14TEmbeddabilityE @ 378 NONAME + _ZN34CApaRegistrationResourceFileWriter19SetSupportsNewFileLEi @ 379 NONAME + _ZN34CApaRegistrationResourceFileWriter21AddFileOwnershipInfoLERK7TDesC16 @ 380 NONAME + _ZN34CApaRegistrationResourceFileWriter22SetLaunchInBackgroundLEi @ 381 NONAME + _ZN34CApaRegistrationResourceFileWriter23SetDefaultScreenNumberLEi @ 382 NONAME + _ZN34CApaRegistrationResourceFileWriter4NewLE4TUidRK7TDesC16j @ 383 NONAME + _ZN34CApaRegistrationResourceFileWriterD0Ev @ 384 NONAME + _ZN34CApaRegistrationResourceFileWriterD1Ev @ 385 NONAME + _ZN34CApaRegistrationResourceFileWriterD2Ev @ 386 NONAME + _ZNK11CApaAppData24NonNativeApplicationTypeEv @ 387 NONAME ABSENT + _ZTI33CApaLocalisableResourceFileWriter @ 388 NONAME ; ## + _ZTI34CApaRegistrationResourceFileWriter @ 389 NONAME ; ## + _ZTIN26CApaResourceFileWriterBase11RBufferSinkE @ 390 NONAME ; ## + _ZTV33CApaLocalisableResourceFileWriter @ 391 NONAME ; ## + _ZTV34CApaRegistrationResourceFileWriter @ 392 NONAME ; ## + _ZTVN26CApaResourceFileWriterBase11RBufferSinkE @ 393 NONAME ; ## + _ZN33CApaLocalisableResourceFileWriter4NewLERK7TDesC16S2_iS2_ @ 394 NONAME + _ZN33CApaLocalisableResourceFileWriterD0Ev @ 395 NONAME + _ZN13RApaLsSession12CancelNotifyEv @ 396 NONAME + _ZN13RApaLsSession9SetNotifyEiR14TRequestStatus @ 397 NONAME + _ZNK11CApaAppList17AppScanInProgressEv @ 398 NONAME ABSENT + _ZN13RApaLsSession25NotifyOnDataMappingChangeER14TRequestStatus @ 399 NONAME + _ZN13RApaLsSession31CancelNotifyOnDataMappingChangeEv @ 400 NONAME + _ZNK13RApaLsSession10GetAppTypeER4TUidS0_ @ 401 NONAME + _ZN13RApaLsSession35CommitNonNativeApplicationsUpdatesLEv @ 402 NONAME + _ZN13RApaLsSession36PrepareNonNativeApplicationsUpdatesLEv @ 403 NONAME + _ZN13RApaLsSession36RollbackNonNativeApplicationsUpdatesEv @ 404 NONAME + _ZN11CApaAppList15UpdatedAppsListEv @ 405 NONAME ABSENT + _ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 406 NONAME ABSENT + _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 407 NONAME ABSENT + _ZN11CApaAppDataD0Ev @ 408 NONAME ABSENT + _ZN11CApaAppDataD1Ev @ 409 NONAME ABSENT + _ZN11CApaAppDataD2Ev @ 410 NONAME ABSENT + _ZN11CApaAppList24ShareProtectedFileServerEv @ 411 NONAME ABSENT + _ZN11CApaAppList4SelfEv @ 412 NONAME ABSENT + X @ 413 NONAME ABSENT + X @ 414 NONAME ABSENT + X @ 415 NONAME ABSENT + X @ 416 NONAME ABSENT + _ZN13RApaLsSession18SetAppShortCaptionERK7TDesC169TLanguage4TUid @ 417 NONAME + _ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 418 NONAME ABSENT + _ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 419 NONAME ABSENT + _ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 420 NONAME ABSENT + _ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayI7TDesC16E @ 421 NONAME + _ZN11CApaAppList24ResetForcedRegistrationsEv @ 422 NONAME ABSENT + _ZN11CApaAppList12RestartScanLEv @ 423 NONAME ABSENT + _ZN11CApaAppList8StopScanEv @ 424 NONAME ABSENT + KMinApplicationStackSize @ 425 NONAME DATA 4 + _Z23MinApplicationStackSizev @ 426 NONAME + _ZNK11CApaAppData9IsPendingEv @ 427 NONAME ABSENT + _ZNK11CApaAppList23IsLanguageChangePendingEv @ 428 NONAME ABSENT + _ZNK13RApaLsSession10GetAppIconE4TUidR5RFile @ 429 NONAME + _ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 430 NONAME + X @ 431 NONAME ABSENT + X @ 432 NONAME ABSENT + _ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 433 NONAME + _ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 434 NONAME + X @ 435 NONAME ABSENT + X @ 436 NONAME ABSENT + X @ 437 NONAME ABSENT + X @ 438 NONAME ABSENT + X @ 439 NONAME ABSENT + X @ 440 NONAME ABSENT + X @ 441 NONAME ABSENT + X @ 442 NONAME ABSENT + X @ 443 NONAME ABSENT + \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/aplist_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/aplist_legacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,108 @@ +EXPORTS + _ZN11CApaAppData16CanUseScreenModeEi @ 1 NONAME + _ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 2 NONAME + _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 3 NONAME + _ZN11CApaAppDataD0Ev @ 4 NONAME + _ZN11CApaAppDataD1Ev @ 5 NONAME + _ZN11CApaAppDataD2Ev @ 6 NONAME + _ZN11CApaAppList12RestartScanLEv @ 7 NONAME + _ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 8 NONAME + _ZN11CApaAppList16StartIdleUpdateLEv @ 9 NONAME + _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 10 NONAME + _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 11 NONAME + _ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 12 NONAME + _ZN11CApaAppList24ResetForcedRegistrationsEv @ 13 NONAME + _ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 14 NONAME + _ZN11CApaAppList4NewLER3RFsii @ 15 NONAME + _ZN11CApaAppList4SelfEv @ 16 NONAME + _ZN11CApaAppList6PurgeLEv @ 17 NONAME + _ZN11CApaAppList8StopScanEi @ 18 NONAME + _ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 19 NONAME + _ZN11CApaAppListD0Ev @ 20 NONAME + _ZN11CApaAppListD1Ev @ 21 NONAME + _ZN11CApaAppListD2Ev @ 22 NONAME + _ZN12TApaAppEntryC1Ev @ 23 NONAME + _ZN12TApaAppEntryC2Ev @ 24 NONAME + _ZN14CAppSidChecker18SetRescanCallBackLERK9TCallBack @ 25 NONAME + _ZN14CAppSidChecker9reserved1Ev @ 26 NONAME + _ZN14CAppSidChecker9reserved2Ev @ 27 NONAME + _ZN14CAppSidChecker9reserved3Ev @ 28 NONAME + _ZN14CAppSidCheckerD0Ev @ 29 NONAME + _ZN14CAppSidCheckerD1Ev @ 30 NONAME + _ZN14CAppSidCheckerD2Ev @ 31 NONAME + _ZN16CApaAppRegFinder12FindAllAppsLENS_10TScanScopeE @ 32 NONAME + _ZN16CApaAppRegFinder4NewLERK3RFs @ 33 NONAME + _ZN16CApaAppRegFinder5NewLCERK3RFs @ 34 NONAME + _ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK12CDesC16Array @ 35 NONAME + _ZNK11CApaAppData10CapabilityER5TDes8 @ 36 NONAME + _ZNK11CApaAppData10IconSizesLEv @ 37 NONAME + _ZNK11CApaAppData10OpaqueDataEv @ 38 NONAME + _ZNK11CApaAppData10OwnedFilesEv @ 39 NONAME + _ZNK11CApaAppData11GetIconInfoERiS0_ @ 40 NONAME + _ZNK11CApaAppData12IconFileNameEv @ 41 NONAME + _ZNK11CApaAppData14NonMbmIconFileEv @ 42 NONAME + _ZNK11CApaAppData17ImplementsServiceE4TUid @ 43 NONAME + _ZNK11CApaAppData19ApplicationLanguageEv @ 44 NONAME + _ZNK11CApaAppData19DefaultScreenNumberEv @ 45 NONAME + _ZNK11CApaAppData20RegistrationFileNameEv @ 46 NONAME + _ZNK11CApaAppData20RegistrationFileUsedEv @ 47 NONAME + _ZNK11CApaAppData24NonNativeApplicationTypeEv @ 48 NONAME + _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 49 NONAME + _ZNK11CApaAppData4IconE5TSize @ 50 NONAME + _ZNK11CApaAppData4IconEi @ 51 NONAME + _ZNK11CApaAppData5ViewsEv @ 52 NONAME + _ZNK11CApaAppData8AppEntryEv @ 53 NONAME + _ZNK11CApaAppData8DataTypeERK9TDataType @ 54 NONAME + _ZNK11CApaAppData9IsPendingEv @ 55 NONAME + _ZNK11CApaAppList12AppDataByUidE4TUid @ 56 NONAME + _ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 57 NONAME + _ZNK11CApaAppList17AppScanInProgressEv @ 58 NONAME + _ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 59 NONAME + _ZNK11CApaAppList19IsFirstScanCompleteEv @ 60 NONAME + _ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 61 NONAME + _ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 62 NONAME + _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 63 NONAME + _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 64 NONAME + _ZNK11CApaAppList23IsLanguageChangePendingEv @ 65 NONAME + _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 66 NONAME + _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 67 NONAME + _ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 68 NONAME + _ZNK11CApaAppList5CountEv @ 69 NONAME + _ZNK11CApaAppList7NextAppEPK11CApaAppData @ 70 NONAME + _ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 71 NONAME + _ZNK11CApaAppList8FirstAppEi @ 72 NONAME + _ZNK11CApaAppList8FirstAppEv @ 73 NONAME + _ZNK15CApaAppViewData10IconSizesLEv @ 74 NONAME + _ZNK15CApaAppViewData10ScreenModeEv @ 75 NONAME + _ZNK15CApaAppViewData12IconFileNameEv @ 76 NONAME + _ZNK15CApaAppViewData14NonMbmIconFileEv @ 77 NONAME + _ZNK15CApaAppViewData3UidEv @ 78 NONAME + _ZNK15CApaAppViewData4IconERK5TSize @ 79 NONAME + _ZNK16CApaAppRegFinder9DriveListEv @ 80 NONAME + _ZTI11CApaAppData @ 81 NONAME + _ZTI11CApaAppList @ 82 NONAME + _ZTI12CApaAppEntry @ 83 NONAME + _ZTI14CAppSidChecker @ 84 NONAME + _ZTI15CApaAppViewData @ 85 NONAME + _ZTI16CApaAppRegFinder @ 86 NONAME + _ZTI17CApaAppInfoReader @ 87 NONAME + _ZTV11CApaAppData @ 88 NONAME + _ZTV11CApaAppList @ 89 NONAME + _ZTV12CApaAppEntry @ 90 NONAME + _ZTV14CAppSidChecker @ 91 NONAME + _ZTV15CApaAppViewData @ 92 NONAME + _ZTV16CApaAppRegFinder @ 93 NONAME + _ZTV17CApaAppInfoReader @ 94 NONAME + _ZN11CApaAppData11SetCaptionLERK7TDesC16 @ 95 NONAME + _ZN11CApaAppData9SetIconsLERK7TDesC16i @ 96 NONAME + _ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 97 NONAME + _ZN11CApaAppList20AppListUpdatePendingEv @ 98 NONAME + _ZN11CApaAppList19UninstalledAppArrayEv @ 99 NONAME + X @ 100 NONAME ABSENT + X @ 101 NONAME ABSENT + X @ 102 NONAME ABSENT + X @ 103 NONAME ABSENT + X @ 104 NONAME ABSENT + X @ 105 NONAME ABSENT + X @ 106 NONAME ABSENT + X @ 107 NONAME ABSENT \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/aplistu.def --- a/appfw/apparchitecture/eabi/aplistu.def Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/eabi/aplistu.def Thu Jun 24 13:52:58 2010 +0100 @@ -1,22 +1,22 @@ EXPORTS _ZN11CApaAppData16CanUseScreenModeEi @ 1 NONAME _ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 2 NONAME - _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 3 NONAME + _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 3 NONAME ABSENT _ZN11CApaAppDataD0Ev @ 4 NONAME _ZN11CApaAppDataD1Ev @ 5 NONAME _ZN11CApaAppDataD2Ev @ 6 NONAME - _ZN11CApaAppList12RestartScanLEv @ 7 NONAME + _ZN11CApaAppList12RestartScanLEv @ 7 NONAME ABSENT _ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 8 NONAME _ZN11CApaAppList16StartIdleUpdateLEv @ 9 NONAME - _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 10 NONAME - _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 11 NONAME + _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 10 NONAME ABSENT + _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 11 NONAME ABSENT _ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 12 NONAME - _ZN11CApaAppList24ResetForcedRegistrationsEv @ 13 NONAME + _ZN11CApaAppList24ResetForcedRegistrationsEv @ 13 NONAME ABSENT _ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 14 NONAME _ZN11CApaAppList4NewLER3RFsii @ 15 NONAME _ZN11CApaAppList4SelfEv @ 16 NONAME - _ZN11CApaAppList6PurgeLEv @ 17 NONAME - _ZN11CApaAppList8StopScanEi @ 18 NONAME + _ZN11CApaAppList6PurgeLEv @ 17 NONAME ABSENT + _ZN11CApaAppList8StopScanEi @ 18 NONAME ABSENT _ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 19 NONAME _ZN11CApaAppListD0Ev @ 20 NONAME _ZN11CApaAppListD1Ev @ 21 NONAME @@ -30,10 +30,10 @@ _ZN14CAppSidCheckerD0Ev @ 29 NONAME _ZN14CAppSidCheckerD1Ev @ 30 NONAME _ZN14CAppSidCheckerD2Ev @ 31 NONAME - _ZN16CApaAppRegFinder12FindAllAppsLENS_10TScanScopeE @ 32 NONAME - _ZN16CApaAppRegFinder4NewLERK3RFs @ 33 NONAME - _ZN16CApaAppRegFinder5NewLCERK3RFs @ 34 NONAME - _ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK12CDesC16Array @ 35 NONAME + _ZN16CApaAppRegFinder12FindAllAppsLENS_10TScanScopeE @ 32 NONAME ABSENT + _ZN16CApaAppRegFinder4NewLERK3RFs @ 33 NONAME ABSENT + _ZN16CApaAppRegFinder5NewLCERK3RFs @ 34 NONAME ABSENT + _ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK12CDesC16Array @ 35 NONAME ABSENT _ZNK11CApaAppData10CapabilityER5TDes8 @ 36 NONAME _ZNK11CApaAppData10IconSizesLEv @ 37 NONAME _ZNK11CApaAppData10OpaqueDataEv @ 38 NONAME @@ -44,16 +44,16 @@ _ZNK11CApaAppData17ImplementsServiceE4TUid @ 43 NONAME _ZNK11CApaAppData19ApplicationLanguageEv @ 44 NONAME _ZNK11CApaAppData19DefaultScreenNumberEv @ 45 NONAME - _ZNK11CApaAppData20RegistrationFileNameEv @ 46 NONAME - _ZNK11CApaAppData20RegistrationFileUsedEv @ 47 NONAME + _ZNK11CApaAppData20RegistrationFileNameEv @ 46 NONAME ABSENT + _ZNK11CApaAppData20RegistrationFileUsedEv @ 47 NONAME ABSENT _ZNK11CApaAppData24NonNativeApplicationTypeEv @ 48 NONAME - _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 49 NONAME + _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 49 NONAME ABSENT _ZNK11CApaAppData4IconE5TSize @ 50 NONAME _ZNK11CApaAppData4IconEi @ 51 NONAME _ZNK11CApaAppData5ViewsEv @ 52 NONAME _ZNK11CApaAppData8AppEntryEv @ 53 NONAME _ZNK11CApaAppData8DataTypeERK9TDataType @ 54 NONAME - _ZNK11CApaAppData9IsPendingEv @ 55 NONAME + _ZNK11CApaAppData9IsPendingEv @ 55 NONAME ABSENT _ZNK11CApaAppList12AppDataByUidE4TUid @ 56 NONAME _ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 57 NONAME _ZNK11CApaAppList17AppScanInProgressEv @ 58 NONAME @@ -78,24 +78,31 @@ _ZNK15CApaAppViewData14NonMbmIconFileEv @ 77 NONAME _ZNK15CApaAppViewData3UidEv @ 78 NONAME _ZNK15CApaAppViewData4IconERK5TSize @ 79 NONAME - _ZNK16CApaAppRegFinder9DriveListEv @ 80 NONAME + _ZNK16CApaAppRegFinder9DriveListEv @ 80 NONAME ABSENT _ZTI11CApaAppData @ 81 NONAME _ZTI11CApaAppList @ 82 NONAME _ZTI12CApaAppEntry @ 83 NONAME _ZTI14CAppSidChecker @ 84 NONAME _ZTI15CApaAppViewData @ 85 NONAME - _ZTI16CApaAppRegFinder @ 86 NONAME + _ZTI16CApaAppRegFinder @ 86 NONAME ABSENT _ZTI17CApaAppInfoReader @ 87 NONAME _ZTV11CApaAppData @ 88 NONAME _ZTV11CApaAppList @ 89 NONAME _ZTV12CApaAppEntry @ 90 NONAME _ZTV14CAppSidChecker @ 91 NONAME _ZTV15CApaAppViewData @ 92 NONAME - _ZTV16CApaAppRegFinder @ 93 NONAME + _ZTV16CApaAppRegFinder @ 93 NONAME ABSENT _ZTV17CApaAppInfoReader @ 94 NONAME _ZN11CApaAppData11SetCaptionLERK7TDesC16 @ 95 NONAME _ZN11CApaAppData9SetIconsLERK7TDesC16i @ 96 NONAME _ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 97 NONAME - _ZN11CApaAppList20AppListUpdatePendingEv @ 98 NONAME + _ZN11CApaAppList20AppListUpdatePendingEv @ 98 NONAME ABSENT _ZN11CApaAppList19UninstalledAppArrayEv @ 99 NONAME + _ZN11CApaAppData4NewLERKN4Usif28CApplicationRegistrationDataER3RFsRKNS0_26RSoftwareComponentRegistryE @ 100 NONAME + _ZN11CApaAppList22FindAndAddSpecificAppLE4TUid @ 101 NONAME + _ZN11CApaAppList18InitializeApplistLEP19MApaAppListObserver @ 102 NONAME + _ZN11CApaAppData19IsLangChangePendingEv @ 103 NONAME + _ZN11CApaAppList14UpdateApplistLEP19MApaAppListObserverP6RArrayI17TApaAppUpdateInfoE4TUid @ 104 NONAME + _ZN11CApaAppList15UpdatedAppsInfoEv @ 105 NONAME + _ZN11CApaAppList28UpdateApplistByForceRegAppsLER13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 106 NONAME diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/apserv_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/apserv_legacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,70 @@ +EXPORTS + _Z23NameApaServServerThreadv @ 1 NONAME + _Z25NameApaServStartSemaphorev @ 2 NONAME + _ZN13CApaFsMonitor10SetBlockedEi @ 3 NONAME + _ZN13CApaFsMonitor4NewLER3RFsRK7TDesC169TCallBack @ 4 NONAME + _ZN13CApaFsMonitor5StartE11TNotifyType @ 5 NONAME + _ZN13CApaFsMonitorD0Ev @ 6 NONAME + _ZN13CApaFsMonitorD1Ev @ 7 NONAME + _ZN13CApaFsMonitorD2Ev @ 8 NONAME + _ZN16CApaAppArcServer4NewLEP11CApaAppListP18CApaFileRecognizer @ 9 NONAME ABSENT + _ZN16CApaAppArcServer4NewLEv @ 10 NONAME + _ZN16CApaAppArcServerD0Ev @ 11 NONAME + _ZN16CApaAppArcServerD1Ev @ 12 NONAME + _ZN16CApaAppArcServerD2Ev @ 13 NONAME + _ZNK13CApaFsMonitor10NotifyTypeEv @ 14 NONAME + _ZTI13CApaFsMonitor @ 15 NONAME ; ## + _ZTI15CApaEComMonitor @ 16 NONAME ; ## + _ZTI16CApaAppArcServer @ 17 NONAME ; ## + _ZTI20TDesCArrayItemWriter @ 18 NONAME ABSENT ; ## + _ZTI20TSizeArrayItemWriter @ 19 NONAME ABSENT ; ## + _ZTI22CApaAppListServSession @ 20 NONAME ; ## + _ZTI24TViewDataArrayItemWriter @ 21 NONAME ABSENT ; ## + _ZTV13CApaFsMonitor @ 22 NONAME ; ## + _ZTV15CApaEComMonitor @ 23 NONAME ; ## + _ZTV16CApaAppArcServer @ 24 NONAME ; ## + _ZTV20TDesCArrayItemWriter @ 25 NONAME ABSENT ; ## + _ZTV20TSizeArrayItemWriter @ 26 NONAME ABSENT ; ## + _ZTV22CApaAppListServSession @ 27 NONAME ; ## + _ZTV24TViewDataArrayItemWriter @ 28 NONAME ABSENT ; ## + _ZN13CApaFsMonitor12AddLocationLERK7TDesC16 @ 29 NONAME + _ZTIN13CApaFsMonitor14CApaFsNotifierE @ 30 NONAME ; ## + _ZTVN13CApaFsMonitor14CApaFsNotifierE @ 31 NONAME ; ## + _ZN16CApaAppArcServer4SelfEv @ 32 NONAME + _ZN13CApaFsMonitor6CancelEv @ 33 NONAME + _Z18ApaServThreadStartPv @ 34 NONAME + _ZTI18CRecognitionResult @ 35 NONAME ABSENT ; ## + _ZTI20CApsRecognitionCache @ 36 NONAME ; ## + _ZTI20CCacheDirectoryEntry @ 37 NONAME ; ## + _ZTI23CFileRecognitionUtility @ 38 NONAME ABSENT ; ## + _ZTI25CRecognitionResultHashMap @ 39 NONAME ; ## + _ZTI27CDirectoryRecognitionResult @ 40 NONAME ABSENT ; ## + _ZTI30CRecognitionResultHashMapEntry @ 41 NONAME ; ## + _ZTV18CRecognitionResult @ 42 NONAME ABSENT ; ## + _ZTV20CApsRecognitionCache @ 43 NONAME ; ## + _ZTV20CCacheDirectoryEntry @ 44 NONAME ; ## + _ZTV23CFileRecognitionUtility @ 45 NONAME ABSENT ; ## + _ZTV25CRecognitionResultHashMap @ 46 NONAME ; ## + _ZTV27CDirectoryRecognitionResult @ 47 NONAME ABSENT ; ## + _ZTV30CRecognitionResultHashMapEntry @ 48 NONAME ; ## + _ZN16CUpdatedAppsList28CloseAndDeletePermanentStoreEv @ 49 NONAME ABSENT + _ZN16CUpdatedAppsListD0Ev @ 50 NONAME ABSENT + _ZN16CUpdatedAppsListD1Ev @ 51 NONAME ABSENT + _ZN16CUpdatedAppsListD2Ev @ 52 NONAME ABSENT + _ZTI16CUpdatedAppsList @ 53 NONAME ABSENT ; ## + _ZTV16CUpdatedAppsList @ 54 NONAME ABSENT ; ## + _ZNK16CUpdatedAppsList8IsInListERK7TDesC16 @ 55 NONAME ABSENT + _ZTIN16CUpdatedAppsList15CUpdatedAppInfoE @ 56 NONAME ABSENT ; ## + _ZTVN16CUpdatedAppsList15CUpdatedAppInfoE @ 57 NONAME ABSENT ; ## + _ZN16CApaAppArcServer14RescanCallBackEv @ 58 NONAME + _ZTI18CCustomAppInfoData @ 59 NONAME ABSENT ; ## + _ZTV18CCustomAppInfoData @ 60 NONAME ABSENT ; ## + KApaLoadDataRecognizersOnDemand @ 61 NONAME DATA 4 + KApaUnloadRecognizersTimeout @ 62 NONAME DATA 4 + _ZN16CApaAppArcServer27HandleInstallationEndEventLEv @ 63 NONAME + _ZN16CApaAppArcServer28HandleInstallationStartEventEv @ 64 NONAME + KApaDrivesToMonitor @ 65 NONAME DATA 4 + KApaLoadMbmIconsOnDemand @ 66 NONAME DATA 4 + _ZTI21CApaAppArcServSession @ 67 NONAME + _ZTV21CApaAppArcServSession @ 68 NONAME + diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/distribution.policy.s60 --- a/appfw/apparchitecture/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/eabi/ticonforleaks_leagacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/ticonforleaks_leagacyu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,433 @@ +EXPORTS + KMinApplicationStackSize @ 1 NONAME DATA 4 + _Z16StartupApaServerR14MApaAppStarter @ 2 NONAME ABSENT + _Z23MinApplicationStackSizev @ 3 NONAME + _Z23StartupApaServerProcessv @ 4 NONAME + _ZN11CApaAppData16CanUseScreenModeEi @ 5 NONAME + _ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 6 NONAME + _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 7 NONAME + _ZN11CApaAppDataD0Ev @ 8 NONAME + _ZN11CApaAppDataD1Ev @ 9 NONAME + _ZN11CApaAppDataD2Ev @ 10 NONAME + _ZN11CApaAppList12RestartScanLEv @ 11 NONAME + _ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 12 NONAME ABSENT + _ZN11CApaAppList15UpdatedAppsListEv @ 13 NONAME ABSENT + _ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 14 NONAME + _ZN11CApaAppList16StartIdleUpdateLEv @ 15 NONAME + _ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 16 NONAME ABSENT + _ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 17 NONAME ABSENT + _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 18 NONAME + _ZN11CApaAppList24ResetForcedRegistrationsEv @ 19 NONAME + _ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 20 NONAME ABSENT + _ZN11CApaAppList4SelfEv @ 21 NONAME + _ZN11CApaAppList6PurgeLEv @ 22 NONAME + _ZN11CApaAppList8StopScanEi @ 23 NONAME + _ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 24 NONAME + _ZN11CApaAppListD0Ev @ 25 NONAME + _ZN11CApaAppListD1Ev @ 26 NONAME + _ZN11CApaAppListD2Ev @ 27 NONAME + _ZN12TApaTaskList10CycleTasksE4TUidNS_15TCycleDirectionE @ 28 NONAME + _ZN12TApaTaskList7FindAppE4TUid @ 29 NONAME + _ZN12TApaTaskList7FindAppERK7TDesC16 @ 30 NONAME + _ZN12TApaTaskList7FindDocERK7TDesC16 @ 31 NONAME + _ZN12TApaTaskList9FindByPosEi @ 32 NONAME + _ZN12TApaTaskListC1ER10RWsSession @ 33 NONAME + _ZN12TApaTaskListC2ER10RWsSession @ 34 NONAME + _ZN13RApaLsSession12CancelNotifyEv @ 35 NONAME + _ZN13RApaLsSession13SetFsSessionLER3RFs @ 36 NONAME + _ZN13RApaLsSession13StartDocumentER5RFile4TUidR9TThreadIdP14TRequestStatus @ 37 NONAME + _ZN13RApaLsSession13StartDocumentER5RFileR9TThreadIdP14TRequestStatus @ 38 NONAME + _ZN13RApaLsSession13StartDocumentER5RFileRK9TDataTypeR9TThreadIdP14TRequestStatus @ 39 NONAME + _ZN13RApaLsSession13StartDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 40 NONAME + _ZN13RApaLsSession13StartDocumentERK7TDesC16R9TThreadIdNS_11TLaunchTypeE @ 41 NONAME + _ZN13RApaLsSession13StartDocumentERK7TDesC16RK9TDataTypeR9TThreadIdNS_11TLaunchTypeE @ 42 NONAME + _ZN13RApaLsSession14ClearFsSessionEv @ 43 NONAME + _ZN13RApaLsSession14CreateDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 44 NONAME + _ZN13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArrayR14TRequestStatus @ 45 NONAME + _ZN13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArrayR14TRequestStatus @ 46 NONAME + _ZN13RApaLsSession17DeleteDataMappingERK9TDataType @ 47 NONAME + _ZN13RApaLsSession17DeleteDataMappingERK9TDataType4TUid @ 48 NONAME + _ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayI7TDesC16E @ 49 NONAME + _ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUid @ 50 NONAME + _ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUidS3_ @ 51 NONAME + _ZN13RApaLsSession17SetMaxDataBufSizeEi @ 52 NONAME + _ZN13RApaLsSession18SetAppShortCaptionERK7TDesC169TLanguage4TUid @ 53 NONAME + _ZN13RApaLsSession20CancelRecognizeFilesEv @ 54 NONAME + _ZN13RApaLsSession21SetAcceptedConfidenceEi @ 55 NONAME + _ZN13RApaLsSession23RApaLsSession_Reserved1Ev @ 56 NONAME + _ZN13RApaLsSession23RApaLsSession_Reserved2Ev @ 57 NONAME + _ZN13RApaLsSession25InsertDataMappingIfHigherERK9TDataTypel4TUidRi @ 58 NONAME + _ZN13RApaLsSession25NotifyOnDataMappingChangeER14TRequestStatus @ 59 NONAME + _ZN13RApaLsSession29RegisterNonNativeApplicationLE4TUidRK10TDriveUnitR34CApaRegistrationResourceFileWriterP33CApaLocalisableResourceFileWriterPK5RFile @ 60 NONAME + _ZN13RApaLsSession31CancelNotifyOnDataMappingChangeEv @ 61 NONAME + _ZN13RApaLsSession31DeregisterNonNativeApplicationLE4TUid @ 62 NONAME + _ZN13RApaLsSession33RegisterNonNativeApplicationTypeLE4TUidRK7TDesC16 @ 63 NONAME + _ZN13RApaLsSession35CommitNonNativeApplicationsUpdatesLEv @ 64 NONAME + _ZN13RApaLsSession35DeregisterNonNativeApplicationTypeLE4TUid @ 65 NONAME + _ZN13RApaLsSession36PrepareNonNativeApplicationsUpdatesLEv @ 66 NONAME + _ZN13RApaLsSession36RollbackNonNativeApplicationsUpdatesEv @ 67 NONAME + _ZN13RApaLsSession5CloseEv @ 68 NONAME + _ZN13RApaLsSession7ConnectEv @ 69 NONAME + _ZN13RApaLsSession8StartAppERK15CApaCommandLine @ 70 NONAME + _ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadId @ 71 NONAME + _ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadIdP14TRequestStatus @ 72 NONAME + _ZN13RApaLsSession9FsSessionEv @ 73 NONAME + _ZN13RApaLsSession9SetNotifyEiR14TRequestStatus @ 74 NONAME + _ZN13RApaLsSessionC1Ev @ 75 NONAME + _ZN13RApaLsSessionC2Ev @ 76 NONAME + _ZN16CApaMaskedBitmap12InternalizeLER11RReadStream @ 77 NONAME + _ZN16CApaMaskedBitmap13SetMaskBitmapEP10CFbsBitmap @ 78 NONAME + _ZN16CApaMaskedBitmap4NewLEPKS_ @ 79 NONAME + _ZN16CApaMaskedBitmap5NewLCEv @ 80 NONAME + _ZN16CApaMaskedBitmapD0Ev @ 81 NONAME + _ZN16CApaMaskedBitmapD1Ev @ 82 NONAME + _ZN16CApaMaskedBitmapD2Ev @ 83 NONAME + _ZN17CApaSystemControl7CreateLEv @ 84 NONAME + _ZN18TApaPictureFactoryC1EP11CApaProcess @ 85 NONAME + _ZN18TApaPictureFactoryC1Ev @ 86 NONAME + _ZN18TApaPictureFactoryC2EP11CApaProcess @ 87 NONAME + _ZN18TApaPictureFactoryC2Ev @ 88 NONAME + _ZN19CApaAppListNotifier4NewLEP23MApaAppListServObserverN7CActive9TPriorityE @ 89 NONAME + _ZN19CApaAppListNotifierD0Ev @ 90 NONAME + _ZN19CApaAppListNotifierD1Ev @ 91 NONAME + _ZN19CApaAppListNotifierD2Ev @ 92 NONAME + _ZN19CApaWindowGroupName11SetAppReadyEi @ 93 NONAME + _ZN19CApaWindowGroupName11SetCaptionLERK7TDesC16 @ 94 NONAME + _ZN19CApaWindowGroupName11SetDocNameLERK7TDesC16 @ 95 NONAME + _ZN19CApaWindowGroupName12FindByAppUidE4TUidR10RWsSessionRi @ 96 NONAME + _ZN19CApaWindowGroupName13FindByCaptionERK7TDesC16R10RWsSessionRi @ 97 NONAME + _ZN19CApaWindowGroupName13FindByDocNameERK7TDesC16R10RWsSessionRi @ 98 NONAME + _ZN19CApaWindowGroupName17SetDocNameIsAFileEi @ 99 NONAME + _ZN19CApaWindowGroupName18ConstructFromWgIdLEi @ 100 NONAME + _ZN19CApaWindowGroupName18SetWindowGroupNameEP7HBufC16 @ 101 NONAME + _ZN19CApaWindowGroupName19SetWindowGroupNameLERK7TDesC16 @ 102 NONAME + _ZN19CApaWindowGroupName26SetRespondsToShutdownEventEi @ 103 NONAME + _ZN19CApaWindowGroupName29SetRespondsToSwitchFilesEventEi @ 104 NONAME + _ZN19CApaWindowGroupName3NewERK10RWsSessionP7HBufC16 @ 105 NONAME + _ZN19CApaWindowGroupName4NewLERK10RWsSession @ 106 NONAME + _ZN19CApaWindowGroupName4NewLERK10RWsSessionRK7TDesC16 @ 107 NONAME + _ZN19CApaWindowGroupName4NewLERK10RWsSessioni @ 108 NONAME + _ZN19CApaWindowGroupName5NewLCERK10RWsSession @ 109 NONAME + _ZN19CApaWindowGroupName5NewLCERK10RWsSessionRK7TDesC16 @ 110 NONAME + _ZN19CApaWindowGroupName5NewLCERK10RWsSessioni @ 111 NONAME + _ZN19CApaWindowGroupName7SetBusyEi @ 112 NONAME + _ZN19CApaWindowGroupName9SetAppUidE4TUid @ 113 NONAME + _ZN19CApaWindowGroupName9SetHiddenEi @ 114 NONAME + _ZN19CApaWindowGroupName9SetSystemEi @ 115 NONAME + _ZN19CApaWindowGroupNameD0Ev @ 116 NONAME + _ZN19CApaWindowGroupNameD1Ev @ 117 NONAME + _ZN19CApaWindowGroupNameD2Ev @ 118 NONAME + _ZN21CApaAppInfoFileWriter11AddCaptionLE9TLanguageRK7TDesC16 @ 119 NONAME ABSENT + _ZN21CApaAppInfoFileWriter12AddDataTypeLERK21TDataTypeWithPriority @ 120 NONAME ABSENT + _ZN21CApaAppInfoFileWriter13SetCapabilityERK6TDesC8 @ 121 NONAME ABSENT + _ZN21CApaAppInfoFileWriter6StoreLEv @ 122 NONAME ABSENT + _ZN21CApaAppInfoFileWriter8AddIconLER16CApaMaskedBitmap @ 123 NONAME ABSENT + _ZN21CApaAppInfoFileWriterD0Ev @ 124 NONAME ABSENT + _ZN21CApaAppInfoFileWriterD1Ev @ 125 NONAME ABSENT + _ZN21CApaAppInfoFileWriterD2Ev @ 126 NONAME ABSENT + _ZN21CApaSystemControlList4NewLER3RFs @ 127 NONAME + _ZN21CApaSystemControlList7UpdateLEv @ 128 NONAME + _ZN21CApaSystemControlListD0Ev @ 129 NONAME + _ZN21CApaSystemControlListD1Ev @ 130 NONAME + _ZN21CApaSystemControlListD2Ev @ 131 NONAME + _ZN22ForJavaMIDletInstaller18GetJavaMIDletInfoLER3RFsRK7TDesC16RmS5_ @ 132 NONAME ABSENT + _ZN22ForJavaMIDletInstaller28NewInterimFormatFileWriterLCER3RFsRK7TDesC164TUidmi @ 133 NONAME ABSENT + _ZN22ForJavaMIDletInstaller33CheckInterimFormatFileNotCorruptLER5RFile @ 134 NONAME ABSENT + _ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved1Ev @ 135 NONAME + _ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved2Ev @ 136 NONAME + _ZN23MApaAppListServObserverC2Ev @ 137 NONAME + _ZN27CDataRecognitionResultArrayC1Ev @ 138 NONAME + _ZN27CDataRecognitionResultArrayC2Ev @ 139 NONAME + _ZN27CDataRecognitionResultArrayD0Ev @ 140 NONAME + _ZN27CDataRecognitionResultArrayD1Ev @ 141 NONAME + _ZN27CDataRecognitionResultArrayD2Ev @ 142 NONAME + _ZN31TIconLoaderAndIconArrayForLeaks27TestIconLoaderAndIconArrayLEv @ 143 NONAME + _ZN33CApaLocalisableResourceFileWriter4NewLERK7TDesC16S2_iS2_ @ 144 NONAME + _ZN33CApaLocalisableResourceFileWriterD0Ev @ 145 NONAME + _ZN33CApaLocalisableResourceFileWriterD1Ev @ 146 NONAME + _ZN33CApaLocalisableResourceFileWriterD2Ev @ 147 NONAME + _ZN34CApaRegistrationResourceFileWriter12AddDataTypeLEiRK6TDesC8 @ 148 NONAME + _ZN34CApaRegistrationResourceFileWriter13SetGroupNameLERK7TDesC16 @ 149 NONAME + _ZN34CApaRegistrationResourceFileWriter14SetOpaqueDataLERK6TDesC8 @ 150 NONAME + _ZN34CApaRegistrationResourceFileWriter15SetAppIsHiddenLEi @ 151 NONAME + _ZN34CApaRegistrationResourceFileWriter17SetEmbeddabilityLEN17TApaAppCapability14TEmbeddabilityE @ 152 NONAME + _ZN34CApaRegistrationResourceFileWriter19SetSupportsNewFileLEi @ 153 NONAME + _ZN34CApaRegistrationResourceFileWriter21AddFileOwnershipInfoLERK7TDesC16 @ 154 NONAME + _ZN34CApaRegistrationResourceFileWriter22SetLaunchInBackgroundLEi @ 155 NONAME + _ZN34CApaRegistrationResourceFileWriter23SetDefaultScreenNumberLEi @ 156 NONAME + _ZN34CApaRegistrationResourceFileWriter4NewLE4TUidRK7TDesC16j @ 157 NONAME + _ZN34CApaRegistrationResourceFileWriterD0Ev @ 158 NONAME + _ZN34CApaRegistrationResourceFileWriterD1Ev @ 159 NONAME + _ZN34CApaRegistrationResourceFileWriterD2Ev @ 160 NONAME + _ZN8ApaUtils24HandleAsRegistrationFileERK8TUidType @ 161 NONAME ABSENT + _ZN8CApaDoor16SetFormatToIconLEv @ 162 NONAME + _ZN8CApaDoor17SetFormatToGlassLEv @ 163 NONAME + _ZN8CApaDoor25SetFormatToTemporaryIconLEi @ 164 NONAME + _ZN8CApaDoor4NewLER3RFsR12CApaDocumentRK5TSize @ 165 NONAME + _ZN8CApaDoor4NewLER3RFsRK12CStreamStore9TStreamIdR11CApaProcess @ 166 NONAME + _ZN8CApaDoor5NewLCER3RFsR12CApaDocumentRK5TSize @ 167 NONAME + _ZN8CApaDoor8RestoreLERK12CStreamStore9TStreamId @ 168 NONAME + _ZN8CApaDoor9DocumentLEi @ 169 NONAME + _ZN8CApaDoorD0Ev @ 170 NONAME + _ZN8CApaDoorD1Ev @ 171 NONAME + _ZN8CApaDoorD2Ev @ 172 NONAME + _ZN8TApaTask11SendMessageE4TUidRK6TDesC8 @ 173 NONAME + _ZN8TApaTask14SwitchOpenFileERK7TDesC16 @ 174 NONAME + _ZN8TApaTask15SendSystemEventE15TApaSystemEvent @ 175 NONAME + _ZN8TApaTask16SendToBackgroundEv @ 176 NONAME + _ZN8TApaTask16SwitchCreateFileERK7TDesC16 @ 177 NONAME + _ZN8TApaTask17BringToForegroundEv @ 178 NONAME + _ZN8TApaTask7EndTaskEv @ 179 NONAME + _ZN8TApaTask7SendKeyERK9TKeyEvent @ 180 NONAME + _ZN8TApaTask7SendKeyEii @ 181 NONAME + _ZN8TApaTask7SetWgIdEi @ 182 NONAME + _ZN8TApaTask8KillTaskEv @ 183 NONAME + _ZN8TApaTaskC1ER10RWsSession @ 184 NONAME + _ZN8TApaTaskC2ER10RWsSession @ 185 NONAME + _ZNK11CApaAppData10CapabilityER5TDes8 @ 186 NONAME + _ZNK11CApaAppData10IconSizesLEv @ 187 NONAME + _ZNK11CApaAppData10OpaqueDataEv @ 188 NONAME + _ZNK11CApaAppData10OwnedFilesEv @ 189 NONAME + _ZNK11CApaAppData11GetIconInfoERiS0_ @ 190 NONAME + _ZNK11CApaAppData12IconFileNameEv @ 191 NONAME + _ZNK11CApaAppData14NonMbmIconFileEv @ 192 NONAME + _ZNK11CApaAppData17ImplementsServiceE4TUid @ 193 NONAME + _ZNK11CApaAppData19ApplicationLanguageEv @ 194 NONAME + _ZNK11CApaAppData19DefaultScreenNumberEv @ 195 NONAME + _ZNK11CApaAppData20RegistrationFileNameEv @ 196 NONAME + _ZNK11CApaAppData20RegistrationFileUsedEv @ 197 NONAME + _ZNK11CApaAppData24NonNativeApplicationTypeEv @ 198 NONAME + _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 199 NONAME + _ZNK11CApaAppData4IconE5TSize @ 200 NONAME + _ZNK11CApaAppData4IconEi @ 201 NONAME + _ZNK11CApaAppData5ViewsEv @ 202 NONAME + _ZNK11CApaAppData8AppEntryEv @ 203 NONAME + _ZNK11CApaAppData8DataTypeERK9TDataType @ 204 NONAME + _ZNK11CApaAppData9IsPendingEv @ 205 NONAME + _ZNK11CApaAppList12AppDataByUidE4TUid @ 206 NONAME + _ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 207 NONAME + _ZNK11CApaAppList17AppScanInProgressEv @ 208 NONAME + _ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 209 NONAME + _ZNK11CApaAppList19IsFirstScanCompleteEv @ 210 NONAME + _ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 211 NONAME + _ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 212 NONAME + _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 213 NONAME + _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 214 NONAME + _ZNK11CApaAppList23IsLanguageChangePendingEv @ 215 NONAME + _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 216 NONAME + _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 217 NONAME + _ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 218 NONAME + _ZNK11CApaAppList5CountEv @ 219 NONAME + _ZNK11CApaAppList7NextAppEPK11CApaAppData @ 220 NONAME + _ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 221 NONAME + _ZNK11CApaAppList8FirstAppEi @ 222 NONAME + _ZNK11CApaAppList8FirstAppEv @ 223 NONAME + _ZNK13RApaLsSession10GetAllAppsEi @ 224 NONAME + _ZNK13RApaLsSession10GetAllAppsEv @ 225 NONAME + _ZNK13RApaLsSession10GetAppIconE4TUid5TSizeR16CApaMaskedBitmap @ 226 NONAME + _ZNK13RApaLsSession10GetAppIconE4TUidR5RFile @ 227 NONAME + _ZNK13RApaLsSession10GetAppIconE4TUidRP7HBufC16 @ 228 NONAME + _ZNK13RApaLsSession10GetAppIconE4TUidiR16CApaMaskedBitmap @ 229 NONAME + _ZNK13RApaLsSession10GetAppInfoER11TApaAppInfo4TUid @ 230 NONAME + _ZNK13RApaLsSession10GetAppTypeER4TUidS0_ @ 231 NONAME + _ZNK13RApaLsSession10GetNextAppER11TApaAppInfo @ 232 NONAME + _ZNK13RApaLsSession10GetNextAppER11TApaAppInfoi @ 233 NONAME + _ZNK13RApaLsSession11GetAppViewsER13CArrayFixFlatI15TApaAppViewInfoE4TUid @ 234 NONAME + _ZNK13RApaLsSession13GetServerAppsE4TUid @ 235 NONAME + _ZNK13RApaLsSession13GetServerAppsE4TUidi @ 236 NONAME + _ZNK13RApaLsSession13RecognizeDataERK5RFileR22TDataRecognitionResult @ 237 NONAME + _ZNK13RApaLsSession13RecognizeDataERK7TDesC16RK6TDesC8R22TDataRecognitionResult @ 238 NONAME + _ZNK13RApaLsSession14AppForDataTypeERK9TDataTypeR4TUid @ 239 NONAME + _ZNK13RApaLsSession14AppForDocumentERK5RFileR4TUidR9TDataType @ 240 NONAME + _ZNK13RApaLsSession14AppForDocumentERK7TDesC16R4TUidR9TDataType @ 241 NONAME + _ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RK5TSizeR16CApaMaskedBitmap @ 242 NONAME + _ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RP7HBufC16 @ 243 NONAME + _ZNK13RApaLsSession15GetAppIconSizesE4TUidR13CArrayFixFlatI5TSizeE @ 244 NONAME + _ZNK13RApaLsSession15GetAppServicesLE4TUidR13CArrayFixFlatIS0_E @ 245 NONAME + _ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilter @ 246 NONAME + _ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilteri @ 247 NONAME + _ZNK13RApaLsSession15GetFilteredAppsEjj @ 248 NONAME + _ZNK13RApaLsSession15GetFilteredAppsEjji @ 249 NONAME + _ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArray @ 250 NONAME + _ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArray @ 251 NONAME + _ZNK13RApaLsSession16GetAppByDataTypeERK9TDataType4TUidRS3_ @ 252 NONAME + _ZNK13RApaLsSession16GetAppCapabilityER5TDes84TUid @ 253 NONAME + _ZNK13RApaLsSession16GetAppOwnedFilesER12CDesC16Array4TUid @ 254 NONAME + _ZNK13RApaLsSession16GetAppServicesLCE4TUid @ 255 NONAME + _ZNK13RApaLsSession17GetEmbeddableAppsEi @ 256 NONAME + _ZNK13RApaLsSession17GetEmbeddableAppsEv @ 257 NONAME + _ZNK13RApaLsSession17GetMaxDataBufSizeERi @ 258 NONAME + _ZNK13RApaLsSession18EmbeddableAppCountERi @ 259 NONAME + _ZNK13RApaLsSession19ApplicationLanguageE4TUidR9TLanguage @ 260 NONAME + _ZNK13RApaLsSession19GetPreferredBufSizeERi @ 261 NONAME + _ZNK13RApaLsSession21GetAcceptedConfidenceERi @ 262 NONAME + _ZNK13RApaLsSession21MatchesSecurityPolicyERi4TUidRK15TSecurityPolicy @ 263 NONAME + _ZNK13RApaLsSession21RecognizeSpecificDataERK5RFileRK9TDataTypeRi @ 264 NONAME + _ZNK13RApaLsSession21RecognizeSpecificDataERK7TDesC16RK6TDesC8RK9TDataTypeRi @ 265 NONAME + _ZNK13RApaLsSession22GetDefaultScreenNumberERi4TUid @ 266 NONAME + _ZNK13RApaLsSession22GetSupportedDataTypesLER13CArrayFixFlatI9TDataTypeE @ 267 NONAME + _ZNK13RApaLsSession23NumberOfOwnDefinedIconsE4TUidRi @ 268 NONAME + _ZNK13RApaLsSession24AppForDataTypeAndServiceERK9TDataType4TUidRS3_ @ 269 NONAME + _ZNK13RApaLsSession24AppForDocumentAndServiceERK5RFile4TUidRS3_R9TDataType @ 270 NONAME + _ZNK13RApaLsSession24AppForDocumentAndServiceERK7TDesC164TUidRS3_R9TDataType @ 271 NONAME + _ZNK13RApaLsSession25GetAppServiceOpaqueDataLCE4TUidS0_ @ 272 NONAME + _ZNK13RApaLsSession27GetServiceImplementationsLCE4TUid @ 273 NONAME + _ZNK13RApaLsSession27GetServiceImplementationsLCE4TUidRK9TDataType @ 274 NONAME + _ZNK13RApaLsSession36CancelListPopulationCompleteObserverEv @ 275 NONAME + _ZNK13RApaLsSession38RegisterListPopulationCompleteObserverER14TRequestStatus @ 276 NONAME + _ZNK13RApaLsSession7VersionEv @ 277 NONAME + _ZNK13RApaLsSession8AppCountERi @ 278 NONAME + _ZNK13RApaLsSession9IsProgramERK7TDesC16Ri @ 279 NONAME + _ZNK15CApaAppViewData10IconSizesLEv @ 280 NONAME + _ZNK15CApaAppViewData10ScreenModeEv @ 281 NONAME + _ZNK15CApaAppViewData12IconFileNameEv @ 282 NONAME + _ZNK15CApaAppViewData14NonMbmIconFileEv @ 283 NONAME + _ZNK15CApaAppViewData3UidEv @ 284 NONAME + _ZNK15CApaAppViewData4IconERK5TSize @ 285 NONAME + _ZNK16CApaMaskedBitmap12ExternalizeLER12RWriteStream @ 286 NONAME + _ZNK16CApaMaskedBitmap4MaskEv @ 287 NONAME + _ZNK17CApaSystemControl12ShortCaptionEv @ 288 NONAME + _ZNK17CApaSystemControl4IconEv @ 289 NONAME + _ZNK17CApaSystemControl4TypeEv @ 290 NONAME + _ZNK17CApaSystemControl7CaptionEv @ 291 NONAME + _ZNK17CApaSystemControl8FileNameEv @ 292 NONAME + _ZNK18TApaAppServiceInfo10OpaqueDataEv @ 293 NONAME + _ZNK18TApaAppServiceInfo3UidEv @ 294 NONAME + _ZNK18TApaAppServiceInfo9DataTypesEv @ 295 NONAME + _ZNK18TApaPictureFactory11NewPictureLER14TPictureHeaderRK12CStreamStore @ 296 NONAME + _ZNK19CApaWindowGroupName10IsAppReadyEv @ 297 NONAME + _ZNK19CApaWindowGroupName14DocNameIsAFileEv @ 298 NONAME + _ZNK19CApaWindowGroupName15WindowGroupNameEv @ 299 NONAME + _ZNK19CApaWindowGroupName18SetWindowGroupNameER12RWindowGroup @ 300 NONAME + _ZNK19CApaWindowGroupName23RespondsToShutdownEventEv @ 301 NONAME + _ZNK19CApaWindowGroupName26RespondsToSwitchFilesEventEv @ 302 NONAME + _ZNK19CApaWindowGroupName6AppUidEv @ 303 NONAME + _ZNK19CApaWindowGroupName6HiddenEv @ 304 NONAME + _ZNK19CApaWindowGroupName6IsBusyEv @ 305 NONAME + _ZNK19CApaWindowGroupName7CaptionEv @ 306 NONAME + _ZNK19CApaWindowGroupName7DocNameEv @ 307 NONAME + _ZNK19CApaWindowGroupName8IsSystemEv @ 308 NONAME + _ZNK21CApaSystemControlList5CountEv @ 309 NONAME + _ZNK21CApaSystemControlList5IndexE4TUid @ 310 NONAME + _ZNK21CApaSystemControlList7ControlE4TUid @ 311 NONAME + _ZNK21CApaSystemControlList7ControlEi @ 312 NONAME + _ZNK27CDataRecognitionResultArray12GetFileNameLER4TBufILi256EEj @ 313 NONAME + _ZNK27CDataRecognitionResultArray25GetDataRecognitionResultLER22TDataRecognitionResultj @ 314 NONAME + _ZNK27CDataRecognitionResultArray4PathEv @ 315 NONAME + _ZNK27CDataRecognitionResultArray5CountEv @ 316 NONAME + _ZNK8CApaDoor7AppUidLEv @ 317 NONAME + _ZNK8TApaTask4WgIdEv @ 318 NONAME + _ZNK8TApaTask6ExistsEv @ 319 NONAME + _ZNK8TApaTask8ThreadIdEv @ 320 NONAME + _ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 321 NONAME + _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 322 NONAME + _ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 323 NONAME + _ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 324 NONAME + _ZN11CApaAppList4NewLER3RFsii @ 325 NONAME + _ZN11TApaAppInfo12InternalizeLER11RReadStream @ 326 NONAME + _ZN11TApaAppInfoC1E4TUidRK4TBufILi256EES4_ @ 327 NONAME + _ZN11TApaAppInfoC1E4TUidRK4TBufILi256EES4_S4_ @ 328 NONAME + _ZN11TApaAppInfoC1Ev @ 329 NONAME + _ZN11TApaAppInfoC2E4TUidRK4TBufILi256EES4_ @ 330 NONAME + _ZN11TApaAppInfoC2E4TUidRK4TBufILi256EES4_S4_ @ 331 NONAME + _ZN11TApaAppInfoC2Ev @ 332 NONAME + _ZN12TApaAppEntryC1Ev @ 333 NONAME + _ZN12TApaAppEntryC2Ev @ 334 NONAME + _ZN15TApaAppViewInfo12InternalizeLER11RReadStream @ 335 NONAME + _ZN15TApaAppViewInfoC1E4TUidRK4TBufILi256EEi @ 336 NONAME + _ZN15TApaAppViewInfoC1Ev @ 337 NONAME + _ZN15TApaAppViewInfoC2E4TUidRK4TBufILi256EEi @ 338 NONAME + _ZN15TApaAppViewInfoC2Ev @ 339 NONAME + _ZN17TApaAppCapability12InternalizeLER11RReadStream @ 340 NONAME + _ZN17TApaAppCapability14CopyCapabilityER5TDes8RK6TDesC8 @ 341 NONAME + _ZN17TApaAppIdentifier12InternalizeLER11RReadStream @ 342 NONAME + _ZN17TApaAppIdentifierC1E4TUidRK4TBufILi256EE @ 343 NONAME + _ZN17TApaAppIdentifierC1Ev @ 344 NONAME + _ZN17TApaAppIdentifierC2E4TUidRK4TBufILi256EE @ 345 NONAME + _ZN17TApaAppIdentifierC2Ev @ 346 NONAME + _ZN18TApaAppServiceInfo12InternalizeLER11RReadStream @ 347 NONAME + _ZN18TApaAppServiceInfo7ReleaseEv @ 348 NONAME + _ZN18TApaAppServiceInfo9DataTypesEv @ 349 NONAME + _ZN18TApaAppServiceInfoC1E4TUidP13CArrayFixFlatI21TDataTypeWithPriorityEP6HBufC8 @ 350 NONAME + _ZN18TApaAppServiceInfoC1Ev @ 351 NONAME + _ZN18TApaAppServiceInfoC2E4TUidP13CArrayFixFlatI21TDataTypeWithPriorityEP6HBufC8 @ 352 NONAME + _ZN18TApaAppServiceInfoC2Ev @ 353 NONAME + _ZN23CApaAppServiceInfoArray33CApaAppServiceInfoArray_Reserved1Ev @ 354 NONAME + _ZN23CApaAppServiceInfoArray33CApaAppServiceInfoArray_Reserved2Ev @ 355 NONAME + _ZN23CApaAppServiceInfoArrayC2Ev @ 356 NONAME + _ZN23TApaEmbeddabilityFilter16AddEmbeddabilityEN17TApaAppCapability14TEmbeddabilityE @ 357 NONAME + _ZN23TApaEmbeddabilityFilterC1Ev @ 358 NONAME + _ZN23TApaEmbeddabilityFilterC2Ev @ 359 NONAME + _ZNK11TApaAppInfo12ExternalizeLER12RWriteStream @ 360 NONAME + _ZNK15TApaAppViewInfo12ExternalizeLER12RWriteStream @ 361 NONAME + _ZNK17TApaAppCapability12ExternalizeLER12RWriteStream @ 362 NONAME + _ZNK17TApaAppIdentifier12ExternalizeLER12RWriteStream @ 363 NONAME + _ZNK18TApaAppServiceInfo12ExternalizeLER12RWriteStream @ 364 NONAME + _ZNK23TApaEmbeddabilityFilter20MatchesEmbeddabilityEN17TApaAppCapability14TEmbeddabilityE @ 365 NONAME + _ZTI11CApaAppData @ 366 NONAME + _ZTI11CApaAppList @ 367 NONAME + _ZTI12CApaAppEntry @ 368 NONAME + _ZTI13RApaLsSession @ 369 NONAME + _ZTI15CApaAppViewData @ 370 NONAME + _ZTI15CApaIconPicture @ 371 NONAME + _ZTI16CApaMaskedBitmap @ 372 NONAME + _ZTI17CApaAppInfoReader @ 373 NONAME + _ZTI17CApaSystemControl @ 374 NONAME + _ZTI18TApaPictureFactory @ 375 NONAME + _ZTI19CApaAppListNotifier @ 376 NONAME + _ZTI19CApaWindowGroupName @ 377 NONAME + _ZTI21CApaSystemControlList @ 378 NONAME + _ZTI23CApaAppServiceInfoArray @ 379 NONAME + _ZTI23MApaAppListServObserver @ 380 NONAME + _ZTI27CDataRecognitionResultArray @ 381 NONAME + _ZTI33CApaLocalisableResourceFileWriter @ 382 NONAME + _ZTI34CApaRegistrationResourceFileWriter @ 383 NONAME + _ZTI7HBufBuf @ 384 NONAME + _ZTI8CApaDoor @ 385 NONAME + _ZTIN26CApaResourceFileWriterBase11RBufferSinkE @ 386 NONAME + _ZTV11CApaAppData @ 387 NONAME + _ZTV11CApaAppList @ 388 NONAME + _ZTV12CApaAppEntry @ 389 NONAME + _ZTV13RApaLsSession @ 390 NONAME + _ZTV15CApaAppViewData @ 391 NONAME + _ZTV15CApaIconPicture @ 392 NONAME + _ZTV16CApaMaskedBitmap @ 393 NONAME + _ZTV17CApaAppInfoReader @ 394 NONAME + _ZTV17CApaSystemControl @ 395 NONAME + _ZTV18TApaPictureFactory @ 396 NONAME + _ZTV19CApaAppListNotifier @ 397 NONAME + _ZTV19CApaWindowGroupName @ 398 NONAME + _ZTV21CApaSystemControlList @ 399 NONAME + _ZTV23CApaAppServiceInfoArray @ 400 NONAME + _ZTV23MApaAppListServObserver @ 401 NONAME + _ZTV27CDataRecognitionResultArray @ 402 NONAME + _ZTV33CApaLocalisableResourceFileWriter @ 403 NONAME + _ZTV34CApaRegistrationResourceFileWriter @ 404 NONAME + _ZTV7HBufBuf @ 405 NONAME + _ZTV8CApaDoor @ 406 NONAME + _ZTVN26CApaResourceFileWriterBase11RBufferSinkE @ 407 NONAME + _ZN11CApaAppData11SetCaptionLERK7TDesC16 @ 408 NONAME + _ZN11CApaAppData9SetIconsLERK7TDesC16i @ 409 NONAME + _ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 410 NONAME + _ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 411 NONAME + _ZN31TIconLoaderAndIconArrayForLeaks25TestIconCaptionOverridesLEv @ 412 NONAME + _ZN11CApaAppList20AppListUpdatePendingEv @ 413 NONAME + _ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 414 NONAME + _ZN11CApaAppList19UninstalledAppArrayEv @ 415 NONAME + X @ 416 NONAME ABSENT + X @ 417 NONAME ABSENT + X @ 418 NONAME ABSENT + X @ 419 NONAME ABSENT + X @ 420 NONAME ABSENT + X @ 421 NONAME ABSENT + X @ 422 NONAME ABSENT + X @ 423 NONAME ABSENT + X @ 424 NONAME ABSENT + X @ 425 NONAME ABSENT + X @ 426 NONAME ABSENT + X @ 427 NONAME ABSENT + X @ 428 NONAME ABSENT + X @ 429 NONAME ABSENT + X @ 430 NONAME ABSENT + X @ 431 NONAME ABSENT + X @ 432 NONAME ABSENT \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/APFILE.MMP --- a/appfw/apparchitecture/group/APFILE.MMP Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/group/APFILE.MMP Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -38,17 +38,17 @@ macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER -source APFREC.CPP APFSTD.CPP APRuleBased.CPP ApLaunchChecker.cpp apinstallationmonitor.cpp +source APFREC.CPP APFSTD.CPP APRuleBased.CPP ApLaunchChecker.cpp source apfmimecontentpolicy.cpp +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +source apinstallationmonitor.cpp +#endif + library euser.lib efsrv.lib apparc.lib apgrfx.lib bafl.lib apserv.lib ecom.lib library apmime.lib caf.lib - +library centralrepository.lib -START RESOURCE ../apfile/apfmimecontentpolicy.rss -HEADER -TARGETPATH /resource/apps -END START WINS baseaddress 0x43000000 @@ -57,6 +57,12 @@ START MARM END +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + deffile APFILE.DEF +#else + deffile apfile_legacy.def +#endif + // For the benefit of Eshell which cannot build a resource registration file START RESOURCE eshell_reg.rss TARGETPATH /private/10003a3f/apps diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/APGRFX.MMP --- a/appfw/apparchitecture/group/APGRFX.MMP Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/group/APGRFX.MMP Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -42,10 +42,18 @@ source apgnotif.cpp APSCLI.CPP apgconstdata.cpp SOURCE apsecutils.cpp +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +SOURCE apgupdate.cpp +#endif + library euser.lib apparc.lib apmime.lib gdi.lib estor.lib efsrv.lib fbscli.lib library bitgdi.lib ws32.lib bafl.lib library apserv.lib apfile.lib +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +library scrclient.lib +#endif + #ifdef USE_IH_RAISE_EVENT LIBRARY instrumentationhandler.lib #endif // USE_IH_RAISE_EVENT @@ -56,7 +64,12 @@ macro SYMBIAN_SUPPORT_UI_FRAMEWORKS_V1 -deffile APGRFX.DEF +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + deffile APGRFX.DEF +#else + deffile apgrfx_legacy.def +#endif + START WINS baseaddress 0x42F00000 diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/APLIST.MMP --- a/appfw/apparchitecture/group/APLIST.MMP Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/group/APLIST.MMP Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -32,18 +32,18 @@ option MSVC /Od + SOURCEPATH ../aplist userinclude ../inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -source aplapplist.cpp aplapplistitem.cpp aplappinforeader.cpp aplappregfinder.cpp apsidchecker.cpp +source aplapplist.cpp aplapplistitem.cpp aplappinforeader.cpp apsidchecker.cpp source apsiconcaptionoverride.cpp -// source APGCTL.CPP apgdoor.cpp APGICNFL.CPP APGSTD.CPP APGTASK.CPP -// source APGWGNAM.CPP apgcli.cpp apgstart.cpp apgrecog.cpp APGPRIV.CPP -// source apgnotif.cpp APGAIR.CPP APGAIRV2.CPP APSCLI.CPP APGCONSTDATA.CPP -// SOURCE apsecutils.cpp -// source APGAPLSTV2.CPP + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +source aplappregfinder.cpp +#endif library euser.lib gdi.lib estor.lib efsrv.lib fbscli.lib library bitgdi.lib ws32.lib bafl.lib ecom.lib @@ -59,6 +59,10 @@ library apmime.lib // TDataType referenced from CApaAppData library centralrepository.lib +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +library scrclient.lib +#endif + //library apserv.lib apfile.lib apparc.lib #ifdef USE_IH_RAISE_EVENT @@ -75,4 +79,12 @@ START MARM END +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + deffile aplist.def +#else + deffile aplist_legacy.def +#endif + + + SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/APSERV.MMP --- a/appfw/apparchitecture/group/APSERV.MMP Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/group/APSERV.MMP Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -41,16 +41,27 @@ source APSSERV.CPP APSSES.CPP APSSTD.CPP APSSCAN.CPP source APSSTART.CPP APSRECCACHE.cpp APSRECUTIL.CPP source APSCONSTDATA.CPP +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK source apsnnapps.cpp apsnnappupdates.cpp +#endif library euser.lib efsrv.lib apparc.lib apgrfx.lib apmime.lib fbscli.lib apfile.lib library estor.lib bafl.lib ws32.lib ecom.lib library aplist.lib +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +library scrclient.lib +library sisregistryclient.lib +#endif + macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER -deffile APSERV.DEF +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + deffile APSERV.DEF +#else + deffile apserv_legacy.def +#endif START WINS baseaddress 0x43700000 diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/BLD.INF --- a/appfw/apparchitecture/group/BLD.INF Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/group/BLD.INF Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -60,11 +60,17 @@ ../inc/APFCTLF.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apfctlf.h) ../inc/APRuleBased.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(aprulebased.h) ../inc/ApLaunchChecker.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(aplaunchchecker.h) + ../inc/ApSidChecker.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apsidchecker.h) // Files from gincc.prj ../inc/APGAPLST.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgaplst.h) ../inc/APGCLI.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgcli.h) + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +../inc/apgupdate.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgupdate.h) +#endif + ../inc/APGDOOR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgdoor.h) ../inc/APGICNFL.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgicnfl.h) #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS @@ -100,6 +106,8 @@ // ConfML files ../conf/apparchitecture.confml MW_LAYER_EXPORTS_CONFML(apparchitecture.confml) ../conf/apparchitecture_1028583d.crml MW_LAYER_EXPORTS_CRML(apparchitecture_1028583d.crml) +../conf/apparchitecture_closedcontentextinfo.confml MW_LAYER_EXPORTS_CONFML(apparchitecture_closedcontentextinfo.confml) +../conf/apparchitecture_closedcontentextinfo_10003a3f.crml MW_LAYER_EXPORTS_CRML(apparchitecture_closedcontentextinfo_10003a3f.crml) PRJ_MMPFILES @@ -128,13 +136,28 @@ // i.e. tests where no user input is required. The default will apply if neither "manual" // or "support" is specified. ../tef/apparctestserver.MMP + ../tef/TAppInstall/TestAppInstall.mmp -../tef/TSTAPP_embedded.MMP support -../tef/TSTAPP_standalone.MMP support -../tef/m_ctrl_v2.mmp support +../tef/CustomiseDefaultIconApp.mmp support +../tef/TCtrlPnlApp.mmp support +../tef/T_DataPrioritySystem3.mmp support +../tef/T_groupname.mmp support +../tef/T_groupname_ver1.mmp support +../tef/T_groupname_ver2.mmp support +../tef/TestTrustedPriorityApp1.mmp support +../tef/TestTrustedPriorityApp2.mmp support +../tef/TestUnTrustedPriorityApp1.mmp support +../tef/TestUnTrustedPriorityApp2.mmp support +../tef/openservice1app.mmp support +../tef/openservice2app.mmp support +../tef/serverapp.mmp support +../tef/serverapp2.mmp support +../tef/serverapp3.mmp support +../tef/serverapp4.mmp support +../tef/serverapp6.mmp support +../tef/serverapp7.mmp support ../tef/SimpleApparcTestApp.mmp support ../tef/zerosizedicontestapp.mmp support -../tef/TEXE_V2.MMP support ../tef/TAppNotEmbeddable_v2.mmp support ../tef/TAppEmbeddable_embedded.mmp support ../tef/TAppEmbeddable_standalone.mmp support @@ -145,61 +168,35 @@ ../tef/TStartDocApp_v2.mmp support ../tef/t_winchainChild.mmp support ../tef/t_winchainLaunch.mmp support -../tef/TLongUrlRecognizer_v2.mmp support -../tef/TRApaLsSessionStartAppTestRecognizer_v2.mmp support ../tef/TRApaLsSessionStartAppTestApp_v2.mmp support ../tef/tRuleBasedApps/tRuleBasedApp1.mmp support ../tef/tRuleBasedApps/tRuleBasedApp2.mmp support ../tef/tRuleBasedApps/tRuleBasedApp3.mmp support ../tef/tRuleBasedApps/tRuleBasedApp4.mmp support -../tef/TCmdLineExe.mmp support ../tef/TApparcTestApp.mmp support -../tef/TAppLaunchChecker.mmp support -../tef/TAppLaunchChecker2.mmp support -../tef/TNonNativeAppLaunchChecker.mmp support ../tef/app_CTRL.MMP -../tef/app_CTRL2.MMP ../tef/T_EnvSlots/T_EnvSlots.MMP -../tef/TESTREC/TESTREC.MMP ../tef/ParentProcess.mmp ../tef/ChildI.mmp ../tef/ChildII.mmp ../tef/ChildIII.mmp -../tef/tssaac/tssaac.mmp -../tef/tssaac/tssaac_tapp.mmp ../tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP ../tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP -../tef/TBufferOnlyRec/TBufferOnlyRec.mmp -../tef/TNonNative/TNonNativeRec.mmp ../tef/TNonNative/TNNApp1.mmp ../tef/TNonNative/TNNApp2.mmp + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK ../tef/TSidChecker/TestSidChecker.mmp -../tef/TMimeRec/recmime.MMP +#endif + ../tef/TEndTaskTestApp/EndTaskTestApp.mmp ../tef/tlargestack/tlargestackapp.mmp ../tef/UnProctectedUidApp.mmp support -../tef/TIconLoaderAndIconArrayForLeaks.mmp -// RecMime_1 binaries are used to install and uninstall the mime type recognizer during runtime in TRApaLsSessionTestStep. -//../tef/TMimeRec1/RecMime_1.MMP ../tef/tupgradeiconapp/tupgradeiconapp.mmp ../tef/tnotifydrivesapp/tnotifydrivesapp.mmp -../tef/TRecUpgrade/recupgrade.mmp -//***************************************************************************************************************************************************************************************************** -//recupgrade_1 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test. -// It is build for armv5 and rename to recupgrade_armv5_rel.dll and copied to apparc\Tdata before actual code builds. If you are making any change in recupgrade_1.cpp then uncomment -// “recupgrade_1.MMP” , build , rename (.dll) and copy as mentioned above . -//***************************************************************************************************************************************************************************************************** -//../tef/TRecUpgrade_1/recupgrade_1.MMP - +../tef/ticoncaptionoverride.mmp ../tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp -// *************************************************************************************************************************************************************************************************** -// recupgrade_2 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test. -// It is build for armv5 and rename to recupgrade2_armv5_rel.dll and copied to apparc\Tdata before actual code builds. If you are making any change in recupgrade_2.cpp then uncomment -// “recupgrade_2.MMP” , build , rename (.dll) and copy as mentioned above . -// *************************************************************************************************************************************************************************************************** -//../tef/TRecUpgrade_2/recupgrade_2.MMP -../tef/ticoncaptionoverride.mmp // testupdregappuninstallation is used in t_serviceregistry test. If any changes done to // this application, uncomment testupdregappuninstallation.mmp file and build it. // Then comment it and copy the testupdregappuninstallation_reg.rsc file to ..\tdata folder. @@ -213,9 +210,73 @@ //../tef/testapp/testupgradeupdregappuninstallation/testupgradeupdregappuninstallation.mmp +//plugins +../tef/TNonNativeAppLaunchChecker.mmp support +../tef/TAppLaunchChecker.mmp support +../tef/TAppLaunchChecker2.mmp support +../tef/TESTREC/TESTREC.MMP +../tef/TBufferOnlyRec/TBufferOnlyRec.mmp +../tef/TMimeRec/recmime.MMP +// RecMime_1 binaries are used to install and uninstall the mime type recognizer during runtime in TRApaLsSessionTestStep. +//../tef/TMimeRec1/RecMime_1.MMP + + +../tef/m_ctrl_v2.mmp support +../tef/m_ctrl_v2_Stub.mmp +../tef/TSTAPP_embedded.MMP support +../tef/TCmdLineExe.mmp support +../tef/app_CTRL2.MMP +../tef/app_CTRL2_stub.MMP +../tef/tssaac/tssaac.mmp +../tef/tssaac/tssaac_tapp.mmp +../tef/TEXE_V2.MMP support + + +../tef/TSTAPP_standalone.MMP support +../tef/TSTAPP_standalone_Stub.MMP +../tef/TNonNative/TNonNativeRec.mmp +../tef/TLongUrlRecognizer_v2.mmp support +../tef/TRApaLsSessionStartAppTestRecognizer_v2.mmp support + +../tef/TIconLoaderAndIconArrayForLeaks.mmp + +../tef/TRecUpgrade/recupgrade.mmp +../tef/refnativeplugin/refnativeplugin.mmp + +//***************************************************************************************************************************************************************************************************** +//recupgrade_1 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test. +// It is build for armv5 and rename to recupgrade_armv5_rel.dll and copied to apparc\Tdata before actual code builds. If you are making any change in recupgrade_1.cpp then uncomment +// “recupgrade_1.MMP” , build , rename (.dll) and copy as mentioned above . +//***************************************************************************************************************************************************************************************************** +//../tef/TRecUpgrade_1/recupgrade_1.MMP + + +// *************************************************************************************************************************************************************************************************** +// recupgrade_2 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test. +// It is build for armv5 and rename to recupgrade2_armv5_rel.dll and copied to apparc\Tdata before actual code builds. If you are making any change in recupgrade_2.cpp then uncomment +// “recupgrade_2.MMP” , build , rename (.dll) and copy as mentioned above . +// *************************************************************************************************************************************************************************************************** +//../tef/TRecUpgrade_2/recupgrade_2.MMP + + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +../tef/forceregapps/forceregapp1.mmp +../tef/forceregapps/forceregapp2.mmp +../tef/forceregapps/TForceRegAppRec.mmp +../tef/tnonnativeruntime/tnonnativeruntime.mmp +#endif + +makefile ../tef/testpkg/preparesis.fil +makefile ../tef/testpkg/preparesis_stub.fil + PRJ_TESTEXPORTS +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK ../group/apparcTest.iby /epoc32/rom/include/apparctest.iby +#else +../group/apparcTest_new.iby /epoc32/rom/include/apparctest.iby +#endif + ../tef/scripts/hardware/apparctest_run.bat z:/apparctest/apparctest_run.bat ../tef/scripts/emulator/apparctest_run.bat /epoc32/release/winscw/udeb/apparctest_run.bat @@ -274,6 +335,12 @@ ../tef/scripts/apparctest_t_servicebase.script z:/apparctest/apparctest_t_servicebase.script ../tef/scripts/apparctest_t_RecUpgrade.script z:/apparctest/apparctest_t_recupgrade.script +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +../tef/scripts/apparctest_t_UpdateAppList.script z:/apparctest/apparctest_t_updateapplist.script +../tef/scripts/apparctest_t_forcereg.script z:/apparctest/apparctest_t_forcereg.script +../tef/scripts/apparctest_t_clientnotif.script z:/apparctest/apparctest_t_clientnotif.script +../tef/scripts/apparctest_t_nonnativetest.script z:/apparctest/apparctest_t_nonnativetest.script +#endif //SysStart Apparc Scripts ../tef/scripts/apparctest_T_TestStartApp1L.script z:/apparctest/apparctest_t_teststartapp1l.script @@ -309,17 +376,38 @@ ../tef/tssaac/scripts/emulator/sysstart_apparc_setup.bat /epoc32/release/winscw/urel/z/apparctest/sysstart_apparc_setup.bat ../tef/tssaac/scripts/emulator/sysstart_apparc_checkEpocWind.bat /epoc32/release/winscw/urel/z/apparctest/sysstart_apparc_checkepocwind.bat -../tef/tupgradeiconapp/tupgradeiconapp.mbm /epoc32/winscw/c/resource/apps/tupgradeiconapp.mbm +../tef/tupgradeiconapp/tupgradeiconapp.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/tupgradeiconapp.mbm // epoc32\data -../tef/tstappviewneg.xyz /epoc32/data/z/resource/apps/tstappviewneg.xyz + +// export certificates for creating sis files +../tef/testpkg/Nokia_RnDCert_02.der /epoc32/tools/Nokia_RnDCert_02.der +../tef/testpkg/Nokia_RnDCert_02.key /epoc32/tools/Nokia_RnDCert_02.key +../tef/testpkg/swicertstore.dat /epoc32/release/winscw/udeb/z/resource/swicertstore.dat + + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +../tef/tstnnapp.mbm /epoc32/data/z/resource/apps/tstnnapp.mbm +../tdata/AAA_reg.Rsc /epoc32/data/z/apparctest/aaa_reg.rsc +#endif + +../tdata/forcegtestapp1.frg1 /epoc32/data/z/apparctest/forcegtestapp1.frg1 +../tdata/forcegtestapp2.frg2 /epoc32/data/z/apparctest/forcegtestapp2.frg2 +../tdata/scr_test.db /epoc32/data/z/apparctest/scr_test.db + ../tef/tstappviewneg.mbm /epoc32/data/z/resource/apps/tstappviewneg.mbm -../tef/tstnnapp.mbm /epoc32/data/z/resource/apps/tstnnapp.mbm -../tef/App_ctrl.MBM /epoc32/data/z/system/data/app_ctrl.mbm -../tef/zerosizedicon.mbm /epoc32/data/Z/resource/apps/zerosizedicon.mbm -../tef/svg_icon.svg /epoc32/data/z/system/data/svg_icon.svg -../tdata/AAA_reg.Rsc /epoc32/data/z/apparctest/aaa_reg.rsc +../tef/App_ctrl.MBM /epoc32/release/winscw/udeb/z/apparctestregfiles/app_ctrl.mbm +../tef/svg_icon.svg /epoc32/release/winscw/udeb/z/apparctestregfiles/svg_icon.svg +../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm ../tdata/Corrupted_reg.RSC /epoc32/data/z/apparctest/corrupted_reg.rsc + +../tdata/testfile4.txt /epoc32/data/z/system/data/testpath/filtertests/testfile4.txt +../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz +../tef/tstappviewneg.xyz /epoc32/data/z/resource/apps/tstappviewneg.xyz +../tdata/GIF.NNA1 /epoc32/data/z/private/101f289c/gif.nna1 +../tdata/HTML.NNA2 /epoc32/data/z/private/101f289c/html.nna2 +../tdata/CONTACT.NNA3 /epoc32/data/z/private/101f289c/contact.nna3 +../tdata/TXT.NNA4 /epoc32/data/z/private/101f289c/txt.nna4 ../tdata/TSTAPPU.DOC /epoc32/data/z/system/data/tstapp.doc ../tdata/zero_len.txt /epoc32/data/z/system/data/zero_len.txt ../tdata/one_byte.txt /epoc32/data/z/system/data/one_byte.txt @@ -329,33 +417,48 @@ ../tdata/testfile1.txt /epoc32/data/z/system/data/testpath/filtertests/testfile1.txt ../tdata/testfile2.txt /epoc32/data/z/system/data/testpath/filtertests/testfile2.txt ../tdata/testfile3.txt /epoc32/data/z/system/data/testpath/filtertests/testfile3.txt -../tdata/testfile4.txt /epoc32/data/z/system/data/testpath/filtertests/testfile4.txt -../tdata/GIF.NNA1 /epoc32/data/z/private/101f289c/gif.nna1 -../tdata/HTML.NNA2 /epoc32/data/z/private/101f289c/html.nna2 -../tdata/CONTACT.NNA3 /epoc32/data/z/private/101f289c/contact.nna3 -../tdata/TXT.NNA4 /epoc32/data/z/private/101f289c/txt.nna4 ../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/data/z/system/data/filewithunknownmimetype.unrecognisableextention ../tdata/TApsRecogAppTest.mmr /epoc32/data/z/system/data/tapsrecogapptest.mmr -../tdata/TApsRecogUpgradeTest.upg /epoc32/data/z/system/data/tapsrecogupgradetest.upg -../tdata/TApsRecogUpgradeTest.upr /epoc32/data/z/system/data/tapsrecogupgradetest.upr +../tdata/TApsRecogUpgradeTest.upg /epoc32/data/z/system/data/tapsrecogupgradetest.upg +../tdata/TApsRecogUpgradeTest.upr /epoc32/data/z/system/data/tapsrecogupgradetest.upr ../tdata/mimecontentpolicy/sd_goo.dcf /epoc32/data/z/system/data/sd_goo.dcf ../tdata/mimecontentpolicy/fl_goo.dm /epoc32/data/z/system/data/fl_goo.dm -../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/data/z/system/data/jpeg_wes.dm -../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/data/z/system/data/gif_wallpaper.gif +../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/data/z/system/data/jpeg_wes.dm +../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/data/z/system/data/gif_wallpaper.gif ../tdata/mimecontentpolicy/propelli.jpg /epoc32/data/z/system/data/propelli.jpg ../tdata/mimecontentpolicy/type-r.jpg /epoc32/data/z/system/data/type-r.jpg ../tdata/1028583d.txt /epoc32/data/z/private/10202be9/1028583d.txt //test Central Repository initialisation file +../tdata/10003a3f.txt /epoc32/data/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information + // WINSCW UDEB -../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.xyz -../tef/tstappviewneg.mbm /epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.mbm +// exporting db & certstore for winscw +../tdata/scr.db /epoc32/release/winscw/udeb/z/sys/install/scr/provisioned/scr.db + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK ../tef/tstnnapp.mbm /epoc32/release/winscw/udeb/z/resource/apps/tstnnapp.mbm ../tef/App_ctrl.MBM /epoc32/release/winscw/udeb/z/resource/apps/app_ctrl.mbm -../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/resource/apps/zerosizedicon.mbm ../tef/svg_icon.svg /epoc32/release/winscw/udeb/z/resource/apps/svg_icon.svg ../tdata/AAA_reg.Rsc /epoc32/release/winscw/udeb/z/apparctest/aaa_reg.rsc +../tdata/102081cf_reg.rsc /epoc32/release/winscw/udeb/z/system/data/102081cf_reg.rsc +../tdata/102081ce_reg.rsc /epoc32/release/winscw/udeb/z/system/data/102081ce_reg.rsc +../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/winscw/udeb/z/system/data/testupdregappuninstallation_reg.rsc +../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/winscw/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc +../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm +../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz +#endif + +../tdata/scr_test.db /epoc32/release/winscw/udeb/z/apparctest/scr_test.db +../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.xyz +../tef/tstappviewneg.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.mbm +../tef/tstappviewneg.mbm /epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.mbm ../tdata/Corrupted_reg.RSC /epoc32/release/winscw/udeb/z/apparctest/corrupted_reg.rsc + +../tdata/GIF.NNA1 /epoc32/release/winscw/udeb/z/private/101f289c/gif.nna1 +../tdata/HTML.NNA2 /epoc32/release/winscw/udeb/z/private/101f289c/html.nna2 +../tdata/CONTACT.NNA3 /epoc32/release/winscw/udeb/z/private/101f289c/contact.nna3 +../tdata/TXT.NNA4 /epoc32/release/winscw/udeb/z/private/101f289c/txt.nna4 ../tdata/TSTAPPU.DOC /epoc32/release/winscw/udeb/z/system/data/tstapp.doc ../tdata/zero_len.txt /epoc32/release/winscw/udeb/z/system/data/zero_len.txt ../tdata/one_byte.txt /epoc32/release/winscw/udeb/z/system/data/one_byte.txt @@ -366,37 +469,42 @@ ../tdata/testfile2.txt /epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile2.txt ../tdata/testfile3.txt /epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile3.txt ../tdata/testfile4.txt /epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile4.txt -../tdata/GIF.NNA1 /epoc32/release/winscw/udeb/z/private/101f289c/gif.nna1 -../tdata/HTML.NNA2 /epoc32/release/winscw/udeb/z/private/101f289c/html.nna2 -../tdata/CONTACT.NNA3 /epoc32/release/winscw/udeb/z/private/101f289c/contact.nna3 -../tdata/TXT.NNA4 /epoc32/release/winscw/udeb/z/private/101f289c/txt.nna4 ../tdata/UpdatedAppsList.bin /epoc32/release/winscw/udeb/z/system/data/updatedappslist.bin -../tdata/102081cf_reg.rsc /epoc32/release/winscw/udeb/z/system/data/102081cf_reg.rsc -../tdata/102081ce_reg.rsc /epoc32/release/winscw/udeb/z/system/data/102081ce_reg.rsc ../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/release/winscw/udeb/z/system/data/filewithunknownmimetype.unrecognisableextention ../tdata/TApsRecogAppTest.mmr /epoc32/release/winscw/udeb/z/system/data/tapsrecogapptest.mmr -../tdata/recmime_1.rsc /epoc32/release/winscw/udeb/z/system/data/recmime_1.rsc +../tdata/recmime_1.rsc /epoc32/release/winscw/udeb/z/system/data/recmime_1.rsc ../tdata/recmime_winscw.dll /epoc32/release/winscw/udeb/z/system/data/recmime_winscw.dll ../tdata/mimecontentpolicy/sd_goo.dcf /epoc32/release/winscw/udeb/z/system/data/sd_goo.dcf ../tdata/mimecontentpolicy/fl_goo.dm /epoc32/release/winscw/udeb/z/system/data/fl_goo.dm -../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/release/winscw/udeb/z/system/data/jpeg_wes.dm -../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/release/winscw/udeb/z/system/data/gif_wallpaper.gif +../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/release/winscw/udeb/z/system/data/jpeg_wes.dm +../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/release/winscw/udeb/z/system/data/gif_wallpaper.gif ../tdata/mimecontentpolicy/propelli.jpg /epoc32/release/winscw/udeb/z/system/data/propelli.jpg ../tdata/mimecontentpolicy/type-r.jpg /epoc32/release/winscw/udeb/z/system/data/type-r.jpg ../tdata/1028583d.txt /epoc32/release/winscw/udeb/z/private/10202be9/1028583d.txt //test Central Repository initialisation file -../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/winscw/udeb/z/system/data/testupdregappuninstallation_reg.rsc -../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/winscw/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc +../tdata/10003a3f.txt /epoc32/release/winscw/udeb/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information + // WINSCW UREL -../tef/tstappviewneg.xyz /epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.xyz -../tef/tstappviewneg.mbm /epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.mbm -../tef/tstnnapp.mbm /epoc32/release/winscw/urel/z/resource/apps/tstnnapp.mbm + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +../tef/tstnnapp.mbm /epoc32/release/winscw/urel/z/resource/apps/tstnnapp.mbm ../tef/App_ctrl.MBM /epoc32/release/winscw/urel/z/resource/apps/app_ctrl.mbm -../tef/zerosizedicon.mbm /epoc32/release/winscw/urel/z/resource/apps/zerosizedicon.mbm ../tef/svg_icon.svg /epoc32/release/winscw/urel/z/resource/apps/svg_icon.svg ../tdata/AAA_reg.Rsc /epoc32/release/winscw/urel/z/apparctest/aaa_reg.rsc ../tdata/Corrupted_reg.RSC /epoc32/release/winscw/urel/z/apparctest/corrupted_reg.rsc +../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/winscw/urel/z/system/data/testupdregappuninstallation_reg.rsc +../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/winscw/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc +../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm +../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz +#endif + +../tef/tstappviewneg.mbm /epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.mbm +../tef/tstappviewneg.xyz /epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.xyz +../tdata/GIF.NNA1 /epoc32/release/winscw/urel/z/private/101f289c/gif.nna1 +../tdata/HTML.NNA2 /epoc32/release/winscw/urel/z/private/101f289c/html.nna2 +../tdata/CONTACT.NNA3 /epoc32/release/winscw/urel/z/private/101f289c/contact.nna3 +../tdata/TXT.NNA4 /epoc32/release/winscw/urel/z/private/101f289c/txt.nna4 ../tdata/TSTAPPU.DOC /epoc32/release/winscw/urel/z/system/data/tstapp.doc ../tdata/zero_len.txt /epoc32/release/winscw/urel/z/system/data/zero_len.txt ../tdata/one_byte.txt /epoc32/release/winscw/urel/z/system/data/one_byte.txt @@ -407,34 +515,41 @@ ../tdata/testfile2.txt /epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile2.txt ../tdata/testfile3.txt /epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile3.txt ../tdata/testfile4.txt /epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile4.txt -../tdata/GIF.NNA1 /epoc32/release/winscw/urel/z/private/101f289c/gif.nna1 -../tdata/HTML.NNA2 /epoc32/release/winscw/urel/z/private/101f289c/html.nna2 -../tdata/CONTACT.NNA3 /epoc32/release/winscw/urel/z/private/101f289c/contact.nna3 -../tdata/TXT.NNA4 /epoc32/release/winscw/urel/z/private/101f289c/txt.nna4 ../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/release/winscw/urel/z/system/data/filewithunknownmimetype.unrecognisableextention ../tdata/TApsRecogAppTest.mmr /epoc32/release/winscw/urel/z/system/data/tapsrecogapptest.mmr -../tdata/recmime_1.rsc /epoc32/release/winscw/urel/z/system/data/recmime_1.rsc +../tdata/recmime_1.rsc /epoc32/release/winscw/urel/z/system/data/recmime_1.rsc ../tdata/recmime_winscw.dll /epoc32/release/winscw/urel/z/system/data/recmime_winscw.dll -../tdata/mimecontentpolicy/sd_goo.dcf /epoc32/release/winscw/urel/z/system/data/sd_goo.dcf -../tdata/mimecontentpolicy/fl_goo.dm /epoc32/release/winscw/urel/z/system/data/fl_goo.dm -../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/release/winscw/urel/z/system/data/jpeg_wes.dm -../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/release/winscw/urel/z/system/data/gif_wallpaper.gif -../tdata/mimecontentpolicy/propelli.jpg /epoc32/release/winscw/urel/z/system/data/propelli.jpg -../tdata/mimecontentpolicy/type-r.jpg /epoc32/release/winscw/urel/z/system/data/type-r.jpg -../tdata/1028583d.txt /epoc32/release/winscw/urel/z/private/10202be9/1028583d.txt //test Central Repository initialisation file -../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/winscw/urel/z/system/data/testupdregappuninstallation_reg.rsc -../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/winscw/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc +../tdata/mimecontentpolicy/sd_goo.dcf /epoc32/release/winscw/urel/z/system/data/sd_goo.dcf +../tdata/mimecontentpolicy/fl_goo.dm /epoc32/release/winscw/urel/z/system/data/fl_goo.dm +../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/release/winscw/urel/z/system/data/jpeg_wes.dm +../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/release/winscw/urel/z/system/data/gif_wallpaper.gif +../tdata/mimecontentpolicy/propelli.jpg /epoc32/release/winscw/urel/z/system/data/propelli.jpg +../tdata/mimecontentpolicy/type-r.jpg /epoc32/release/winscw/urel/z/system/data/type-r.jpg +../tdata/1028583d.txt /epoc32/release/winscw/urel/z/private/10202be9/1028583d.txt //test Central Repository initialisation file +../tdata/10003a3f.txt /epoc32/release/winscw/urel/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information // ARMV5 UDEB -../tef/tstappviewneg.xyz /epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.xyz -../tef/tstappviewneg.mbm /epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.mbm + +// exporting db & certstore for armv5 +../tdata/scr.db /epoc32/data/z/sys/install/scr/provisioned/scr.db +../tef/testpkg/swicertstore.dat /epoc32/data/z/resource/swicertstore.dat + + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK ../tef/tstnnapp.mbm /epoc32/release/armv5/udeb/z/resource/apps/tstnnapp.mbm -../tef/App_ctrl.MBM /epoc32/release/armv5/udeb/z/resource/apps/app_ctrl.mbm -../tef/zerosizedicon.mbm /epoc32/release/armv5/udeb/z/resource/apps/zerosizedicon.mbm -../tef/svg_icon.svg /epoc32/release/armv5/udeb/z/resource/apps/svg_icon.svg ../tdata/AAA_reg.Rsc /epoc32/release/armv5/udeb/z/apparctest/aaa_reg.rsc ../tdata/Corrupted_reg.RSC /epoc32/release/armv5/udeb/z/apparctest/corrupted_reg.rsc +../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/armv5/udeb/z/system/data/testupdregappuninstallation_reg.rsc +../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/armv5/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc +#endif +../tef/tstappviewneg.mbm /epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.mbm +../tef/tstappviewneg.xyz /epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.xyz + +../tdata/GIF.NNA1 /epoc32/release/armv5/udeb/z/private/101f289c/gif.nna1 +../tdata/HTML.NNA2 /epoc32/release/armv5/udeb/z/private/101f289c/html.nna2 +../tdata/CONTACT.NNA3 /epoc32/release/armv5/udeb/z/private/101f289c/contact.nna3 +../tdata/TXT.NNA4 /epoc32/release/armv5/udeb/z/private/101f289c/txt.nna4 ../tdata/TSTAPPU.DOC /epoc32/release/armv5/udeb/tstapp.doc ../tdata/zero_len.txt /epoc32/release/armv5/udeb/zero_len.txt ../tdata/one_byte.txt /epoc32/release/armv5/udeb/one_byte.txt @@ -445,10 +560,6 @@ ../tdata/testfile2.txt /epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile2.txt ../tdata/testfile3.txt /epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile3.txt ../tdata/testfile4.txt /epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile4.txt -../tdata/GIF.NNA1 /epoc32/release/armv5/udeb/z/private/101f289c/gif.nna1 -../tdata/HTML.NNA2 /epoc32/release/armv5/udeb/z/private/101f289c/html.nna2 -../tdata/CONTACT.NNA3 /epoc32/release/armv5/udeb/z/private/101f289c/contact.nna3 -../tdata/TXT.NNA4 /epoc32/release/armv5/udeb/z/private/101f289c/txt.nna4 ../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/release/armv5/udeb/z/system/data/filewithunknownmimetype.unrecognisableextention ../tdata/TApsRecogAppTest.mmr /epoc32/release/armv5/udeb/z/system/data/tapsrecogapptest.mmr ../tdata/recmime_1.rsc /epoc32/release/armv5/udeb/z/system/data/recmime_1.rsc @@ -466,19 +577,34 @@ ../tdata/recupgrade2.rsc /epoc32/release/armv5/udeb/z/system/data/recupgrade2.rsc ../tdata/recupgrade_armv5_rel.dll /epoc32/release/armv5/udeb/z/system/data/recupgrade_armv5_rel.dll ../tdata/recupgrade2_armv5_rel.dll /epoc32/release/armv5/udeb/z/system/data/recupgrade2_armv5_rel.dll -../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/armv5/udeb/z/system/data/testupdregappuninstallation_reg.rsc -../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/armv5/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc // ARMV5 UREL -../tef/tstappviewneg.xyz /epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.xyz -../tef/tstappviewneg.mbm /epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.mbm + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK ../tef/tstnnapp.mbm /epoc32/release/armv5/urel/z/resource/apps/tstnnapp.mbm ../tef/App_ctrl.MBM /epoc32/release/armv5/urel/z/resource/apps/app_ctrl.mbm -../tef/zerosizedicon.mbm /epoc32/release/armv5/urel/z/resource/apps/zerosizedicon.mbm ../tef/svg_icon.svg /epoc32/release/armv5/urel/z/resource/apps/svg_icon.svg ../tdata/AAA_reg.Rsc /epoc32/release/armv5/urel/z/apparctest/aaa_reg.rsc ../tdata/Corrupted_reg.RSC /epoc32/release/armv5/urel/z/apparctest/corrupted_reg.rsc +../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/armv5/urel/z/system/data/testupdregappuninstallation_reg.rsc +../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/armv5/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc +../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm +../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz +#endif +../tef/tstappviewneg.xyz /epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.xyz +../tef/tstappviewneg.mbm /epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.mbm +../tef/tstappviewneg.mbm /epoc32/data/z/apparctestregfiles/tstappviewneg.mbm +../tef/App_ctrl.MBM /epoc32/data/z/apparctestregfiles/App_ctrl.MBM +../tef/svg_icon.svg /epoc32/data/z/apparctestregfiles/svg_icon.svg +../tef/tstappviewneg.xyz /epoc32/data/z/apparctestregfiles/tstappviewneg.xyz +../tef/tupgradeiconapp/tupgradeiconapp.mbm /epoc32/data/z/apparctestregfiles/tupgradeiconapp.mbm +../tef/zerosizedicon.mbm /epoc32/data/z/apparctestregfiles/zerosizedicon.mbm + +../tdata/GIF.NNA1 /epoc32/release/armv5/urel/z/private/101f289c/gif.nna1 +../tdata/HTML.NNA2 /epoc32/release/armv5/urel/z/private/101f289c/html.nna2 +../tdata/CONTACT.NNA3 /epoc32/release/armv5/urel/z/private/101f289c/contact.nna3 +../tdata/TXT.NNA4 /epoc32/release/armv5/urel/z/private/101f289c/txt.nna4 ../tdata/TSTAPPU.DOC /epoc32/release/armv5/urel/tstapp.doc ../tdata/zero_len.txt /epoc32/release/armv5/urel/zero_len.txt ../tdata/one_byte.txt /epoc32/release/armv5/urel/one_byte.txt @@ -489,10 +615,6 @@ ../tdata/testfile2.txt /epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile2.txt ../tdata/testfile3.txt /epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile3.txt ../tdata/testfile4.txt /epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile4.txt -../tdata/GIF.NNA1 /epoc32/release/armv5/urel/z/private/101f289c/gif.nna1 -../tdata/HTML.NNA2 /epoc32/release/armv5/urel/z/private/101f289c/html.nna2 -../tdata/CONTACT.NNA3 /epoc32/release/armv5/urel/z/private/101f289c/contact.nna3 -../tdata/TXT.NNA4 /epoc32/release/armv5/urel/z/private/101f289c/txt.nna4 ../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/release/armv5/urel/z/system/data/filewithunknownmimetype.unrecognisableextention ../tdata/TApsRecogAppTest.mmr /epoc32/release/armv5/urel/z/system/data/tapsrecogapptest.mmr ../tdata/recmime_1.rsc /epoc32/release/armv5/urel/z/system/data/recmime_1.rsc @@ -510,6 +632,4 @@ ../tdata/recupgrade2.rsc /epoc32/release/armv5/urel/z/system/data/recupgrade2.rsc ../tdata/recupgrade_armv5_rel.dll /epoc32/release/armv5/urel/z/system/data/recupgrade_armv5_rel.dll ../tdata/recupgrade2_armv5_rel.dll /epoc32/release/armv5/urel/z/system/data/recupgrade2_armv5_rel.dll -../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/armv5/urel/z/system/data/testupdregappuninstallation_reg.rsc -../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/armv5/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/app-framework_apparc.mrp diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/apparc.iby --- a/appfw/apparchitecture/group/apparc.iby Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/group/apparc.iby Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -17,6 +17,37 @@ #ifndef __APPARC_IBY__ #define __APPARC_IBY__ +#ifdef __TEXTSHELL_OBY__ + +#include +#include +#include +file=ABI_DIR\BUILD_DIR\sisregistryclient.dll sys\bin\sisregistryclient.dll +file=ABI_DIR\BUILD_DIR\sisregistryserver.exe sys\bin\sisregistryserver.exe +file=ABI_DIR\BUILD_DIR\plan.dll sys\bin\plan.dll +file=ABI_DIR\BUILD_DIR\siscontroller.dll sys\bin\siscontroller.dll +file=ABI_DIR\BUILD_DIR\apprscparser.dll sys\bin\apprscparser.dll +file=ABI_DIR\BUILD_DIR\swtypereginfo.dll sys\bin\swtypereginfo.dll +file=ABI_DIR\BUILD_DIR\swidataprovider.dll sys\bin\swidataprovider.dll +file=ABI_DIR\BUILD_DIR\securitymanager.dll sys\bin\securitymanager.dll +file=ABI_DIR\BUILD_DIR\sislauncherclient.dll sys\bin\sislauncherclient.dll +file=ABI_DIR\BUILD_DIR\sislauncherserver.exe sys\bin\sislauncherserver.exe +file=ABI_DIR\BUILD_DIR\swiobserverclient.dll sys\bin\swiobserverclient.dll +file=ABI_DIR\BUILD_DIR\uissclient.dll sys\bin\uissclient.dll +#include +#include +#include +#include +file=ABI_DIR\BUILD_DIR\devinfosupportclient.dll sys\bin\devinfosupportclient.dll +file=ABI_DIR\BUILD_DIR\devinfosupportcommon.dll sys\bin\devinfosupportcommon.dll +file=ABI_DIR\BUILD_DIR\ocspsupportclient.dll sys\bin\ocspsupportclient.dll +file=ABI_DIR\BUILD_DIR\ocspsupport.exe sys\bin\ocspsupport.exe +file=ABI_DIR\BUILD_DIR\swiobserver.exe sys\bin\swiobserver.exe +file=ABI_DIR\BUILD_DIR\Http.dll System\Libs\Http.dll +file=ABI_DIR\BUILD_DIR\httputils.dll System\Libs\httputils.dll + +#endif + REM Application Architecture file=ABI_DIR\BUILD_DIR\apparc.dll System\Libs\apparc.dll @@ -27,8 +58,6 @@ file=ABI_DIR\BUILD_DIR\apsexe.exe System\Programs\apsexe.exe file=ABI_DIR\BUILD_DIR\ServiceRegistry.dll System\Libs\ServiceRegistry.dll -data=MULTI_LINGUIFY(RSC ZRESOURCE\APPS\ApfMimeContentPolicy Resource\Apps\ApfMimeContentPolicy) - #ifndef SYMBIAN_SYSTEM_STATE_MANAGEMENT file=ABI_DIR\BUILD_DIR\apstart.dll System\Libs\apstart.dll diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/apparctest_new.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/group/apparctest_new.iby Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,313 @@ +/* +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#ifndef __APPARCTEST_IBY__ +#define __APPARCTEST_IBY__ + +REM Application Architecture Framework unit test iby file + + +#ifndef __APPFWK_TEST_FRAMEWORK_IBY__ + #include +#endif + + +file=ABI_DIR\BUILD_DIR\texe.exe sys\bin\texe.exe + +file=ABI_DIR\BUILD_DIR\TCmdLineExe.exe sys\bin\TCmdLineExe.exe + +file=ABI_DIR\BUILD_DIR\tstapp.exe sys\bin\tstapp.exe +data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\tstapp_reg.rsc private\10003a3f\import\apps\tstapp_reg.rsc +file=ABI_DIR\BUILD_DIR\tnonnativeruntime.exe sys\bin\tnonnativeruntime.exe +data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\tnonnativeruntime_reg.rsc private\10003a3f\import\apps\tnonnativeruntime_reg.rsc +data=ZRESOURCE\apps\tstapp.rsc Resource\apps\tstapp.rsc +data=ZRESOURCE\apps\tstapp_loc.r01 Resource\apps\tstapp_loc.r01 +data=ZRESOURCE\apps\tstapp_loc.r02 Resource\apps\tstapp_loc.r02 +data=ZRESOURCE\apps\tstapp_loc.r03 Resource\apps\tstapp_loc.r03 +data=ZRESOURCE\apps\tstapp_loc.r04 Resource\apps\tstapp_loc.r04 +data=ZRESOURCE\apps\tstapp_loc.r05 Resource\apps\tstapp_loc.r05 +data=ZRESOURCE\apps\tstapp_loc.rsc Resource\apps\tstapp_loc.rsc +data=ZRESOURCE\apps\tstapp.mbm Resource\apps\tstapp.mbm +data=ZRESOURCE\apps\tstapp02.m02 Resource\apps\tstapp02.m02 +data=ZRESOURCE\apps\tstappview01.m01 Resource\apps\tstappview01.m01 +data=ZRESOURCE\apps\tstappview02.k Resource\apps\tstappview02.k +data=ZRESOURCE\apps\tstappview01.m02 Resource\apps\tstappview01.m02 +data=ZRESOURCE\apps\tstappview Resource\apps\tstappview +data=ZRESOURCE\apps\tstappviewneg.xyz Resource\apps\tstappviewneg.xyz +data=ZRESOURCE\apps\tstappviewneg.mbm Resource\apps\tstappviewneg.mbm + + +file=ABI_DIR\BUILD_DIR\m_ctrl.exe sys\bin\m_ctrl.exe +data=ZRESOURCE\apps\m_ctrl.rsc Resource\Apps\m_ctrl.rsc +data=ZRESOURCE\apps\m_ctrl_loc.rsc Resource\Apps\m_ctrl_loc.rsc +data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\m_ctrl_reg.rsc private\10003a3f\import\apps\m_ctrl_reg.rsc + +data=EPOCROOT##epoc32\data\Z\resource\swicertstore.dat resource\swicertstore.dat +data=EPOCROOT##epoc32\data\z\apparctest\scr_test.db apparctest\scr_test.db + + +ECOM_PLUGIN(refnativeplugin.dll,10285BC3.rsc) +ECOM_PLUGIN(tstapp_embedded.dll,10004c66.rsc) + +data=ZSYSTEM\install\TSTAPP_standalone_Stub.sis system\install\TSTAPP_standalone_Stub.sis +data=ZSYSTEM\install\app_CTRL2_stub.sis system\install\app_CTRL2_stub.sis +data=ZSYSTEM\install\m_ctrl_v2_Stub.sis system\install\m_ctrl_v2_Stub.sis + +data=ZSYSTEM\apparctestsisfiles\app_CTRL2.sis apparctest\apparctestsisfiles\app_CTRL2.sis +data=ZSYSTEM\apparctestsisfiles\EndTaskTestApp.sis apparctest\apparctestsisfiles\EndTaskTestApp.sis +data=ZSYSTEM\apparctestsisfiles\SimpleApparcTestApp.sis apparctest\apparctestsisfiles\SimpleApparcTestApp.sis +data=ZSYSTEM\apparctestsisfiles\T_EnvSlots.sis apparctest\apparctestsisfiles\T_EnvSlots.sis +data=ZSYSTEM\apparctestsisfiles\t_groupname.sis apparctest\apparctestsisfiles\t_groupname.sis +data=ZSYSTEM\apparctestsisfiles\t_winchainChild.sis apparctest\apparctestsisfiles\t_winchainChild.sis +data=ZSYSTEM\apparctestsisfiles\t_winchainLaunch.sis apparctest\apparctestsisfiles\t_winchainLaunch.sis +data=ZSYSTEM\apparctestsisfiles\TApparcTestApp.sis apparctest\apparctestsisfiles\TApparcTestApp.sis +data=ZSYSTEM\apparctestsisfiles\TestTrustedPriorityApp2.sis apparctest\apparctestsisfiles\TestTrustedPriorityApp2.sis +data=ZSYSTEM\apparctestsisfiles\TestUnTrustedPriorityApp2.sis apparctest\apparctestsisfiles\TestUnTrustedPriorityApp2.sis +data=ZSYSTEM\apparctestsisfiles\TSTAPP_standalone.sis apparctest\apparctestsisfiles\TSTAPP_standalone.sis +data=ZSYSTEM\apparctestsisfiles\TStartDocApp_v2.sis apparctest\apparctestsisfiles\TStartDocApp_v2.sis +data=ZSYSTEM\apparctestsisfiles\UnProctectedUidApp.sis apparctest\apparctestsisfiles\UnProctectedUidApp.sis +data=ZSYSTEM\apparctestsisfiles\tnotifydrivesapp.sis apparctest\apparctestsisfiles\tnotifydrivesapp.sis +data=ZSYSTEM\apparctestsisfiles\T_groupname_ver1.sis apparctest\apparctestsisfiles\T_groupname_ver1.sis +data=ZSYSTEM\apparctestsisfiles\T_groupname_ver2.sis apparctest\apparctestsisfiles\T_groupname_ver2.sis +data=ZSYSTEM\apparctestsisfiles\tlargestackapp.sis apparctest\apparctestsisfiles\tlargestackapp.sis +data=ZSYSTEM\apparctestsisfiles\TAppEmbeddable_embedded.sis apparctest\apparctestsisfiles\TAppEmbeddable_embedded.sis +data=ZSYSTEM\apparctestsisfiles\TAppEmbeddable_standalone.sis apparctest\apparctestsisfiles\TAppEmbeddable_standalone.sis +data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableOnly_v2.sis apparctest\apparctestsisfiles\TAppEmbeddableOnly_v2.sis +data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiNotStandAlone_v2.sis apparctest\apparctestsisfiles\TAppEmbeddableUiNotStandAlone_v2.sis +data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiOrStandAlone_embedded.sis apparctest\apparctestsisfiles\TAppEmbeddableUiOrStandAlone_embedded.sis +data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiOrStandalone_standalone.sis apparctest\apparctestsisfiles\TAppEmbeddableUiOrStandalone_standalone.sis +data=ZSYSTEM\apparctestsisfiles\TAppNotEmbeddable_v2.sis apparctest\apparctestsisfiles\TAppNotEmbeddable_v2.sis +data=ZSYSTEM\apparctestsisfiles\TNNApp1.sis apparctest\apparctestsisfiles\TNNApp1.sis +data=ZSYSTEM\apparctestsisfiles\serverapp2.sis apparctest\apparctestsisfiles\serverapp2.sis +data=ZSYSTEM\apparctestsisfiles\serverapp4.sis apparctest\apparctestsisfiles\serverapp4.sis +data=ZSYSTEM\apparctestsisfiles\serverapp6.sis apparctest\apparctestsisfiles\serverapp6.sis +data=ZSYSTEM\apparctestsisfiles\serverapp7.sis apparctest\apparctestsisfiles\serverapp7.sis +data=ZSYSTEM\apparctestsisfiles\TRApaLsSessionStartAppTestApp_v2.sis apparctest\apparctestsisfiles\TRApaLsSessionStartAppTestApp_v2.sis +data=ZSYSTEM\apparctestsisfiles\TestMultipleApps.sis apparctest\apparctestsisfiles\TestMultipleApps.sis +//data=ZSYSTEM\apparctestsisfiles\TInvalidApp.sis apparctest\apparctestsisfiles\TInvalidApp.sis +data=ZSYSTEM\apparctestsisfiles\m_ctrl_v2.sis apparctest\apparctestsisfiles\m_ctrl_v2.sis +data=ZSYSTEM\apparctestsisfiles\openservice1app.sis apparctest\apparctestsisfiles\openservice1app.sis +data=ZSYSTEM\apparctestsisfiles\openservice2app.sis apparctest\apparctestsisfiles\openservice2app.sis +data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem1.sis apparctest\apparctestsisfiles\T_DataPrioritySystem1.sis +data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem2.sis apparctest\apparctestsisfiles\T_DataPrioritySystem2.sis +data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem3.sis apparctest\apparctestsisfiles\T_DataPrioritySystem3.sis +data=ZSYSTEM\apparctestsisfiles\TCtrlPnlApp.sis apparctest\apparctestsisfiles\TCtrlPnlApp.sis +data=ZSYSTEM\apparctestsisfiles\TestTrustedPriorityApp1.sis apparctest\apparctestsisfiles\TestTrustedPriorityApp1.sis +data=ZSYSTEM\apparctestsisfiles\TestUnTrustedPriorityApp1.sis apparctest\apparctestsisfiles\TestUnTrustedPriorityApp1.sis +data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp1.sis apparctest\apparctestsisfiles\tRuleBasedApp1.sis +data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp2.sis apparctest\apparctestsisfiles\tRuleBasedApp2.sis +data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp3.sis apparctest\apparctestsisfiles\tRuleBasedApp3.sis +data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp4.sis apparctest\apparctestsisfiles\tRuleBasedApp4.sis +data=ZSYSTEM\apparctestsisfiles\zerosizedicontestapp.sis apparctest\apparctestsisfiles\zerosizedicontestapp.sis +data=ZSYSTEM\apparctestsisfiles\ForceRegApp1.sis apparctest\apparctestsisfiles\ForceRegApp1.sis +data=ZSYSTEM\apparctestsisfiles\ForceRegApp2.sis apparctest\apparctestsisfiles\ForceRegApp2.sis +data=ZSYSTEM\apparctestsisfiles\ForceRegMultipleApps.sis apparctest\apparctestsisfiles\ForceRegMultipleApps.sis +data=ZSYSTEM\apparctestsisfiles\CustomiseDefaultIconApp.sis apparctest\apparctestsisfiles\CustomiseDefaultIconApp.sis +data=ZSYSTEM\apparctestsisfiles\TestMultipleAppsDowngrade.sis apparctest\apparctestsisfiles\TestMultipleAppsDowngrade.sis +data=ZSYSTEM\apparctestsisfiles\ticoncaptionoverride.sis apparctest\apparctestsisfiles\ticoncaptionoverride.sis + +file=ABI_DIR\BUILD_DIR\ParentProcess.exe Sys\bin\ParentProcess.exe +file=ABI_DIR\BUILD_DIR\ChildI.exe Sys\bin\ChildI.exe +file=ABI_DIR\BUILD_DIR\ChildII.exe Sys\bin\ChildII.exe +file=ABI_DIR\BUILD_DIR\ChildIII.exe Sys\bin\ChildIII.exe +data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ParentProcess_reg.Rsc private\10003a3f\apps\ParentProcess_reg.RSC +data=EPOCROOTepoc32\data\z\Resource\apps\ParentProcess.Rsc Resource\apps\ParentProcess.Rsc +data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildI_reg.RSC private\10003a3f\apps\ChildI_reg.RSC +data=EPOCROOTepoc32\data\z\Resource\apps\ChildI.Rsc Resource\apps\ChildI.Rsc +data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildII_reg.RSC private\10003a3f\apps\ChildII_reg.RSC +data=EPOCROOTepoc32\data\z\Resource\apps\ChildII.Rsc Resource\apps\ChildII.Rsc +data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildIII_reg.RSC private\10003a3f\apps\ChildIII_reg.RSC +data=EPOCROOTepoc32\data\z\Resource\apps\ChildIII.Rsc Resource\apps\ChildIII.Rsc + +data=ABI_DIR\BUILD_DIR\tstapp.doc System\data\tstapp.doc +data=ABI_DIR\BUILD_DIR\zero_len.txt System\data\zero_len.txt +data=ABI_DIR\BUILD_DIR\one_byte.txt System\data\one_byte.txt + + +#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL +REM Copy new locale language dlls to ROM SFTB10.1 onwards +file=ABI_DIR\BUILD_DIR\elocl_lan.002 Sys\bin\elocl_lan.002 +file=ABI_DIR\BUILD_DIR\elocl_lan.004 Sys\bin\elocl_lan.004 +file=ABI_DIR\BUILD_DIR\elocl_lan.005 Sys\bin\elocl_lan.005 +file=ABI_DIR\BUILD_DIR\elocl_lan.032 Sys\bin\elocl_lan.032 +#else +// These are pre SYMBIAN_DISTINCT_LOCALE_MODEL language locale dlls.Not to be use SFTB10.1 onwards. +file=ABI_DIR\BUILD_DIR\ELOCL.01 Sys\bin\ELOCL.01 +file=ABI_DIR\BUILD_DIR\ELOCL.02 Sys\bin\ELOCL.02 +file=ABI_DIR\BUILD_DIR\ELOCL.03 Sys\bin\ELOCL.03 +file=ABI_DIR\BUILD_DIR\ELOCL.04 Sys\bin\ELOCL.04 +file=ABI_DIR\BUILD_DIR\ELOCL.05 Sys\bin\ELOCL.05 +file=ABI_DIR\BUILD_DIR\ELOCL.10 Sys\bin\ELOCL.10 +file=ABI_DIR\BUILD_DIR\ELOCL.32 Sys\bin\ELOCL.32 +#endif +// This is now included in techview, from initlocale.iby +//file=ABI_DIR\BUILD_DIR\ELOCL.LOC Sys\bin\ELOCL.LOC + + +data=EPOCROOT##epoc32\data\Z\Apparctest\Corrupted_reg.rsc ApparcTest\Corrupted_reg.rsc +data=EPOCROOT##epoc32\data\z\system\data\Testpath\file1.txt System\data\Testpath\file1.txt +data=EPOCROOT##epoc32\data\z\system\data\Testpath\file2.txt System\data\Testpath\file2.txt +data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile1.txt System\data\Testpath\FilterTests\testfile1.txt +data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile2.txt System\data\Testpath\FilterTests\testfile2.txt +data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile3.txt System\data\Testpath\FilterTests\testfile3.txt +data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile4.txt System\data\Testpath\FilterTests\testfile4.txt +data=EPOCROOT##epoc32\data\z\system\data\FileWithUnknownMimeType.UnrecognisableExtention System\data\FileWithUnknownMimeType.UnrecognisableExtention +data=ABI_DIR\BUILD_DIR\z\system\data\recmime_1.rsc System\data\recmime_1.rsc +data=ABI_DIR\BUILD_DIR\z\system\data\recmime_armv5.dll System\data\recmime_armv5.dll +data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogAppTest.mmr System\data\TApsRecogAppTest.mmr +data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade.rsc System\data\recupgrade.rsc +data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade2.rsc System\data\recupgrade2.rsc +data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade_armv5_rel.dll System\data\recupgrade_armv5_rel.dll +data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade2_armv5_rel.dll System\data\recupgrade2_armv5_rel.dll +data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogUpgradeTest.upg System\data\TApsRecogUpgradeTest.upg +data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogUpgradeTest.upr System\data\TApsRecogUpgradeTest.upr + + +data=EPOCROOT##epoc32\data\Z\Apparctest\testforceregistrationapp1_reg.rsc ApparcTest\testforceregistrationapp1_reg.rsc +data=EPOCROOT##epoc32\data\Z\Apparctest\testforceregistrationapp1_loc.rsc ApparcTest\testforceregistrationapp1_loc.rsc + +data=EPOCROOTepoc32\data\Z\resource\apps\default_app_icon.m02 resource\apps\default_app_icon.m02 + +data=EPOCROOTepoc32\data\Z\private\10202be9\1028583d.txt private\10202be9\1028583d.txt +data=EPOCROOTepoc32\data\Z\private\10202be9\10003a3f.txt private\10202be9\10003a3f.txt + + +// Change for Control panel Start +file=ABI_DIR\BUILD_DIR\app_ctrl.exe Sys\bin\app_ctrl.exe +file=ABI_DIR\BUILD_DIR\app_ctrl2.exe Sys\bin\app_ctrl2.exe +data=EPOCROOTepoc32\data\z\private\10003a3f\import\apps\App_CTRL2_reg.Rsc private\10003a3f\import\apps\App_CTRL2_reg.Rsc +data=EPOCROOTepoc32\data\z\Resource\apps\App_CTRL2.Rsc Resource\apps\App_CTRL2.Rsc +// Change for Control panel End + +ECOM_PLUGIN(tforceregapprec.dll, A0001010.rsc) + +ECOM_PLUGIN(TLongUrlRecognizer.DLL,10004c4e.rsc) +ECOM_PLUGIN(TBufferOnlyRec.DLL, 10207f88.rsc) + +data=ABI_DIR\BUILD_DIR\z\system\data\TRApaLsSessionStartAppTest.tst System\data\TRApaLsSessionStartAppTest.tst +ECOM_PLUGIN(TRApaLsSessionStartAppTestRecognizer.DLL,10000182.rsc) + +ECOM_PLUGIN(TAppLaunchChecker.DLL,1020d465.rsc) +ECOM_PLUGIN(TAppLaunchChecker2.DLL,102722ba.rsc) +ECOM_PLUGIN(TNonNativeAppLaunchChecker.DLL,A0000B70.rsc) + +ECOM_PLUGIN(testrec.dll,102032A5.rsc) + +file=ABI_DIR\BUILD_DIR\tssaac.exe sys\bin\tssaac.exe +file=ABI_DIR\BUILD_DIR\tssaac_tapp.exe sys\bin\tssaac_tapp.exe +data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\tssaac_tapp_reg.rsc private\10003a3f\apps\tssaac_tapp_reg.rsc +data=ZRESOURCE\apps\tssaac_tapp.rsc resource\apps\tssaac_tapp.rsc +data=ZRESOURCE\apps\tssaac_tapp_loc.rsc resource\apps\tssaac_tapp_loc.rsc + +ECOM_PLUGIN(TNonNativeRec.DLL, 10207f95.rsc) +data=EPOCROOTepoc32\data\Z\private\101F289C\gif.nna1 private\101F289C\gif.nna1 +data=EPOCROOTepoc32\data\Z\private\101F289C\html.nna2 private\101F289C\html.nna2 +data=EPOCROOTepoc32\data\Z\private\101F289C\contact.nna3 private\101F289C\contact.nna3 +data=EPOCROOTepoc32\data\Z\private\101F289C\txt.nna4 private\101F289C\txt.nna4 + +data=EPOCROOT##epoc32\data\z\system\data\fl_goo.dm System\data\fl_goo.dm +data=EPOCROOT##epoc32\data\z\system\data\jpeg_wes.dm System\data\jpeg_wes.dm +data=EPOCROOT##epoc32\data\z\system\data\gif_wallpaper.gif System\data\gif_wallpaper.gif +data=EPOCROOT##epoc32\data\z\system\data\propelli.jpg System\data\propelli.jpg +data=EPOCROOT##epoc32\data\z\system\data\type-r.jpg System\data\type-r.jpg +data=EPOCROOT##epoc32\data\z\system\data\sd_goo.dcf System\data\sd_goo.dcf + +ECOM_PLUGIN(recmime.DLL, 102822B7.rsc) +data=EPOCROOTepoc32\data\z\Resource\Plugins\recmime.RSC apparctest\dummy.rsc + +ECOM_PLUGIN(recupgrade.DLL, recupgrade.rsc) + +data=ABI_DIR\DEBUG_DIR\ApparcTestServer.exe sys\bin\ApparcTestServer.exe +data=ABI_DIR\DEBUG_DIR\TIconLoaderAndIconArrayForLeaks.dll sys\bin\TIconLoaderAndIconArrayForLeaks.dll + +data=DATAZ_\apparctest\apparctest_run.bat \apparctest_run.bat + +data=DATAZ_\apparctest\apparctest_t_ApsScan.script \apparctest\apparctest_t_ApsScan.script +data=DATAZ_\apparctest\apparctest_t_AppList.script \apparctest\apparctest_t_AppList.script +data=DATAZ_\apparctest\apparctest_t_AppListFileUpdate.script \apparctest\apparctest_t_AppListFileUpdate.script +data=DATAZ_\apparctest\apparctest_t_AutoMMCReaderOpen.script \apparctest\apparctest_t_AutoMMCReaderOpen.script +data=DATAZ_\apparctest\apparctest_t_Backup.script \apparctest\apparctest_t_Backup.script +data=DATAZ_\apparctest\apparctest_t_Capability1.script \apparctest\apparctest_t_Capability1.script +data=DATAZ_\apparctest\apparctest_t_Capability2.script \apparctest\apparctest_t_Capability2.script +data=DATAZ_\apparctest\apparctest_t_DataTypeMappingWithSid.script \apparctest\apparctest_t_DataTypeMappingWithSid.script +data=DATAZ_\apparctest\apparctest_t_Caption.script \apparctest\apparctest_t_Caption.script +data=DATAZ_\apparctest\apparctest_t_Cmdln.script \apparctest\apparctest_t_Cmdln.script +data=DATAZ_\apparctest\apparctest_t_ControlPanelTest.script \apparctest\apparctest_t_ControlPanelTest.script +data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceA.script \apparctest\apparctest_T_DataMappingPersistenceA.script +data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceB.script \apparctest\apparctest_T_DataMappingPersistenceB.script +data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceC.script \apparctest\apparctest_T_DataMappingPersistenceC.script +data=DATAZ_\apparctest\apparctest_t_EndTask.script \apparctest\apparctest_t_EndTask.script +data=DATAZ_\apparctest\apparctest_t_Exe.script \apparctest\apparctest_t_Exe.script +data=DATAZ_\apparctest\apparctest_t_File2.script \apparctest\apparctest_t_File2.script +data=DATAZ_\apparctest\apparctest_t_File3.script \apparctest\apparctest_t_File3.script +data=DATAZ_\apparctest\apparctest_t_Foreground.script \apparctest\apparctest_t_Foreground.script +data=DATAZ_\apparctest\apparctest_t_GroupName.script \apparctest\apparctest_t_GroupName.script +data=DATAZ_\apparctest\apparctest_t_GroupName_ver1.script \apparctest\apparctest_t_GroupName_ver1.script +data=DATAZ_\apparctest\apparctest_t_GroupName_ver2.script \apparctest\apparctest_t_GroupName_ver2.script +data=DATAZ_\apparctest\apparctest_t_Locale.script \apparctest\apparctest_t_Locale.script +data=DATAZ_\apparctest\apparctest_t_Mdr.script \apparctest\apparctest_t_Mdr.script +data=DATAZ_\apparctest\apparctest_t_mimecontentpolicy.script \apparctest\apparctest_t_mimecontentpolicy.script +data=DATAZ_\apparctest\apparctest_t_Mru.script \apparctest\apparctest_t_Mru.script +data=DATAZ_\apparctest\apparctest_t_NonNativeApps.script \apparctest\apparctest_t_NonNativeApps.script +data=DATAZ_\apparctest\apparctest_t_Notif.script \apparctest\apparctest_t_Notif.script +data=DATAZ_\apparctest\apparctest_t_OOM.script \apparctest\apparctest_t_OOM.script +data=DATAZ_\apparctest\apparctest_t_Pro.script \apparctest\apparctest_t_Pro.script +data=DATAZ_\apparctest\apparctest_t_Proc.script \apparctest\apparctest_t_Proc.script +data=DATAZ_\apparctest\apparctest_t_RApaLsSession.script \apparctest\apparctest_t_RApaLsSession.script +data=DATAZ_\apparctest\apparctest_t_RuleBasedLaunching.script \apparctest\apparctest_t_RuleBasedLaunching.script +data=DATAZ_\apparctest\apparctest_t_Serv2.script \apparctest\apparctest_t_Serv2.script +data=DATAZ_\apparctest\apparctest_t_Serv3.script \apparctest\apparctest_t_Serv3.script +data=DATAZ_\apparctest\apparctest_t_ServiceRegistry.script \apparctest\apparctest_t_ServiceRegistry.script +data=DATAZ_\apparctest\apparctest_t_Services.script \apparctest\apparctest_t_Services.script +data=DATAZ_\apparctest\apparctest_t_StartApp.script \apparctest\apparctest_t_StartApp.script +data=DATAZ_\apparctest\apparctest_t_StartDoc.script \apparctest\apparctest_t_StartDoc.script +data=DATAZ_\apparctest\apparctest_t_WindowChaining.script \apparctest\apparctest_t_WindowChaining.script +data=DATAZ_\apparctest\apparctest_t_Wgnam.script \apparctest\apparctest_t_Wgnam.script +data=DATAZ_\apparctest\apparctest_t_IntegritySupport.script \apparctest\apparctest_t_IntegritySupport.script +data=DATAZ_\apparctest\apparctest_t_IntegritySupportReboot1.script \apparctest\apparctest_t_IntegritySupportReboot1.script +data=DATAZ_\apparctest\apparctest_t_IntegritySupportReboot2.script \apparctest\apparctest_t_IntegritySupportReboot2.script +data=DATAZ_\apparctest\apparctest_t_largestack.script \apparctest\apparctest_t_largestack.script +data=DATAZ_\apparctest\apparctest_t_drivenotification.script \apparctest\apparctest_t_drivenotification.script +data=DATAZ_\apparctest\apparctest_t_servicebase.script \apparctest\apparctest_t_servicebase.script +data=DATAZ_\apparctest\apparctest_t_RecUpgrade.script \apparctest\apparctest_t_RecUpgrade.script +data=DATAZ_\apparctest\apparctest_t_UpdateAppList.script \apparctest\apparctest_t_UpdateAppList.script + +data=DATAZ_\apparctest\apparctest_t_forcereg.script \apparctest\apparctest_t_forcereg.script +data=DATAZ_\apparctest\apparctest_t_clientnotif.script \apparctest\apparctest_t_clientnotif.script +data=DATAZ_\apparctest\apparctest_t_nonnativetest.script \apparctest\apparctest_t_nonnativetest.script + +REM SysStart Apparc Scripts +data=DATAZ_\apparctest\apparctest_T_TestStartApp1L.script \apparctest\apparctest_T_TestStartApp1L.script +data=DATAZ_\apparctest\apparctest_T_TestStartApp2L.script \apparctest\apparctest_T_TestStartApp2L.script +data=DATAZ_\apparctest\apparctest_T_TestStartApp3L.script \apparctest\apparctest_T_TestStartApp3L.script +data=DATAZ_\apparctest\apparctest_T_TestStartApp4L.script \apparctest\apparctest_T_TestStartApp4L.script +data=DATAZ_\apparctest\apparctest_T_TestStartApp5L.script \apparctest\apparctest_T_TestStartApp5L.script +data=DATAZ_\apparctest\apparctest_T_TestStartApp6L.script \apparctest\apparctest_T_TestStartApp6L.script +data=DATAZ_\apparctest\apparctest_T_TestGetAllApps.script \apparctest\apparctest_T_TestGetAllApps.script +data=DATAZ_\apparctest\apparctest_T_TestInsertDataTypeL.script \apparctest\apparctest_T_TestInsertDataTypeL.script +data=DATAZ_\apparctest\apparctest_T_TestAppForDataTypeL.script \apparctest\apparctest_T_TestAppForDataTypeL.script +data=DATAZ_\apparctest\apparctest_T_TestDeleteDataTypeL.script \apparctest\apparctest_T_TestDeleteDataTypeL.script +data=DATAZ_\apparctest\apparctest_T_TestServiceDiscovery.script \apparctest\apparctest_T_TestServiceDiscovery.script +data=DATAZ_\apparctest\apparctest_T_TestGetAppInfo.script \apparctest\apparctest_T_TestGetAppInfo.script +data=DATAZ_\apparctest\apparctest_T_TestAppCount.script \apparctest\apparctest_T_TestAppCount.script +data=DATAZ_\apparctest\apparctest_T_TestCreateDoc.script \apparctest\apparctest_T_TestCreateDoc.script +data=DATAZ_\apparctest\apparctest_T_TestLocalisedCaptionL.script \apparctest\apparctest_T_TestLocalisedCaptionL.script + +REM End of Application Architecture Framework unit test iby file + +patchdata apgrfx.dll @ KMinApplicationStackSize 0xf000 +patchdata apserv.dll @ KApaDrivesToMonitor 4 +#endif diff -r a4d95d2c2540 -r 2fee514510e5 appfw/apparchitecture/group/backup_registration.xml --- a/appfw/apparchitecture/group/backup_registration.xml Mon Feb 08 13:38:38 2010 +0000 +++ b/appfw/apparchitecture/group/backup_registration.xml Thu Jun 24 13:52:58 2010 +0100 @@ -1,10 +1,10 @@ diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/group/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp --- a/coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include // RemCon has defined capabilities #include -TARGET AdvancedTspController.dll +TARGET advancedtspcontroller.dll TARGETTYPE PLUGIN UID 0x10009d8d 0x10282CD5 @@ -32,7 +32,7 @@ SOURCE remconeventtable.cpp START RESOURCE ../data/10282CD5.rss -target AdvancedTspController.rsc +target advancedtspcontroller.rsc END USERINCLUDE ../inc @@ -46,8 +46,8 @@ LIBRARY apparc.lib LIBRARY remcontargetselectorplugin.lib LIBRARY remcontypes.lib -LIBRARY CFClient.lib -LIBRARY CFServices.lib +LIBRARY cfclient.lib +LIBRARY cfservices.lib LIBRARY ws32.lib LIBRARY apgrfx.lib LIBRARY tspclientmapper.lib diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/group/bld.inf --- a/coreapplicationuis/advancedtspcontroller/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/advancedtspcontroller/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -10,6 +10,7 @@ * Nokia Corporation - initial contribution. * * Contributors: +* * * Description: Bld.inf file for Symbian's Remote Control framework related * plug-ins that are used to deliver messages (e.g. accessory key @@ -17,6 +18,9 @@ * */ +/* +*NTT DOCOMO, INC - BUG 2365 +*/ #include @@ -26,15 +30,19 @@ PRJ_EXPORTS #ifdef RD_TSP_CLIENT_MAPPER +/* +Copy keyevent.rul, keyincall.rul, keyinfmtx.rul to +1. /epoc32/data/z/private/10282BC4/rules/ +2. /epoc32/release/winscw/udeb/z/private/10282BC4/rules/ +3. /epoc32/release/winscw/urel/z/private/10282BC4/rules/ +*/ // Rules for media key handling -../data/keyevent.rul /epoc32/data/Z/private/10282bc4/rules/keyevent.rul -../data/keyevent.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyevent.rul +../data/keyevent.rul Z:/private/10282bc4/rules/keyevent.rul // Call handling rules -../data/keyincall.rul /epoc32/data/Z/private/10282bc4/rules/keyincall.rul -../data/keyincall.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyincall.rul +../data/keyincall.rul Z:/private/10282bc4/rules/keyincall.rul // FM transmitter handling rules -../data/keyinfmtx.rul /epoc32/data/Z/private/10282bc4/rules/keyinfmtx.rul -../data/keyinfmtx.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyinfmtx.rul +../data/keyinfmtx.rul Z:/private/10282bc4/rules/keyinfmtx.rul + ../rom/advancedtspcontroller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(advancedtspcontroller.iby) PRJ_MMPFILES diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/inc/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/rom/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/src/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/BWINS/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/EABI/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/inc/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/src/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/stub/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/stub/data/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/advancedtspcontroller/tsrc/stub/group/Distribution.Policy.S60 --- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/group/Distribution.Policy.S60 --- a/coreapplicationuis/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/gsserverenginestub/Distribution.Policy.S60 --- a/coreapplicationuis/gsserverenginestub/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/gsserverenginestub/Inc/Distribution.Policy.S60 --- a/coreapplicationuis/gsserverenginestub/Inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/gsserverenginestub/Src/Distribution.Policy.S60 --- a/coreapplicationuis/gsserverenginestub/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/gsserverenginestub/bwins/Distribution.Policy.S60 --- a/coreapplicationuis/gsserverenginestub/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/gsserverenginestub/eabi/Distribution.Policy.S60 --- a/coreapplicationuis/gsserverenginestub/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/gsserverenginestub/group/Distribution.Policy.S60 --- a/coreapplicationuis/gsserverenginestub/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/gsserverenginestub/group/GSServerEnginestub.mmp --- a/coreapplicationuis/gsserverenginestub/group/GSServerEnginestub.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/gsserverenginestub/group/GSServerEnginestub.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ // To get the MW_LAYER_SYSTEMINCLUDE-definition #include -TARGET GSServerEnginestub.dll +TARGET gsserverenginestub.dll TARGETTYPE dll UID 0x10281F16 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/inc/Distribution.Policy.S60 --- a/coreapplicationuis/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/BWINS/distribution.policy.s60 --- a/coreapplicationuis/kefmapper/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/Distribution.Policy.S60 --- a/coreapplicationuis/kefmapper/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/EABI/distribution.policy.s60 --- a/coreapplicationuis/kefmapper/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/data/Distribution.Policy.S60 --- a/coreapplicationuis/kefmapper/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/group/Distribution.Policy.S60 --- a/coreapplicationuis/kefmapper/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/group/KeyEventFw.mmp --- a/coreapplicationuis/kefmapper/group/KeyEventFw.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/kefmapper/group/KeyEventFw.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include #include -TARGET KeyEventFw.DLL +TARGET keyeventfw.dll TARGETTYPE dll UID 0x1000008D 0x102824C2 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/inc/Distribution.Policy.S60 --- a/coreapplicationuis/kefmapper/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/rom/Distribution.Policy.S60 --- a/coreapplicationuis/kefmapper/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/kefmapper/src/Distribution.Policy.S60 --- a/coreapplicationuis/kefmapper/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/BWINS/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/BWINS/batterypopupcontrolu.DEF --- a/coreapplicationuis/powersaveutilities/BWINS/batterypopupcontrolu.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/BWINS/batterypopupcontrolu.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,6 @@ EXPORTS - ??1CBatteryPopupControl@@UAE@XZ @ 1 NONAME ; CBatteryPopupControl::~CBatteryPopupControl(void) - ?NewL@CBatteryPopupControl@@SAPAV1@ABVTDesC16@@0@Z @ 2 NONAME ; class CBatteryPopupControl * CBatteryPopupControl::NewL(class TDesC16 const &, class TDesC16 const &) - ?SetCommandObserver@CBatteryPopupControl@@QAEXAAVMEikCommandObserver@@@Z @ 3 NONAME ; void CBatteryPopupControl::SetCommandObserver(class MEikCommandObserver &) - ?ShowPopUpL@CBatteryPopupControl@@QAEXXZ @ 4 NONAME ; void CBatteryPopupControl::ShowPopUpL(void) + ?NewL@CBatteryPopupControl@@SAPAV1@ABVTDesC16@@0@Z @ 1 NONAME ; class CBatteryPopupControl * CBatteryPopupControl::NewL(class TDesC16 const &, class TDesC16 const &) + ?SetCommandObserver@CBatteryPopupControl@@QAEXAAVMEikCommandObserver@@@Z @ 2 NONAME ; void CBatteryPopupControl::SetCommandObserver(class MEikCommandObserver &) + ?ShowPopUpL@CBatteryPopupControl@@QAEXXZ @ 3 NONAME ; void CBatteryPopupControl::ShowPopUpL(void) + ??1CBatteryPopupControl@@QAE@XZ @ 4 NONAME ; CBatteryPopupControl::~CBatteryPopupControl(void) diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/CenRep/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/CenRep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/EABI/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/EABI/batterypopupcontrolu.DEF --- a/coreapplicationuis/powersaveutilities/EABI/batterypopupcontrolu.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/EABI/batterypopupcontrolu.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -2,7 +2,6 @@ _ZN20CBatteryPopupControl10ShowPopUpLEv @ 1 NONAME _ZN20CBatteryPopupControl18SetCommandObserverER19MEikCommandObserver @ 2 NONAME _ZN20CBatteryPopupControl4NewLERK7TDesC16S2_ @ 3 NONAME - _ZN20CBatteryPopupControlD0Ev @ 4 NONAME - _ZN20CBatteryPopupControlD1Ev @ 5 NONAME - _ZN20CBatteryPopupControlD2Ev @ 6 NONAME + _ZN20CBatteryPopupControlD1Ev @ 4 NONAME + _ZN20CBatteryPopupControlD2Ev @ 5 NONAME diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/batindicatorpaneplugin/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/batindicatorpaneplugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/batterypopupcontrol/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h --- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -19,10 +19,10 @@ #ifndef CBATTERYPOPUPCONTROL_H #define CBATTERYPOPUPCONTROL_H -#include -#include -#include // Controlling the preview pop-up component - +//#include +//#include +//#include // Controlling the preview pop-up component +#include class MEikCommandObserver; class CEikLabel; class CGulIcon; @@ -42,10 +42,9 @@ * @lib BatteryPopupControl.lib * @since S60 5.0 */ -NONSHARABLE_CLASS( CBatteryPopupControl ) : - public CAknControl, - public MCoeControlObserver, - public MAknPreviewPopUpObserver +NONSHARABLE_CLASS( CBatteryPopupControl ) :public MCoeControlObserver + // public CAknControl, + // public MAknPreviewPopUpObserver { public: @@ -72,7 +71,7 @@ /** * Destructor. */ - ~CBatteryPopupControl(); + IMPORT_C ~CBatteryPopupControl(); /** * Sets the command observer of the preview pop-up content. When @@ -134,8 +133,8 @@ /** * @see MAknPreviewPopUpObserver */ - void HandlePreviewPopUpEventL( CAknPreviewPopUpController* aController, - TPreviewPopUpEvent aEvent ); + // void HandlePreviewPopUpEventL( CAknPreviewPopUpController* aController, + // TPreviewPopUpEvent aEvent ); /** * Default constructor. @@ -159,8 +158,8 @@ * @param aParent Parent rect. * @param aComponentLayout Layout data. */ - TRect RectFromLayout( const TRect& aParent, - const TAknWindowComponentLayout& aComponentLayout ) const; + // TRect RectFromLayout( const TRect& aParent, + // const TAknWindowComponentLayout& aComponentLayout ) const; /** * Gets rect from layout data. @@ -168,8 +167,8 @@ * @since S60 5.0 * @param aComponentLayout Layout data. */ - TRect PopUpWindowRectFromLayout( const TAknWindowComponentLayout& - aComponentLayout ) const; + // TRect PopUpWindowRectFromLayout( const TAknWindowComponentLayout& + // aComponentLayout ) const; /** * Creates CGulIcon. @@ -271,7 +270,7 @@ /** * Layout for icon */ - TAknLayoutRect iBitmapLayout; + // TAknLayoutRect iBitmapLayout; /** * Variant, @@ -284,7 +283,7 @@ * Popup controller * Own. */ - CAknPreviewPopUpController* iController; + // CAknPreviewPopUpController* iController; /** * Rect for link diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/batterypopupcontrol/src/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp --- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -16,17 +16,17 @@ */ -#include -#include -#include -#include +//#include +//#include +//#include +//#include #include // TResourceReader #include #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #include // KDC_RESOURCE_FILES_DIR #include // ----------- Touch feedback additions start @@ -39,9 +39,9 @@ #include "trace.h" // Constants -const TInt KPopupShowDelay = 0; // Show immediately -const TInt KPopupHideDelay = 3000000; // hide after 3 sec -const TInt KMaxLinkTextLength = 255; +//const TInt KPopupShowDelay = 0; // Show immediately +//const TInt KPopupHideDelay = 3000000; // hide after 3 sec +//const TInt KMaxLinkTextLength = 255; // ======== MEMBER FUNCTIONS ======== @@ -80,7 +80,7 @@ EXPORT_C CBatteryPopupControl::~CBatteryPopupControl() { FUNC_LOG - delete iController; + // delete iController; delete iText; delete iIcon; delete iLinkText; @@ -105,7 +105,7 @@ { FUNC_LOG - iController = CAknPreviewPopUpController::NewL( *this, CAknPreviewPopUpController::ELayoutDefault | CAknPreviewPopUpController::EDontClose ); + /* iController = CAknPreviewPopUpController::NewL( *this, CAknPreviewPopUpController::ELayoutDefault | CAknPreviewPopUpController::EDontClose ); iController->AddObserverL( *this ); // Set popup's hide/show delays @@ -121,7 +121,7 @@ } // Launch - iController->ShowPopUp(); + iController->ShowPopUp(); */ } // ----------------------------------------------------------------------------- @@ -134,11 +134,11 @@ { FUNC_LOG - CCoeControl::HandleResourceChange( aType ); + /* CCoeControl::HandleResourceChange( aType ); if ( aType == KEikDynamicLayoutVariantSwitch ) { SizeChanged(); - } + }*/ } @@ -152,7 +152,7 @@ { FUNC_LOG - CCoeControl::SetContainerWindowL( aContainer ); + // CCoeControl::SetContainerWindowL( aContainer ); if( iText ) { @@ -175,9 +175,10 @@ // From MAknPreviewPopUpObserver // --------------------------------------------------------------------------- // +/* void CBatteryPopupControl::HandlePreviewPopUpEventL( - CAknPreviewPopUpController* /*aController*/, - TPreviewPopUpEvent aEvent ) + CAknPreviewPopUpController aController, + TPreviewPopUpEvent aEvent ) { FUNC_LOG @@ -191,7 +192,7 @@ break; } } - + */ // ----------------------------------------------------------------------------- // CAknStylusActivatedPopUpContent::ConstructL // ----------------------------------------------------------------------------- @@ -217,7 +218,7 @@ } iLinkText = aLinkText.AllocL(); } - + /* TRect rectPopUpWindow = PopUpWindowRectFromLayout( AknLayoutScalable_Avkon::popup_battery_window( iVariant ) ); @@ -230,9 +231,9 @@ AknLayoutScalable_Avkon::popup_battery_window_t1( iVariant ); TAknLayoutText textRect; textRect.LayoutText( rectPopUpWindow, textLayout ); - + */ // Font for command links - iFont = textRect.Font(); + // iFont = textRect.Font(); } // ----------------------------------------------------------------------------- @@ -254,8 +255,8 @@ } } default: - __ASSERT_ALWAYS( aIndex >= 0, User::Panic( - _L("CBatteryPopupControl::ComponentControl"), EAknPanicOutOfRange ) ); + // __ASSERT_ALWAYS( aIndex >= 0, User::Panic( + // _L("CBatteryPopupControl::ComponentControl"), EAknPanicOutOfRange ) ); return NULL; } } @@ -289,7 +290,7 @@ { FUNC_LOG - CWindowGc& gc = SystemGc(); + /* CWindowGc& gc = SystemGc(); MAknsSkinInstance* skin = AknsUtils::SkinInstance(); if( iIcon ) @@ -375,7 +376,7 @@ gc.DrawText( ptr, rect, baselineOffset, CGraphicsContext::ELeft ); delete visualText; - } + }*/ } @@ -406,9 +407,9 @@ TInt tempWidth = iFont->TextWidthInPixels( *( iLinkText ) ); minWidth = Max( minWidth, tempWidth ); } - TInt rectWidth = 0; + // TInt rectWidth = 0; - TAknWindowComponentLayout infoPaneLayout = +/* TAknWindowComponentLayout infoPaneLayout = AknLayoutScalable_Avkon::bg_popup_sub_pane_cp25( iVariant ); TRect rectPopUpWindow = PopUpWindowRectFromLayout( @@ -418,9 +419,9 @@ rectWidth = Max( rectInfoPane.Width(), minWidth ); - TInt rectHeight = rectInfoPane.Height(); + TInt rectHeight = rectInfoPane.Height();*/ - return TSize( rectWidth, rectHeight ); + // return TSize( rectWidth, rectHeight ); } @@ -433,7 +434,7 @@ { FUNC_LOG // Get popup window rect - TRect rectPopUpWindow = PopUpWindowRectFromLayout( + /* TRect rectPopUpWindow = PopUpWindowRectFromLayout( AknLayoutScalable_Avkon::bg_popup_sub_pane_cp25( iVariant ) ); // Get pane icon and text layouts @@ -486,27 +487,27 @@ } tempRect.SetWidth( tempWidth ); iLinkRect = tempRect; - } + }*/ } // ----------------------------------------------------------------------------- // RectFromLayout // ----------------------------------------------------------------------------- // -TRect CBatteryPopupControl::RectFromLayout( const TRect& aParent, +/*TRect CBatteryPopupControl::RectFromLayout( const TRect& aParent, const TAknWindowComponentLayout& aComponentLayout ) const { TAknWindowLineLayout lineLayout = aComponentLayout.LayoutLine(); TAknLayoutRect layoutRect; layoutRect.LayoutRect( aParent, lineLayout ); return layoutRect.Rect(); - } + }*/ // ----------------------------------------------------------------------------- // PopUpWindowRectFromLayout // ----------------------------------------------------------------------------- // -TRect CBatteryPopupControl::PopUpWindowRectFromLayout( const +/*TRect CBatteryPopupControl::PopUpWindowRectFromLayout( const TAknWindowComponentLayout& aComponentLayout ) const { FUNC_LOG @@ -519,7 +520,7 @@ layoutRect.LayoutRect( iAvkonAppUi->ApplicationRect(), lineLayout ); return layoutRect.Rect(); - } + }*/ // ----------------------------------------------------------------------------- // From class CCoeControl @@ -537,7 +538,7 @@ if ( !iHighlightedItem ) { iHighlightedItem = ETrue; - DrawNow( iLinkRect ); + // DrawNow( iLinkRect ); } #ifdef RD_TACTILE_FEEDBACK if ( aPointerEvent.iType == TPointerEvent::EButton1Down ) @@ -553,7 +554,7 @@ // Nofity command observer if ( aPointerEvent.iType == TPointerEvent::EButton1Up ) { - iCommandObserver->ProcessCommandL( ELinkFirst ); + // iCommandObserver->ProcessCommandL( ELinkFirst ); iHighlightedItem = EFalse; } } @@ -577,12 +578,12 @@ delete iIcon; iIcon = NULL; - iIcon = AknsUtils::CreateGulIconL( AknsUtils::SkinInstance(), + /* iIcon = AknsUtils::CreateGulIconL( AknsUtils::SkinInstance(), KAknsIIDQgnPropBatteryIcon, fp->FullName(), EMbmBatterypopupcontrolQgn_prop_battery_ps_deactivate, EMbmBatterypopupcontrolQgn_prop_battery_ps_deactivate_mask ); - +*/ CleanupStack::PopAndDestroy( fp ); } // End of File diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/bsutil/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/bsutil/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/bsutil/inc/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/bsutil/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/bsutil/src/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/bsutil/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/conf/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/data/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/group/BSUtil.mmp --- a/coreapplicationuis/powersaveutilities/group/BSUtil.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/group/BSUtil.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -18,7 +18,7 @@ #include -TARGET BSUtil.dll +TARGET bsutil.dll TARGETTYPE dll UID 0x1000008D 0x2000B5E2 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/group/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/group/batindicatorpaneplugin.mmp --- a/coreapplicationuis/powersaveutilities/group/batindicatorpaneplugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/group/batindicatorpaneplugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -65,7 +65,7 @@ LIBRARY efsrv.lib // TParsePtrC LIBRARY flogger.lib LIBRARY psmclient.lib -LIBRARY BSUtil.lib +LIBRARY bsutil.lib LIBRARY batterypopupcontrol.lib LIBRARY centralrepository.lib // End of File diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/group/batterypopupcontrol.mmp --- a/coreapplicationuis/powersaveutilities/group/batterypopupcontrol.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/group/batterypopupcontrol.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -42,15 +42,15 @@ LIBRARY efsrv.lib // TParsePtrC LIBRARY flogger.lib LIBRARY eikcoctl.lib -LIBRARY AknLayout2.lib -LIBRARY AknLayout2Scalable.lib -LIBRARY CdlEngine.lib -LIBRARY AknSkins.lib // Skins support +LIBRARY aknlayout2.lib +LIBRARY aknlayout2scalable.lib +LIBRARY cdlengine.lib +LIBRARY aknskins.lib // Skins support LIBRARY gdi.lib -LIBRARY AknIcon.lib +LIBRARY aknicon.lib LIBRARY egul.lib -LIBRARY FontProvider.lib -LIBRARY FontUtils.lib +LIBRARY fontprovider.lib +LIBRARY fontutils.lib #ifndef AVKON_BATTERYPOPUP_LAYOUTS LIBRARY aknnotify.lib #endif //AVKON_BATTERYPOPUP_LAYOUTS diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/group/bld.inf --- a/coreapplicationuis/powersaveutilities/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -39,7 +39,7 @@ PRJ_MMPFILES BSUtil.mmp batterypopupcontrol.mmp -batindicatorpaneplugin.mmp +//batindicatorpaneplugin.mmp PRJ_EXTENSIONS diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/loc/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/rom/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/rom/powersaveutilities.iby --- a/coreapplicationuis/powersaveutilities/rom/powersaveutilities.iby Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/rom/powersaveutilities.iby Thu Jun 24 13:52:58 2010 +0100 @@ -23,7 +23,7 @@ file=ABI_DIR\BUILD_DIR\batterypopupcontrol.dll SHARED_LIB_DIR\batterypopupcontrol.dll //ECOM_PLUGIN_UDEB( batindicatorpaneplugin.dll, batindicatorpaneplugin.rsc ) -ECOM_PLUGIN( batindicatorpaneplugin.dll, batindicatorpaneplugin.rsc ) +//ECOM_PLUGIN( batindicatorpaneplugin.dll, batindicatorpaneplugin.rsc ) data=DATAZ_\ECOM_RESOURCE_DIR\batindicatorpaneplugin.rsc ECOM_RESOURCE_DIR\batindicatorpaneplugin.rsc data=DATAZ_\ECOM_RESOURCE_DIR\batindpaneplugin.rsc ECOM_RESOURCE_DIR\batindpaneplugin.rsc diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/adv/conf/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/adv/data/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/adv/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/adv/group/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/adv/init/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/BWINS/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/EABI/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BSUtil/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BSUtil/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BatteryPopupControl/Distribution.Policy.S60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BatteryPopupControl/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/conf/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/data/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/group/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/init/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/basic/rom/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/powersaveutilities/tsrc/public/distribution.policy.s60 --- a/coreapplicationuis/powersaveutilities/tsrc/public/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/AIRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/AIRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/AIRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/AIRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/AIRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/AIRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/AIRFSPlugin/group/AIRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/AIRFSPlugin/group/AIRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/AIRFSPlugin/group/AIRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET AIRFSPlugin.dll +TARGET airfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8BD.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET AIRFSPlugin.rsc + TARGET airfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/AIRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/AIRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/AIRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/AIRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/AIRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/AIRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/CertRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/CertRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/CertRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/CertRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/CertRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/CertRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/CertRFSPlugin/group/CertRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/CertRFSPlugin/group/CertRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/CertRFSPlugin/group/CertRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET CertRFSPlugin.dll +TARGET certrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8B9.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET CertRFSPlugin.rsc + TARGET certrfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/CertRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/CertRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/CertRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/CertRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/CertRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/CertRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/ClockRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/ClockRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/ClockRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/ClockRFSPlugin/group/ClockRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/ClockRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/ClockRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET ClockRFSPlugin.dll +TARGET clockrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8BE.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET ClockRFSPlugin.rsc + TARGET clockrfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/ClockRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/ClockRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/ClockRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/DatastoreRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/DatastoreRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/DatastoreRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET DatastoreRFSPlugin.dll +TARGET datastorerfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8C2.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET DatastoreRFSPlugin.rsc + TARGET datastorerfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/DefaultFolderRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/DefaultFolderRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/DefaultFolderRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET DefaultFolderRFSPlugin.dll +TARGET defaultfolderrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8BA.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET DefaultFolderRFSPlugin.rsc + TARGET defaultfolderrfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DisplayContrastPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp --- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET RfsDisplayContrastPlugin.dll +TARGET rfsdisplaycontrastplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 102071F7.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET RfsDisplayContrastPlugin.rsc + TARGET rfsdisplaycontrastplugin.rsc #endif END @@ -44,5 +44,5 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library LIBRARY hal.lib // HAL library \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DisplayContrastPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/DisplayContrastPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/FavouritesRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/FavouritesRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/FavouritesRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET FavouritesRFSPlugin.dll +TARGET favouritesrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 102071F6.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET FavouritesRFSPlugin.rsc + TARGET favouritesrfsplugin.rsc #endif END @@ -45,5 +45,5 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library -LIBRARY FavouritesEngine.lib // Favourites engine library +LIBRARY ecom.lib // ECom library +LIBRARY favouritesengine.lib // Favourites engine library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/FavouritesRFSPlugin.cpp --- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/FavouritesRFSPlugin.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/FavouritesRFSPlugin.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -17,8 +17,8 @@ // INCLUDE FILES -#include -#include +#include +#include #include "FavouritesRFSPluginPrivateCRKeys.h" #include "FavouritesRFSPlugin.h" diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FormatterRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FormatterRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FormatterRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FormatterRFSPlugin/data/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FormatterRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FormatterRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -19,10 +19,11 @@ // SYSTEM INCLUDE #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include // USER INCLUDE #include "formatterrfsplugin.h" #include "formatterrfspluginprivatecrkeys.h" @@ -44,66 +45,76 @@ // static void FileWriteL(RPointerArray &files) { - RFs iFs; - RFile iFile; - User::LeaveIfError(iFs.Connect()); - TInt err = iFile.Open(iFs,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite); - + RFs fileSession; + RFile file; + User::LeaveIfError(fileSession.Connect()); + TInt err = file.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText); + if ( err != KErrNone ) { RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL , FileWrite : Failed to open the file")); return; } - TBuf8 <1> newLine; - newLine.Append('\n'); + TInt pos = 0; - iFile.Seek(ESeekEnd,pos); + file.Seek(ESeekEnd,pos); TInt size = files.Count(); + RBuf filenameBuf; + for ( TInt i=0; i < size; i++) { HBufC8* fileName = HBufC8::NewLC(files[i]->Size()); TPtr8 fileNamePtr(fileName->Des()); fileNamePtr.Copy(*files[i]); - iFile.Write(*fileName); - iFile.Write(newLine); + + filenameBuf.Create(fileNamePtr.Length()); + filenameBuf.Copy(fileNamePtr); + TFileText fileText ; + fileText.Set(file) ; + fileText.Seek(ESeekStart); + fileText.Write(filenameBuf); CleanupStack::PopAndDestroy();//Filename - iFile.Flush(); + file.Flush(); } - iFile.Close(); - iFs.Close(); - + + file.Close(); + fileSession.Close(); } static void MergeFilesL() { - RFs iSession; - RFile iExclude; + RFs fileSession; + RFile excludeFileName; - RFs iFs; - RFile iFile; + RFile fileName; TInt pos = 0; TInt size_of_script( 0 ); TInt buffer_size( sizeof(TText) ); TInt number_of_chars; - User::LeaveIfError(iSession.Connect()); - TInt ret = iExclude.Open(iSession,_L("c:\\private\\100059C9\\excludelist.txt"),EFileRead); + User::LeaveIfError(fileSession.Connect()); + TInt ret = excludeFileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelist.txt"),EFileRead); - User::LeaveIfError(iFs.Connect()); - TInt err1 = iFile.Open(iFs,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite); - - iFile.Seek(ESeekEnd,pos); - if ( ret != KErrNone || err1 != KErrNone) + if(ret != KErrNone) + { + RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL , MergeFiles : Failed to open the file")); + return; + } + ret = fileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText); + if ( ret != KErrNone) { + excludeFileName.Close(); RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL , MergeFiles : Failed to open the file")); return; } + fileName.Seek(ESeekEnd,pos); + HBufC* buffer = HBufC::NewMaxLC( buffer_size ); TPtr8 bufferPtr( (TUint8*)buffer->Ptr(), buffer_size); TInt err(0); - err = iExclude.Size( size_of_script ); + err = excludeFileName.Size( size_of_script ); number_of_chars = size_of_script / sizeof(TText); TInt i(0); @@ -111,51 +122,49 @@ { if ( err == KErrNone ) { - err = iExclude.Read( bufferPtr); + err = excludeFileName.Read( bufferPtr); } - iFile.Write(bufferPtr); + fileName.Write(bufferPtr); } - iFile.Flush(); - iFile.Close(); - iFs.Close(); + fileName.Flush(); + fileName.Close(); - iExclude.Close(); - iSession.Close(); + excludeFileName.Close(); + fileSession.Close(); + CleanupStack::PopAndDestroy();//buffer - CleanupStack::PopAndDestroy();//buffer - } static HBufC* ExcludeListNameL( TChar aSystemDrive ) { FUNC_LOG; - + RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL")); - RFs iFs; - RFile iFile; + RFs fileSession; + RFile file; _LIT8(KFileName, "c:\\private\\100059C9\\excludelistcache.txt\n"); TBuf8 <50> fileName; fileName.Copy(KFileName); - User::LeaveIfError(iFs.Connect()); + User::LeaveIfError(fileSession.Connect()); RDir dir; - if(dir.Open(iFs,_L("c:\\private\\100059C9\\"),KEntryAttNormal) != KErrNone) + if(dir.Open(fileSession,_L("c:\\private\\100059C9\\"),KEntryAttNormal) != KErrNone) { - iFs.MkDir(_L("c:\\private\\100059C9\\")); + User::LeaveIfError(fileSession.MkDir(_L("c:\\private\\100059C9\\"))); } - TInt rev = iFile.Replace(iFs,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite); + TInt rev = file.Replace(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText); RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL, Replace returned %d"),rev); - iFile.Write(fileName); - iFile.Flush(); - iFile.Close(); - iFs.Close(); - + file.Flush(); + file.Close(); + dir.Close(); + fileSession.Close(); + Swi::RSisRegistrySession session; CleanupClosePushL(session); User::LeaveIfError(session.Connect()); @@ -171,76 +180,97 @@ CleanupClosePushL(entry); CleanupClosePushL(entry2); - - //No issues until here - RPointerArray allfiles; + RPointerArray registryFiles; + RPointerArray augmentedRegistryFiles; RPointerArray nonRemovableFiles; RPointerArray nonRemovableAugmentedFiles; - CleanupResetAndDestroyPushL(allfiles); + CleanupResetAndDestroyPushL(registryFiles); + CleanupResetAndDestroyPushL(augmentedRegistryFiles); CleanupResetAndDestroyPushL(nonRemovableFiles); CleanupResetAndDestroyPushL(nonRemovableAugmentedFiles); - //Logic starts - TInt count; - RPointerArray augmentationPackages; - CleanupResetAndDestroyPushL(augmentationPackages); - for ( TInt iter=0; iter=0;z--) - { - TPtr firstChar(nonRemovableFiles[z]->Des()); - if(firstChar.Mid(0,1) == _L("z")) - { - delete nonRemovableFiles[z]; - nonRemovableFiles.Remove(z); - } - } - // Look for augmentations. - if(entry.IsAugmentationL()) - { - entry.AugmentationsL(augmentationPackages); - count = entry.AugmentationsNumberL(); - for (TInt i=0; i < count; ++i) - { - User::LeaveIfError(entry2.OpenL(session,*augmentationPackages[i])); - if(EFalse == entry2.RemovableL()) - { - entry2.FilesL(nonRemovableAugmentedFiles); - for (TInt c=0; cDes()); - if(firstChar.Mid(0,1) == _L("z")) - { - delete nonRemovableAugmentedFiles[c]; - nonRemovableAugmentedFiles.Remove(c); - } - } - } - entry2.Close(); - } - } - } - entry.Close(); - } - RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL Writing the file names to the excludelist.txt")); + TInt count; + RPointerArray augmentationPackages; + CleanupResetAndDestroyPushL(augmentationPackages); + for ( TInt iter=0; iter=0;z--) + { + TPtr firstChar(nonRemovableFiles[z]->Des()); + if(firstChar.Mid(0,1) == _L("z")) + { + delete nonRemovableFiles[z]; + nonRemovableFiles.Remove(z); + } + } + // Look for augmentations. + if(entry.IsAugmentationL()) + { + entry.AugmentationsL(augmentationPackages); + count = entry.AugmentationsNumberL(); + for (TInt i=0; i < count; ++i) + { + User::LeaveIfError(entry2.OpenL(session,*augmentationPackages[i])); + if(EFalse == entry2.RemovableL()) + { + entry2.FilesL(nonRemovableAugmentedFiles); + entry2.RegistryFilesL(augmentedRegistryFiles); + for (TInt c=0; cDes()); + if(firstChar.Mid(0,1) == _L("z")) + { + delete nonRemovableAugmentedFiles[c]; + nonRemovableAugmentedFiles.Remove(c); + } + } + } + entry2.Close(); + } + } + } + entry.Close(); + } + RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL Writing the file names to the excludelist.txt")); + + MergeFilesL(); + FileWriteL(nonRemovableAugmentedFiles); + FileWriteL(augmentedRegistryFiles); + FileWriteL(nonRemovableFiles); + FileWriteL(registryFiles); - FileWriteL(nonRemovableFiles); - FileWriteL(nonRemovableAugmentedFiles); - MergeFilesL(); - - CleanupStack::PopAndDestroy(8,&session); + TInt pos = 0; + User::LeaveIfError(fileSession.Connect()); + User::LeaveIfError(file.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText)); + + file.Seek(ESeekEnd,pos); - HBufC* buf = HBufC::NewLC( KExcludeListcache().Length() + KExcludeListPathNameLenExt ); - TPtr bufPtr = buf->Des(); - bufPtr.Append( aSystemDrive ); - bufPtr.Append( KDriveDelimiter ); - bufPtr.Append( KExcludeListcache ); - CleanupStack::Pop( buf ); + TBuf configurationLine ; + TFileText fileText ; + fileText.Set(file) ; + fileText.Seek(ESeekStart); + configurationLine.Format(_L("c:\\private\\100059C9\\excludelistcache.txt")) ; + fileText.Write(configurationLine); + + file.Flush(); + file.Close(); + fileSession.Close(); + + + CleanupStack::PopAndDestroy(9,&session); + + HBufC* buf = HBufC::NewLC( KExcludeListcache().Length() + KExcludeListPathNameLenExt ); + TPtr bufPtr = buf->Des(); + bufPtr.Append( aSystemDrive ); + bufPtr.Append( KDriveDelimiter ); + bufPtr.Append( KExcludeListcache ); + CleanupStack::Pop( buf ); return buf; } @@ -436,6 +466,14 @@ aPath.Append( KScriptUidSeparator ); INFO_1( "Script = '%S'", &aPath ); } + else + { + RDebug::Print(_L("Resetting the KStartupFirstBoot value")); + CRepository* repository = CRepository::NewL(KCRUidStartup); + CleanupStack::PushL( repository ); + repository->Reset(KStartupFirstBoot); + CleanupStack::PopAndDestroy( repository ); + } } // --------------------------------------------------------------------------- diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/NitzRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/NitzRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/NitzRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/NitzRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/NitzRFSPlugin/group/NitzRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/NitzRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/NitzRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET NitzRFSPlugin.dll +TARGET nitzrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8BF.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET NitzRFSPlugin.rsc + TARGET nitzrfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/NitzRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/NitzRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SIPRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SIPRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SIPRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SIPRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SIPRFSPlugin/group/SipRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/SipRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/SipRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET SIPRFSPlugin.dll +TARGET siprfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2001959D.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET SIPRFSPlugin.rsc + TARGET siprfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SIPRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SIPRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/StarterRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/StarterRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/StarterRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/StarterRFSPlugin/conf/starterrfsplugin.confml Binary file coreapplicationuis/rfsplugins/StarterRFSPlugin/conf/starterrfsplugin.confml has changed diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/StarterRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/StarterRFSPlugin/group/StarterRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/StarterRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/StarterRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET StarterRFSPlugin.dll +TARGET starterrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8BB.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET StarterRFSPlugin.rsc + TARGET starterrfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/StarterRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/StarterRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/SyncMLRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/SyncMLRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/SyncMLRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET SyncMLRFSPlugin.dll +TARGET syncmlrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8BC.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET SyncMLRFSPlugin.rsc + TARGET syncmlrfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/TelephonyRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/TelephonyRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/TelephonyRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET TelephonyRFSPlugin.dll +TARGET telephonyrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8C1.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET TelephonyRFSPlugin.rsc + TARGET telephonyrfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/cenrep/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/UnitconverterRFSPlugin.mmp --- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/UnitconverterRFSPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/UnitconverterRFSPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -19,7 +19,7 @@ #include -TARGET UnitconverterRFSPlugin.dll +TARGET unitconverterrfsplugin.dll TARGETTYPE PLUGIN @@ -34,7 +34,7 @@ START RESOURCE 2000F8C0.rss #ifdef SYMBIAN_SECURE_ECOM - TARGET UnitconverterRFSPlugin.rsc + TARGET unitconverterrfsplugin.rsc #endif END @@ -45,4 +45,4 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib // Base library -LIBRARY ECom.lib // ECom library +LIBRARY ecom.lib // ECom library diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/group/bld.inf --- a/coreapplicationuis/rfsplugins/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -13,6 +13,16 @@ * * Description: Build information file for RFS plugins. * +* Copyright (c) 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. +* ============================================================================== */ #include diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/msgcentrerfsplugin/data/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/msgcentrerfsplugin/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/msgcentrerfsplugin.mmp --- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/msgcentrerfsplugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/msgcentrerfsplugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -44,4 +44,4 @@ LIBRARY eikcore.lib // Eikon library LIBRARY euser.lib // Base library LIBRARY cone.lib // Control environment library -LIBRARY muiu.lib // For message centre reset +LIBRARY muiuutils.lib // For message centre reset diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/msgcentrerfsplugin/inc/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/msgcentrerfsplugin/src/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/rom/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/bwins/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/eabi/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/bwins/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/conf/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/eabi/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/group/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/inc/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/msgcentrerfsplugintest.ini --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/msgcentrerfsplugintest.ini Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/msgcentrerfsplugintest.ini Thu Jun 24 13:52:58 2010 +0100 @@ -19,6 +19,8 @@ # Comment lines start with '#'-character. # See STIF TestFramework users guide.doc for instructions + + # -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- # Set following test engine settings: # - Set Test Reporting mode. TestReportMode's possible values are: diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/src/distribution.policy.s60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/data/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/bwins/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/conf/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/data/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/eabi/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/init/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/rom/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/group/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/inc/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/src/Distribution.Policy.S60 --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/BWINS/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/EABI/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/data/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/group/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/group/bld.inf --- a/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -23,13 +23,13 @@ PRJ_EXPORTS -../data/sensordatacompensationui.rul /epoc32/data/Z/private/10282bc4/rules/sensordatacompensationui.rul -../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationui.rul -../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationui.rul +../data/sensordatacompensationui.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationui.rul +../data/sensordatacompensationui.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationui.rul +../data/sensordatacompensationui.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationui.rul -../data/sensordatacompensationdevice.rul /epoc32/data/Z/private/10282bc4/rules/sensordatacompensationdevice.rul -../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationdevice.rul -../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationdevice.rul +../data/sensordatacompensationdevice.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationdevice.rul +../data/sensordatacompensationdevice.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationdevice.rul +../data/sensordatacompensationdevice.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationdevice.rul ../rom/sensordatacompensatorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( sensordatacompensatorplugin.iby ) diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/inc/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/rom/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/src/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/BWINS/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/EABI/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/sensordatacompensatorplgtest.cfg --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/sensordatacompensatorplgtest.cfg Mon Feb 08 13:38:38 2010 +0000 +++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/sensordatacompensatorplgtest.cfg Thu Jun 24 13:52:58 2010 +0100 @@ -16,6 +16,7 @@ */ + // Publish&Subscribe definitions [Define] KSensrvChannelTypeIdAccelerometerXYZAxisData 270553214 diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/inc/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/init/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/rom/Distribution.Policy.S60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/src/distribution.policy.s60 --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/adv/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/adv/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/adv/conf/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/adv/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/adv/data/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/adv/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/adv/group/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/adv/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/adv/init/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/adv/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/BWINS/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/EABI/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Src/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/MT_Rfs/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/MT_Rfs/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/MT_Rfs/Src/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/MT_Rfs/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/MT_kefmapper/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/MT_kefmapper/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/MT_kefmapper/Src/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/MT_kefmapper/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/conf/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/data/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/data/rfs/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/data/rfs/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/group/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/init/Distribution.Policy.S60 --- a/coreapplicationuis/tsrc/public/basic/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 coreapplicationuis/tsrc/public/basic/rom/distribution.policy.s60 --- a/coreapplicationuis/tsrc/public/basic/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/CNFTOOL/distribution.policy.s60 --- a/filehandling/fileconverterfw/CNFTOOL/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/Design/distribution.policy.s60 --- a/filehandling/fileconverterfw/Design/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/INC/distribution.policy.s60 --- a/filehandling/fileconverterfw/INC/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/SRC/distribution.policy.s60 --- a/filehandling/fileconverterfw/SRC/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/TSRC/W7ALLCHR.DOC Binary file filehandling/fileconverterfw/TSRC/W7ALLCHR.DOC has changed diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/TSRC/distribution.policy.s60 --- a/filehandling/fileconverterfw/TSRC/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/Tef/distribution.policy.s60 --- a/filehandling/fileconverterfw/Tef/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/Tef/scripts/distribution.policy.s60 --- a/filehandling/fileconverterfw/Tef/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/bwins/distribution.policy.s60 --- a/filehandling/fileconverterfw/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/documentation/SGL.GT0093.110_How_To_Implement_and_use_a_file converter_objectv1.4.doc Binary file filehandling/fileconverterfw/documentation/SGL.GT0093.110_How_To_Implement_and_use_a_file converter_objectv1.4.doc has changed diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/documentation/distribution.policy.s60 --- a/filehandling/fileconverterfw/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/eabi/distribution.policy.s60 --- a/filehandling/fileconverterfw/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/group/ConarcTest.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/filehandling/fileconverterfw/group/ConarcTest.pkg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,31 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + +;Languages +&EN + + +;Localised Vendor name +%{"ConarcTest.pkg EN"} + +; Vendor name +: "ConarcTest" + + +"\epoc32\data\z\conarctest\conarctest_run.bat"-"c:\conarctest_run.bat" +"\epoc32\data\z\conarctest\conarctest_t_b64cnv.script"-"c:\conarctest\conarctest_t_b64cnv.script" +"\epoc32\data\z\conarctest\conarctest_t_cnf.script"-"c:\conarctest\conarctest_t_cnf.script" +"\epoc32\data\z\conarctest\conarctest_t_loadecomcnv.script"-"c:\conarctest\conarctest_t_loadecomcnv.script" diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/group/app-framework_conarc.mrp diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/fileconverterfw/group/distribution.policy.s60 --- a/filehandling/fileconverterfw/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/bwins/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/documentation/CHTMLTOCRTCONVERTER test code.rtf Binary file filehandling/htmltorichtextconverter/documentation/CHTMLTOCRTCONVERTER test code.rtf has changed diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/documentation/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/eabi/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/group/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/inc/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/src/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tdata/profiling/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/tdata/profiling/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tdata/testHtml/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/tdata/testHtml/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/test/group/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/group/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/inc/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/scripts/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/src/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/testdata/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/testdata/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tsrc/distribution.policy.s60 --- a/filehandling/htmltorichtextconverter/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/htmltorichtextconverter/tsrc/profilingtest.cpp --- a/filehandling/htmltorichtextconverter/tsrc/profilingtest.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/filehandling/htmltorichtextconverter/tsrc/profilingtest.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -22,6 +22,7 @@ #include #include #include +#include #include "CHtmlToCrtConverter.h" #include "CHtmlToCrtConvActive.h" diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/richtexttohtmlconverter/Group/BLD.INF --- a/filehandling/richtexttohtmlconverter/Group/BLD.INF Mon Feb 08 13:38:38 2010 +0000 +++ b/filehandling/richtexttohtmlconverter/Group/BLD.INF Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -17,6 +17,7 @@ DEFAULT PRJ_EXPORTS + ./RichTextToHtmlConv.iby /epoc32/rom/include/core/mw/richtexttohtmlconv.iby ./RichTextToHtmlConv.iby /epoc32/rom/include/richtexttohtmlconv.iby PRJ_MMPFILES diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/richtexttohtmlconverter/Group/distribution.policy.s60 --- a/filehandling/richtexttohtmlconverter/Group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/richtexttohtmlconverter/Src/distribution.policy.s60 --- a/filehandling/richtexttohtmlconverter/Src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/richtexttohtmlconverter/TSrc/distribution.policy.s60 --- a/filehandling/richtexttohtmlconverter/TSrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/richtexttohtmlconverter/Test/distribution.policy.s60 --- a/filehandling/richtexttohtmlconverter/Test/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 filehandling/richtexttohtmlconverter/inc/distribution.policy.s60 --- a/filehandling/richtexttohtmlconverter/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 flashliteapi_3_1/Distribution.Policy.S60 --- a/flashliteapi_3_1/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 flashliteapi_3_1/group/Distribution.Policy.S60 --- a/flashliteapi_3_1/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 flashliteapi_3_1/mmi/Distribution.Policy.S60 --- a/flashliteapi_3_1/mmi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 flashliteapi_3_1/mmi/inc/Distribution.Policy.S60 --- a/flashliteapi_3_1/mmi/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 flashliteapi_3_1/ns/Distribution.Policy.S60 --- a/flashliteapi_3_1/ns/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 flashliteapi_3_1/ns/inc/Distribution.Policy.S60 --- a/flashliteapi_3_1/ns/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 flashliteapi_3_1/viewerfw/Distribution.Policy.S60 --- a/flashliteapi_3_1/viewerfw/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 flashliteapi_3_1/viewerfw/inc/Distribution.Policy.S60 --- a/flashliteapi_3_1/viewerfw/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 group/Distribution.Policy.S60 --- a/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 hwresourceadaptation/hwresourcemgruiplugin/group/distribution.policy.s60 --- a/hwresourceadaptation/hwresourcemgruiplugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp diff -r a4d95d2c2540 -r 2fee514510e5 hwresourceadaptation/hwresourcemgruiplugin/inc/distribution.policy.s60 --- a/hwresourceadaptation/hwresourcemgruiplugin/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 hwresourceadaptation/hwresourcemgruiplugin/rom/distribution.policy.s60 --- a/hwresourceadaptation/hwresourcemgruiplugin/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 hwresourceadaptation/hwresourcemgruiplugin/src/distribution.policy.s60 --- a/hwresourceadaptation/hwresourcemgruiplugin/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 inc/Distribution.Policy.S60 --- a/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 layers.sysdef.xml --- a/layers.sysdef.xml Mon Feb 08 13:38:38 2010 +0000 +++ b/layers.sysdef.xml Thu Jun 24 13:52:58 2010 +0100 @@ -12,6 +12,7 @@ + diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/Distribution.Policy.S60 --- a/mediakeys/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/KeyPublisherPlugin/Distribution.Policy.S60 --- a/mediakeys/KeyPublisherPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/KeyPublisherPlugin/group/Distribution.Policy.S60 --- a/mediakeys/KeyPublisherPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/KeyPublisherPlugin/group/KeyPublisherPlugin.mmp --- a/mediakeys/KeyPublisherPlugin/group/KeyPublisherPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/mediakeys/KeyPublisherPlugin/group/KeyPublisherPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -18,7 +18,7 @@ #include -TARGET KeyPublisherPlugin.DLL +TARGET keypublisherplugin.dll TARGETTYPE ani UID 0x10003B22 0x1020724B diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/KeyPublisherPlugin/inc/Distribution.Policy.S60 --- a/mediakeys/KeyPublisherPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/KeyPublisherPlugin/src/Distribution.Policy.S60 --- a/mediakeys/KeyPublisherPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/MMKeyBearer/Distribution.Policy.S60 --- a/mediakeys/MMKeyBearer/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/MMKeyBearer/group/Distribution.Policy.S60 --- a/mediakeys/MMKeyBearer/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/MMKeyBearer/group/MMKeyBearer.mmp --- a/mediakeys/MMKeyBearer/group/MMKeyBearer.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/mediakeys/MMKeyBearer/group/MMKeyBearer.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -21,7 +21,7 @@ #include -TARGET MMKeyBearer.dll +TARGET mmkeybearer.dll // CAPABILITY CAP_ECOM_PLUGIN // capabilities are required as that of remconbearerplugin.dll @@ -41,7 +41,7 @@ SOURCEPATH . START RESOURCE 10207235.rss -target MMKeyBearer.rsc +target mmkeybearer.rsc END @@ -52,15 +52,14 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY ECom.lib +LIBRARY ecom.lib LIBRARY c32.lib LIBRARY remconbearerplugin.lib LIBRARY remcontypes.lib LIBRARY flogger.lib -LIBRARY avkon.lib -LIBRARY akncapserverclient.lib LIBRARY apparc.lib LIBRARY eikcore.lib +LIBRARY lockclient.lib #include #include "../../group/mediakeys.mmh" diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/MMKeyBearer/inc/Distribution.Policy.S60 --- a/mediakeys/MMKeyBearer/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/MMKeyBearer/inc/MMKeyBearerImplementation.h --- a/mediakeys/MMKeyBearer/inc/MMKeyBearerImplementation.h Mon Feb 08 13:38:38 2010 +0000 +++ b/mediakeys/MMKeyBearer/inc/MMKeyBearerImplementation.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -26,7 +26,9 @@ #include #include #include -#include +#include + + #include "MMKeyBearerObserverPS.h" @@ -155,8 +157,7 @@ RProperty iProperty; // For keylock interaction - RAknUiServer iAknServer; - TBool iAknServerConnected; - }; + CKeyguardAccessApi* iKeyguardAccess; + }; #endif // __MMKEYBEARERIMPLEMENTATION_H__ diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/MMKeyBearer/src/Distribution.Policy.S60 --- a/mediakeys/MMKeyBearer/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp --- a/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -26,6 +26,7 @@ #include #include #include // Property values +#include // Include this once it is exported // #include @@ -74,7 +75,7 @@ delete iMediaKeyObserver; delete iAccessoryVolKeyObserver; delete iUSBFileTransferObserver; - iAknServer.Close(); + delete iKeyguardAccess; } // --------------------------------------------------------- @@ -84,11 +85,10 @@ // CMMKeyBearer::CMMKeyBearer(TBearerParams& aParams) : CRemConBearerPlugin(aParams), - iUSBFileTransfer(KUsbWatcherSelectedPersonalityNone), - iAknServerConnected(EFalse) + iUSBFileTransfer(KUsbWatcherSelectedPersonalityNone) { FUNC_LOG; - + //Pass } @@ -105,6 +105,7 @@ TRemConAddress addr; addr.BearerUid() = Uid(); TInt err = Observer().ConnectIndicate(addr); + iKeyguardAccess = CKeyguardAccessApi::NewL(); // Start Active object for listening key events from P&S TRAP_AND_LEAVE( @@ -361,30 +362,10 @@ // If events are from accessory device,then do not check for keypadlock if (aKeyType != EAccessoryVolumeKeys) { - TBool keysLocked = EFalse; - if (!(iAknServerConnected)) // Connect to server for first time - { - if(iAknServer.Connect() == KErrNone) - { - iAknServerConnected = ETrue; - } - else // If connection fails, then return - { - //Start the listener once again - if (aKeyType == ESideVolumeKeys) - { - iMMKeyBearerObserver->Start(); - } - if (aKeyType == EMediaKeys) - { - iMediaKeyObserver->Start(); - } - return ; - } - } - iAknServer.ShowKeysLockedNote(keysLocked); + + TInt err=iKeyguardAccess->ShowKeysLockedNote(); - if (keysLocked) + if (err==KErrNone) { // Device is locked , Discard the key event diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/group/Distribution.Policy.S60 --- a/mediakeys/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/inc/Distribution.Policy.S60 --- a/mediakeys/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 mediakeys/rom/Distribution.Policy.S60 --- a/mediakeys/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/copydatafile/group/distribution.policy.s60 --- a/openenvutils/commandshell/copydatafile/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/copydatafile/inc/distribution.policy.s60 --- a/openenvutils/commandshell/copydatafile/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/copydatafile/src/distribution.policy.s60 --- a/openenvutils/commandshell/copydatafile/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/docs/test/SGL.GT0355.203 v1.0 PREQ1459_Test Specification.doc Binary file openenvutils/commandshell/docs/test/SGL.GT0355.203 v1.0 PREQ1459_Test Specification.doc has changed diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/docs/test/distribution.policy.s60 --- a/openenvutils/commandshell/docs/test/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/group/distribution.policy.s60 --- a/openenvutils/commandshell/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/group/oetools_zsh.mrp diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/cat/src/cat.c --- a/openenvutils/commandshell/shell/commands/cat/src/cat.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/cat/src/cat.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// cat.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/cat/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/cat/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/cp/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/cp/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/cp/src/cp.c --- a/openenvutils/commandshell/shell/commands/cp/src/cp.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/cp/src/cp.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,8 +1,23 @@ /* $Id: cp.c,v 1.2 2000/08/14 16:26:08 amai Exp $ */ /* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */ -// -// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1988, 1993, 1994 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/cp/src/cputils.c --- a/openenvutils/commandshell/shell/commands/cp/src/cputils.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/cp/src/cputils.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,24 @@ /* $Id: utils.c,v 1.2 2000/08/14 16:26:08 amai Exp $ */ /* $NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $ */ -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /*- * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/cp/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/cp/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/docs/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/find/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/docs/findmanual.doc Binary file openenvutils/commandshell/shell/commands/find/docs/findmanual.doc has changed diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/group/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/find/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/find/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/inc/namespace.h --- a/openenvutils/commandshell/shell/commands/find/inc/namespace.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/inc/namespace.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ #ifndef __NAMESPACE_H__ #define __NAMESPACE_H__ /* ______________________________________________________________________ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/find/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/find.c --- a/openenvutils/commandshell/shell/commands/find/src/find.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/src/find.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,25 @@ /* $NetBSD: find.c,v 1.23 2006/10/11 19:51:10 apb Exp $ */ -/*-© Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/*- * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/fnmatch.c --- a/openenvutils/commandshell/shell/commands/find/src/fnmatch.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/src/fnmatch.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,25 @@ /* $NetBSD: fnmatch.c,v 1.21 2005/12/24 21:11:16 perry Exp $ */ -/* © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/function.c --- a/openenvutils/commandshell/shell/commands/find/src/function.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/src/function.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,25 @@ /* $NetBSD: function.c,v 1.62 2007/02/06 13:25:01 elad Exp $ */ -/*-© Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/*-© * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/ls.c --- a/openenvutils/commandshell/shell/commands/find/src/ls.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/src/ls.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,25 @@ /* $NetBSD: ls.c,v 1.19 2006/10/11 19:51:10 apb Exp $ */ -/*- © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/*- © * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/main.c --- a/openenvutils/commandshell/shell/commands/find/src/main.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/src/main.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,26 @@ /* $NetBSD: main.c,v 1.26 2006/11/09 20:50:53 christos Exp $ */ -/*- © Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved. +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/*- © * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/misc.c --- a/openenvutils/commandshell/shell/commands/find/src/misc.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/src/misc.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,25 @@ /* $NetBSD: misc.c,v 1.14 2006/10/11 19:51:10 apb Exp $ */ -/*- © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/*- © * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/namespace.c --- a/openenvutils/commandshell/shell/commands/find/src/namespace.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/src/namespace.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ /* ______________________________________________________________________ namespace.c $Id: namespace.c,v 1.1 2003/06/29 00:22:47 jriehl Exp $ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/find/src/options.c --- a/openenvutils/commandshell/shell/commands/find/src/options.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/find/src/options.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,24 @@ /* $NetBSD: options.c,v 1.26 2007/02/06 15:33:22 perry Exp $ */ -/*- © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + +/*- © * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/docs/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/grep/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/docs/manualforgrep.doc Binary file openenvutils/commandshell/shell/commands/grep/docs/manualforgrep.doc has changed diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/group/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/grep/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/grep/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/inc/grep.h --- a/openenvutils/commandshell/shell/commands/grep/inc/grep.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/grep/inc/grep.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,21 @@ -/* © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.*/ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* $NetBSD: grep.h,v 1.3 2006/05/15 21:12:21 rillig Exp $ */ /*- diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/inc/namespace.h --- a/openenvutils/commandshell/shell/commands/grep/inc/namespace.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/grep/inc/namespace.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ #ifndef __NAMESPACE_H__ #define __NAMESPACE_H__ /* ______________________________________________________________________ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/grep/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/src/file.c --- a/openenvutils/commandshell/shell/commands/grep/src/file.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/grep/src/file.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,21 @@ -/* © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.*/ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* $NetBSD: file.c,v 1.2 2006/05/15 21:12:21 rillig Exp $ */ /*- diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/src/grep.c --- a/openenvutils/commandshell/shell/commands/grep/src/grep.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/grep/src/grep.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,21 @@ -/* © Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.*/ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* $NetBSD: grep.c,v 1.3 2006/05/15 21:12:21 rillig Exp $ */ /*- diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/src/mmfile.c --- a/openenvutils/commandshell/shell/commands/grep/src/mmfile.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/grep/src/mmfile.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,21 @@ -/*© Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.*/ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* $NetBSD: mmfile.c,v 1.3 2006/05/15 21:12:21 rillig Exp $ */ /*- diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/src/namespace.c --- a/openenvutils/commandshell/shell/commands/grep/src/namespace.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/grep/src/namespace.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ /* ______________________________________________________________________ namespace.c $Id: namespace.c,v 1.1 2003/06/29 00:22:47 jriehl Exp $ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/grep/src/util.c --- a/openenvutils/commandshell/shell/commands/grep/src/util.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/grep/src/util.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,21 @@ -/* © Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.*/ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* $NetBSD: util.c,v 1.4 2006/05/15 21:12:21 rillig Exp $ */ /*- diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/inc/err.h --- a/openenvutils/commandshell/shell/commands/inc/err.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/inc/err.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,22 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + /*- - * © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. + * © * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ls/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/ls/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ls/src/cmp.c --- a/openenvutils/commandshell/shell/commands/ls/src/cmp.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/ls/src/cmp.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,25 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* $Id: cmp.c,v 1.2 2000/08/22 22:20:23 amai Exp $ */ /* $NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $ */ // -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. +// © // /* * Copyright (c) 1989, 1993 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ls/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/ls/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ls/src/getbsize.c --- a/openenvutils/commandshell/shell/commands/ls/src/getbsize.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/ls/src/getbsize.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,25 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + //getbsize.c // -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. +// © // /*- * Copyright (c) 1991, 1993 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ls/src/ls.c --- a/openenvutils/commandshell/shell/commands/ls/src/ls.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/ls/src/ls.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,26 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + /* $Id: ls.c,v 1.2 2000/08/22 22:20:23 amai Exp $ */ /* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */ // -// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved. +// © // /* * Copyright (c) 1989, 1993, 1994 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ls/src/print.c --- a/openenvutils/commandshell/shell/commands/ls/src/print.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/ls/src/print.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,26 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + /* $Id: print.c,v 1.2 2000/08/22 22:20:24 amai Exp $ */ /* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */ // -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. +// © // /* * Copyright (c) 1989, 1993, 1994 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ls/src/stat_flags.c --- a/openenvutils/commandshell/shell/commands/ls/src/stat_flags.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/ls/src/stat_flags.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,26 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + /* $Id: stat_flags.c,v 1.3 2000/08/26 09:22:51 amai Exp $ */ /* $NetBSD: stat_flags.c,v 1.5 1995/09/07 06:43:01 jtc Exp $ */ // -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. +// © // /*- * Copyright (c) 1993 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ls/src/util.c --- a/openenvutils/commandshell/shell/commands/ls/src/util.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/ls/src/util.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,25 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* $Id: util.c,v 1.2 2000/08/22 22:20:24 amai Exp $ */ /* $NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $ */ // -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. +// © // /* * Copyright (c) 1989, 1993, 1994 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ps/docs/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/ps/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ps/docs/pscommand.doc Binary file openenvutils/commandshell/shell/commands/ps/docs/pscommand.doc has changed diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ps/group/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/ps/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ps/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/ps/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/ps/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/ps/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/src/err.c --- a/openenvutils/commandshell/shell/commands/src/err.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/src/err.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,23 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /*- - * © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. + * © * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/src/fts.c --- a/openenvutils/commandshell/shell/commands/src/fts.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/src/fts.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,24 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* $Id: fts.c,v 1.5 2000/11/25 16:33:36 arnd Exp $ */ // -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. +// © // /*- * Copyright (c) 1990, 1993, 1994 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/touch/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/touch/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/touch/src/touch.c --- a/openenvutils/commandshell/shell/commands/touch/src/touch.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/touch/src/touch.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,24 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + /* $OpenBSD: touch.c,v 1.3 1997/01/15 23:43:22 millert Exp $ */ /* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */ // -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. +// © // /* * Copyright (c) 1993 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/unzip/group/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/unzip/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/unzip/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/unzip/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/unzip/inc/unzip.h --- a/openenvutils/commandshell/shell/commands/unzip/inc/unzip.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/unzip/inc/unzip.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,8 +1,24 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* unzip.h -- IO for uncompress .zip files using zlib Version 1.01e, February 12th, 2005 - Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. - Copyright (C) 1998-2005 Gilles Vollant This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/unzip/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/unzip/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/unzip/src/ioapi.c --- a/openenvutils/commandshell/shell/commands/unzip/src/ioapi.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/unzip/src/ioapi.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,10 +1,27 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* ioapi.c -- IO base function header for compress/uncompress .zip files using zlib + zip or unzip API Version 1.01e, February 12th, 2005 - Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. - + Copyright (C) 1998-2005 Gilles Vollant */ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/unzip/src/miniunz.c --- a/openenvutils/commandshell/shell/commands/unzip/src/miniunz.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/unzip/src/miniunz.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,8 +1,25 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* miniunz.c Version 1.01e, February 12th, 2005 - Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved. Copyright (C) 1998-2005 Gilles Vollant */ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/unzip/src/unzip.c --- a/openenvutils/commandshell/shell/commands/unzip/src/unzip.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/unzip/src/unzip.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,8 +1,25 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* unzip.c -- IO for uncompress .zip files using zlib Version 1.01e, February 12th, 2005 - Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. - + Copyright (C) 1998-2005 Gilles Vollant Read unzip.h for more info diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/zip/group/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/zip/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/zip/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/zip/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/zip/inc/zip.h --- a/openenvutils/commandshell/shell/commands/zip/inc/zip.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/zip/inc/zip.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,24 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* zip.h -- IO for compress .zip files using zlib Version 1.01e, February 12th, 2005 - Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. Copyright (C) 1998-2005 Gilles Vollant diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/zip/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/commands/zip/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/zip/src/ioapi.c --- a/openenvutils/commandshell/shell/commands/zip/src/ioapi.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/zip/src/ioapi.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,10 +1,27 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* ioapi.c -- IO base function header for compress/uncompress .zip files using zlib + zip or unzip API Version 1.01e, February 12th, 2005 - Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. - + Copyright (C) 1998-2005 Gilles Vollant */ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/zip/src/minizip.c --- a/openenvutils/commandshell/shell/commands/zip/src/minizip.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/zip/src/minizip.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,9 +1,24 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + /* minizip.c Version 1.01e, February 12th, 2005 - Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved. - Copyright (C) 1998-2005 Gilles Vollant */ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/commands/zip/src/zip.c --- a/openenvutils/commandshell/shell/commands/zip/src/zip.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/zip/src/zip.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,10 +1,26 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + /* zip.c -- IO on .zip files using zlib Version 1.01e, February 12th, 2005 27 Dec 2004 Rolf Kalbermatter Modification to zipOpen2 to support globalComment retrieval. - Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. Copyright (C) 1998-2005 Gilles Vollant diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/group/distribution.policy.s60 --- a/openenvutils/commandshell/shell/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/.indent.pro --- a/openenvutils/commandshell/shell/inc/.indent.pro Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/.indent.pro Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + --dont-format-comments --procnames-start-lines --no-parameter-indentation diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/distribution.policy.s60 --- a/openenvutils/commandshell/shell/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/errcount.h --- a/openenvutils/commandshell/shell/inc/errcount.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/errcount.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,1 +1,18 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #define ERRCOUNT 124 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/poll.h --- a/openenvutils/commandshell/shell/inc/poll.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/poll.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,22 @@ +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + /*- * Copyright (c) 1997 Peter Wemm * All rights reserved. @@ -24,7 +43,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $ */ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/rlimits.h --- a/openenvutils/commandshell/shell/inc/rlimits.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/rlimits.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ /** rlimits.h **/ /** architecture-customized limits for zsh **/ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/sigcount.h --- a/openenvutils/commandshell/shell/inc/sigcount.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/sigcount.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,2 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #define SIGCOUNT 31 #define sigmsg(sig) ((sig) <= SIGCOUNT ? sig_msg[sig] : "unknown signal") diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/tcp.h --- a/openenvutils/commandshell/shell/inc/tcp.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/tcp.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,21 @@ -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * tcp.h - builtin FTP client * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/termios.h --- a/openenvutils/commandshell/shell/inc/termios.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/termios.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -//termios.h -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /*- * Copyright (c) 1988, 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/version.h --- a/openenvutils/commandshell/shell/inc/version.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/version.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,1 +1,18 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #define ZSH_VERSION "4.2.6" diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/zle_widget.h --- a/openenvutils/commandshell/shell/inc/zle_widget.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/zle_widget.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ /** zle_widget.h **/ /** indices of and pointers to internal widgets **/ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/zshpaths.h --- a/openenvutils/commandshell/shell/inc/zshpaths.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/zshpaths.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #define MODULE_DIR "/usr/local/lib/zsh/4.2.6" #define SITEFPATH_DIR "/usr/local/share/zsh/site-functions" #define FPATH_DIR "/usr/local/share/zsh/4.2.6/functions" diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/inc/zshxmods.h --- a/openenvutils/commandshell/shell/inc/zshxmods.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/inc/zshxmods.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #define LINKED_XMOD_zshQsmain 1 #ifdef DYNAMIC # define UNLINKED_XMOD_zshQsrlimits 1 diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/builtin.c --- a/openenvutils/commandshell/shell/src/builtin.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/builtin.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,20 @@ -//builtin.c - builtin commands -// -// © Portions Copyright (c) Symbian Software Ltd 2007 - 2008. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/builtins/distribution.policy.s60 --- a/openenvutils/commandshell/shell/src/builtins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/builtins/rlimits.c --- a/openenvutils/commandshell/shell/src/builtins/rlimits.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/builtins/rlimits.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -//rlimits.c - resource limit builtins -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/builtins/sched.c --- a/openenvutils/commandshell/shell/src/builtins/sched.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/builtins/sched.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// sched.c - execute commands at scheduled times -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/compat.c --- a/openenvutils/commandshell/shell/src/compat.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/compat.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,21 @@ -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * compat.c - compatibility routines for the deprived * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/exec.c --- a/openenvutils/commandshell/shell/src/exec.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/exec.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// exec.c - command execution -// -// © Portions Copyright (c) Symbian Software Ltd 2007 - 2008. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/glob.c --- a/openenvutils/commandshell/shell/src/glob.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/glob.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -//glob.c - filename generation -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/hashtable.c --- a/openenvutils/commandshell/shell/src/hashtable.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/hashtable.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -//hashtable.c - hash tables -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/hist.c --- a/openenvutils/commandshell/shell/src/hist.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/hist.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -//hist.c - history expansion -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/init.c --- a/openenvutils/commandshell/shell/src/init.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/init.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -//init.c - main loop and initialization routines -// -// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/input.c --- a/openenvutils/commandshell/shell/src/input.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/input.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -//input.c - read and store lines of input -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/jobs.c --- a/openenvutils/commandshell/shell/src/jobs.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/jobs.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// jobs.c - job control -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/lex.c --- a/openenvutils/commandshell/shell/src/lex.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/lex.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// lex.c - lexical analysis -// -// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/linklist.c --- a/openenvutils/commandshell/shell/src/linklist.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/linklist.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// linklist.c - linked lists -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/loop.c --- a/openenvutils/commandshell/shell/src/loop.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/loop.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// loop.c - loop execution -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/math.c --- a/openenvutils/commandshell/shell/src/math.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/math.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// math.c - mathematical expression evaluation -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/mem.c --- a/openenvutils/commandshell/shell/src/mem.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/mem.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// mem.c - memory management -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modentry.c --- a/openenvutils/commandshell/shell/src/modentry.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modentry.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #include "zsh.mdh" int setup_ _((Module)); diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/module.c --- a/openenvutils/commandshell/shell/src/module.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/module.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// module.c - deal with dynamic modules -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/cap.c --- a/openenvutils/commandshell/shell/src/modules/cap.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/cap.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// cap.c - POSIX.1e (POSIX.6) capability set manipulation -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/clone.c --- a/openenvutils/commandshell/shell/src/modules/clone.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/clone.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,8 +1,22 @@ #ifndef __SYMBIAN32__ -// clone.c - start a forked instance of the current shell on a new terminal -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/datetime.c --- a/openenvutils/commandshell/shell/src/modules/datetime.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/datetime.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// datetime.c - parameter interface to langinfo via curses -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/distribution.policy.s60 --- a/openenvutils/commandshell/shell/src/modules/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/errnames.c --- a/openenvutils/commandshell/shell/src/modules/errnames.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/errnames.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ /** errnames.c **/ /** architecture-customized errnames.c for zsh **/ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/example.c --- a/openenvutils/commandshell/shell/src/modules/example.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/example.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// example.c - an example module for zsh -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/files.c --- a/openenvutils/commandshell/shell/src/modules/files.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/files.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// files.c - file operation builtins -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/langinfo.c --- a/openenvutils/commandshell/shell/src/modules/langinfo.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/langinfo.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// langinfo.c - parameter interface to langinfo via curses -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/mapfile.c --- a/openenvutils/commandshell/shell/src/modules/mapfile.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/mapfile.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// mapfile.c - associative array interface to external files -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/mathfunc.c --- a/openenvutils/commandshell/shell/src/modules/mathfunc.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/mathfunc.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// mathfunc.c - basic mathematical functions for use in math evaluations -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/parameter.c --- a/openenvutils/commandshell/shell/src/modules/parameter.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/parameter.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// parameter.c - parameter interface to zsh internals -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/socket.c --- a/openenvutils/commandshell/shell/src/modules/socket.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/socket.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// socket.c - Unix domain socket module -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/stat.c --- a/openenvutils/commandshell/shell/src/modules/stat.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/stat.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// stat.c - stat builtin interface to system call -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/system.c --- a/openenvutils/commandshell/shell/src/modules/system.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/system.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// sysread.c - interface to system read/write -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/tcp.c --- a/openenvutils/commandshell/shell/src/modules/tcp.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/tcp.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// tcp.c - TCP module -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/termcap.c --- a/openenvutils/commandshell/shell/src/modules/termcap.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/termcap.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// termcap.c - termcap manipulation through curses -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/terminfo.c --- a/openenvutils/commandshell/shell/src/modules/terminfo.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/terminfo.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// terminfo.c - parameter interface to terminfo via curses -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/zftp.c --- a/openenvutils/commandshell/shell/src/modules/zftp.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/zftp.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,21 @@ -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * zftp.c - builtin FTP client * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/zprof.c --- a/openenvutils/commandshell/shell/src/modules/zprof.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/zprof.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,21 @@ -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * zprof.c - a shell function profiling module for zsh * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/zpty.c --- a/openenvutils/commandshell/shell/src/modules/zpty.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/zpty.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,22 @@ #ifndef __SYMBIAN32__ -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * zpty.c - sub-processes with pseudo terminals * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/zselect.c --- a/openenvutils/commandshell/shell/src/modules/zselect.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/zselect.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,22 @@ // zselect.c - builtin support for select system call -// -// © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/modules/zutil.c --- a/openenvutils/commandshell/shell/src/modules/zutil.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/modules/zutil.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,8 +1,22 @@ #ifndef __SYMBIAN32__ -// zutil.c - misc utilities -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/options.c --- a/openenvutils/commandshell/shell/src/options.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/options.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// options.c - shell options -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/params.c --- a/openenvutils/commandshell/shell/src/params.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/params.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// params.c - parameters -// -// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/parse.c --- a/openenvutils/commandshell/shell/src/parse.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/parse.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// parse.c - parser -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/pattern.c --- a/openenvutils/commandshell/shell/src/pattern.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/pattern.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,6 +1,21 @@ -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * pattern.c - pattern matching * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/prompt.c --- a/openenvutils/commandshell/shell/src/prompt.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/prompt.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,5 @@ -// prompt.c - construct zsh prompts -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/signals.c --- a/openenvutils/commandshell/shell/src/signals.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/signals.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,5 @@ -// signals.c - signals handling code -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/signames.c --- a/openenvutils/commandshell/shell/src/signames.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/signames.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ /** signames.c **/ /** architecture-customized signames.c for zsh **/ diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/subst.c --- a/openenvutils/commandshell/shell/src/subst.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/subst.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,23 @@ -// subst.c - various substitutions -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// + +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/utils.c --- a/openenvutils/commandshell/shell/src/utils.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/utils.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// utils.c - miscellaneous utilities -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/src/watch.c --- a/openenvutils/commandshell/shell/src/watch.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/src/watch.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,8 +1,22 @@ #ifndef __SYMBIAN32__ -// watch.c - login/logout watching -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * This file is part of zsh, the Z shell. * diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/docs/Readme.txt --- a/openenvutils/commandshell/shell/test/docs/Readme.txt Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -Tests to be run (order does not matter) - -1) . ./zshtests_auto1.sh -2) . ./zshtests_auto2.sh -3) . ./greptest2.sh > greptest2.txt -4) . ./findtest1.sh > findtest1.txt - -5) . ./findtest2.sh > findtest2.txt -6) . ./findtest3.sh > findtest3.txt - -7) . ./greptest1.sh > greptest1.txt - - -Run Manually the following tests ( Do not redirect the output ) - -1. readtest_manual.sh -2. ls.sh -3) . ./externalcmd_test.sh - This test will not have any output, but should not hang the shell -4) zshtests_manual.sh -5) Enter atleast 10 commands at the zsh prompt and then execute . ./fctest_manual.sh diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/docs/distribution.policy.s60 --- a/openenvutils/commandshell/shell/test/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/group/distribution.policy.s60 --- a/openenvutils/commandshell/shell/test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/aliastest.sh --- a/openenvutils/commandshell/shell/test/scripts/aliastest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/aliastest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,17 +1,17 @@ -# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# +// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// init() { diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/autoloadtest.sh --- a/openenvutils/commandshell/shell/test/scripts/autoloadtest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/autoloadtest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/breaktest.sh --- a/openenvutils/commandshell/shell/test/scripts/breaktest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/breaktest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/cdtest1.sh --- a/openenvutils/commandshell/shell/test/scripts/cdtest1.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/cdtest1.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/cdtest2.sh --- a/openenvutils/commandshell/shell/test/scripts/cdtest2.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/cdtest2.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/continuetest.sh --- a/openenvutils/commandshell/shell/test/scripts/continuetest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/continuetest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/dirstest.sh --- a/openenvutils/commandshell/shell/test/scripts/dirstest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/dirstest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/distribution.policy.s60 --- a/openenvutils/commandshell/shell/test/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/dottest.sh --- a/openenvutils/commandshell/shell/test/scripts/dottest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/dottest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/evaltest.sh --- a/openenvutils/commandshell/shell/test/scripts/evaltest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/evaltest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/exittest.sh --- a/openenvutils/commandshell/shell/test/scripts/exittest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/exittest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/fctest.sh --- a/openenvutils/commandshell/shell/test/scripts/fctest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/fctest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/fctest_manual.sh --- a/openenvutils/commandshell/shell/test/scripts/fctest_manual.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/fctest_manual.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/findtest1.sh --- a/openenvutils/commandshell/shell/test/scripts/findtest1.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/findtest1.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/findtest2.sh --- a/openenvutils/commandshell/shell/test/scripts/findtest2.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/findtest2.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/findtest3.sh --- a/openenvutils/commandshell/shell/test/scripts/findtest3.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/findtest3.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/functionstest.sh --- a/openenvutils/commandshell/shell/test/scripts/functionstest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/functionstest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/greptest1.sh --- a/openenvutils/commandshell/shell/test/scripts/greptest1.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/greptest1.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/greptest2.sh --- a/openenvutils/commandshell/shell/test/scripts/greptest2.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/greptest2.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/ls.sh --- a/openenvutils/commandshell/shell/test/scripts/ls.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/ls.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,4 +1,21 @@ -#opyright (c) Symbian Software Ltd 2007. All rights reserved. +# +# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +# + + #!/home/guest/vinodp/local/bin/zsh ################################### # Test cases for internal commands# diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/miniziptest.sh --- a/openenvutils/commandshell/shell/test/scripts/miniziptest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/miniziptest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/printtest.sh --- a/openenvutils/commandshell/shell/test/scripts/printtest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/printtest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/pstest.sh --- a/openenvutils/commandshell/shell/test/scripts/pstest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/pstest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/pwdtest.sh --- a/openenvutils/commandshell/shell/test/scripts/pwdtest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/pwdtest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/readtest_manual.sh --- a/openenvutils/commandshell/shell/test/scripts/readtest_manual.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/readtest_manual.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/redirecttest.sh --- a/openenvutils/commandshell/shell/test/scripts/redirecttest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/redirecttest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ -# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/sanity_auto.sh --- a/openenvutils/commandshell/shell/test/scripts/sanity_auto.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/sanity_auto.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/setopttest.sh --- a/openenvutils/commandshell/shell/test/scripts/setopttest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/setopttest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/settest.sh --- a/openenvutils/commandshell/shell/test/scripts/settest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/settest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/shifttest.sh --- a/openenvutils/commandshell/shell/test/scripts/shifttest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/shifttest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/typesettest1.sh --- a/openenvutils/commandshell/shell/test/scripts/typesettest1.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/typesettest1.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/typesettest2.sh --- a/openenvutils/commandshell/shell/test/scripts/typesettest2.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/typesettest2.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/unhashtest.sh --- a/openenvutils/commandshell/shell/test/scripts/unhashtest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/unhashtest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/unsetopttest.sh --- a/openenvutils/commandshell/shell/test/scripts/unsetopttest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/unsetopttest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/unsettest.sh --- a/openenvutils/commandshell/shell/test/scripts/unsettest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/unsettest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/unziptest.sh --- a/openenvutils/commandshell/shell/test/scripts/unziptest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/unziptest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/util_dot1.sh --- a/openenvutils/commandshell/shell/test/scripts/util_dot1.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/util_dot1.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/util_set17.sh --- a/openenvutils/commandshell/shell/test/scripts/util_set17.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/util_set17.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/util_source.sh --- a/openenvutils/commandshell/shell/test/scripts/util_source.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/util_source.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/whencetest.sh --- a/openenvutils/commandshell/shell/test/scripts/whencetest.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/whencetest.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/zshtests_auto1.sh --- a/openenvutils/commandshell/shell/test/scripts/zshtests_auto1.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/zshtests_auto1.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/zshtests_auto2.sh --- a/openenvutils/commandshell/shell/test/scripts/zshtests_auto2.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/zshtests_auto2.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/scripts/zshtests_manual.sh --- a/openenvutils/commandshell/shell/test/scripts/zshtests_manual.sh Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/commandshell/shell/test/scripts/zshtests_manual.sh Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,7 @@ # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/commandshell/shell/test/src/distribution.policy.s60 --- a/openenvutils/commandshell/shell/test/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/group/distribution.policy.s60 --- a/openenvutils/telnetserver/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/group/oetools_telnetd.mrp diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/inc/distribution.policy.s60 --- a/openenvutils/telnetserver/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/inc/telnetd.h --- a/openenvutils/telnetserver/inc/telnetd.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/inc/telnetd.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,23 @@ //telnetd.h // -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/inc/termios.h --- a/openenvutils/telnetserver/inc/termios.h Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/inc/termios.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -//termios.h -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /*- * Copyright (c) 1988, 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/authenc.c --- a/openenvutils/telnetserver/src/authenc.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/authenc.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// authenc.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/distribution.policy.s60 --- a/openenvutils/telnetserver/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/global.c --- a/openenvutils/telnetserver/src/global.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/global.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// global.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/mini_inetd.c --- a/openenvutils/telnetserver/src/mini_inetd.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/mini_inetd.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// mini_inetd.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1995 - 2001 Kungliga Tekniska Hgskolan * (Royal Institute of Technology, Stockholm, Sweden). diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/slc.c --- a/openenvutils/telnetserver/src/slc.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/slc.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// slc.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/state.c --- a/openenvutils/telnetserver/src/state.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/state.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// state.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/sys_term.c --- a/openenvutils/telnetserver/src/sys_term.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/sys_term.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// sys_term.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/telnetd.c --- a/openenvutils/telnetserver/src/telnetd.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/telnetd.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// telnetd.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/termstat.c --- a/openenvutils/telnetserver/src/termstat.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/termstat.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// termstat.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/src/utility.c --- a/openenvutils/telnetserver/src/utility.c Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/src/utility.c Thu Jun 24 13:52:58 2010 +0100 @@ -1,7 +1,21 @@ -// utility.c -// -// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved. -// +/* +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/test/group/distribution.policy.s60 --- a/openenvutils/telnetserver/test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -3 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 openenvutils/telnetserver/test/group/ethernetced_dynamicIP.xml --- a/openenvutils/telnetserver/test/group/ethernetced_dynamicIP.xml Mon Feb 08 13:38:38 2010 +0000 +++ b/openenvutils/telnetserver/test/group/ethernetced_dynamicIP.xml Thu Jun 24 13:52:58 2010 +0100 @@ -1,9 +1,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/data/ssyreferenceconfig.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/data/ssyreferenceconfig.xml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,48 @@ +// bld.inf + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +PRJ_PLATFORMS + DEFAULT + +PRJ_EXPORTS + ssyreference.iby /epoc32/rom/include/ssyreference.iby + + // Export config to SensorServers private folder. + // For emulator use. + ../data/ssyreferenceconfig.xml /epoc32/release/winscw/udeb/z/refssy/ssyreferenceconfig.xml + ../data/ssyreferenceconfig.xml /epoc32/release/winscw/urel/z/refssy/ssyreferenceconfig.xml + + // For hardware use. + ../data/ssyreferenceconfig.xml /epoc32/data/z/refssy/ssyreferenceconfig.xml + +#ifdef SYMBIAN_OLD_EXPORT_LOCATION + ../inc/ssyreferenceaccelerometer.h /epoc32/include/sensors/channels/ssyreferenceaccelerometer.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION + ../inc/ssyreferencemagnetometer.h /epoc32/include/sensors/channels/ssyreferencemagnetometer.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION + ../inc/ssyreferenceorientation.h /epoc32/include/sensors/channels/ssyreferenceorientation.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION + ../inc/ssyreferenceproximity.h /epoc32/include/sensors/channels/ssyreferenceproximity.h +#endif + +PRJ_MMPFILES + ssyreferenceplugin.mmp diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/group/ssyreference.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/group/ssyreference.iby Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,27 @@ +// ssyreference.iby + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +#ifndef SSYREFERENCE_IBY +#define SSYREFERENCE_IBY + +#include + +ECOM_PLUGIN(ssyreferenceplugin.dll, ssyreferenceplugin.rsc) +data=DATAZ_\refssy\ssyreferenceconfig.xml \refssy\ssyreferenceconfig.xml +#endif // SSYREFERENCE_IBY diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/group/ssyreferenceplugin.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/group/ssyreferenceplugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,58 @@ +// ssyreferenceplugin.mmp + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +#include + +TARGET ssyreferenceplugin.dll +TARGETTYPE plugin +VENDORID 0x70000001 + +// ECom Dll recognition UID followed by the unique UID for this dll +UID 0x10009D8D 0x10205089 + +CAPABILITY SENSOR_PLUGIN_CAPABILITIES + +SOURCEPATH ../src +SOURCE ssyreferencechanneldataprovider.cpp +SOURCE ssyreferencecontrol.cpp +SOURCE ssyreferencepropertyprovider.cpp +SOURCE ssyreferencechannel.cpp +SOURCE ssyreferenceconfig.cpp +SOURCE ssyreferencecmdhandler.cpp +SOURCE ecomentrypoint.cpp + +USERINCLUDE ../src + +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/ecom +SYSTEMINCLUDE /epoc32/include/sensors +SYSTEMINCLUDE /epoc32/include/sensors/spi +SYSTEMINCLUDE /epoc32/include/sensors/channels + +// The resource name should have to be same as the third UID above +START RESOURCE ../src/10205089.rss +TARGET ssyreferenceplugin.rsc +END + +LIBRARY euser.lib +LIBRARY ecom.lib +LIBRARY sensrvutil.lib +LIBRARY xmlparser.lib // for XML parser +LIBRARY efsrv.lib +LIBRARY xmldom.lib diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/group/syslibs_sensors_ssyreference.history.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/group/syslibs_sensors_ssyreference.history.xml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,21 @@ + + + + Referencey SSY for testing the Sensors Framework. + + + + + Update to Sensors framework as part of the Core OS 2 project. + + + + + + Adding Reference SSY to Symbian OS as part of the Core OS 2 project. + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/group/syslibs_sensors_ssyreference.mrp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/group/syslibs_sensors_ssyreference.mrp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,10 @@ +component syslibs_sensors_ssyreference + +source \sf\mw\appsupport\sensorsupport\testsensor + +exports \sf\mw\appsupport\sensorsupport\testsensor\group +binary \sf\mw\appsupport\sensorsupport\testsensor\group all + +notes_source \component_defs\release.src + +ipr T diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/inc/ssyreferenceaccelerometer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/inc/ssyreferenceaccelerometer.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,256 @@ +// ssyreferenceaccelerometer.h + +/* +* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalAll Sensor framework Reference SSY header file + @test +*/ + + +#ifndef SSYREFERENCEACCELEROMETER_H +#define SSYREFERENCEACCELEROMETER_H + +// INCLUDES +#include +#include + + +// ACCELEROMETER RELATED CHANNELS + +/** +* - Name: Accelerometer XYZ-axis data channel type +* - Type: Rawdata +* - Datatype: TSensrvAccelerometerAxisData +* - Description: Accelerometer x-, y-, z-axis data +*/ +const TSensrvChannelTypeId KSensrvChannelTypeIdAccelerometerXYZAxisData = 0x1020507E; + +// ACCELEROMETER RELATED PROPERTIES + +/** +* - Name: Axis active +* - Type: TInt +* - Scope: Channel item property +* - Mandatory: No +* - Capability: None +* - Description: Indicates is sensor axis activated. +* Value is one if the axis is activated, zero otherwise. +*/ +const TSensrvPropertyId KSensrvPropIdAxisActive = 0x00001001; + +/** +* - Name: Axis threshold value +* - Type: TReal +* - Scope: Channel item property +* - Mandatory: No +* - Capability: None +* - Description: Threshold value for a sensor channel +*/ +const TSensrvPropertyId KSensrvPropIdAxisThresholdValue = 0x00001002; + +// ACCELEROMETER RELATED DATATYPES + +/** +* Accelerometer axis data type +*/ +class TSensrvAccelerometerAxisData + { +public: + /** + * Channel data type Id number + */ + static const TSensrvChannelDataTypeId KDataTypeId = 0x1020507E; + + /** + * Channel data type index numbers + */ + enum TSensrvAccelerometerAxisDataIndexes + { + ETimeStamp = 0, + EAxisX, + EAxisY, + EAxisZ + }; + +public: + /** + * - Item name: Sampling time. + * - Item Index: 0 + * - Conditions: None + * - Description: Timestamp for a sample. + */ + TTime iTimeStamp; + + /** + * - Item name: Accelerometer x-axis + * - Item Index: 1 + * - Conditions: Single limit and range + * - Description: Accelerometer values from x-axis + */ + TInt iAxisX; + + /** + * - Item name: Accelerometer y-axis + * - Item Index: 2 + * - Conditions: Single limit and range + * - Description: Accelerometer values from y-axis + */ + TInt iAxisY; + + /** + * - Item name: Accelerometer z-axis + * - Item Index: 3 + * - Conditions: Single limit and range + * - Description: Accelerometer values from z-axis + */ + TInt iAxisZ; + }; + + +// TAPPING RELATED CHANNELS + +/** +* - Name: Wakeup event channel type +* - Type: Event +* - Datatype: TSensrvTappingData +* - Description: Wakeup events +*/ +const TSensrvChannelTypeId KSensrvChannelTypeIdAccelerometerWakeupData = 0x1020507F; + +/** +* - Name: Double tapping event channel type +* - Type: Event +* - Datatype: TSensrvTappingData +* - Description: Double tapping events +*/ +const TSensrvChannelTypeId KSensrvChannelTypeIdAccelerometerDoubleTappingData = 0x10205081; + +// TAPPING RELATED PROPERTIES + +/** +* - Name: Tapping axis active +* - Type: TInt +* - Scope: Channel item property +* - Mandatory: No +* - Capability: None +* - Description: Indicates is sensor axis activated. +* Value is one if the axis is activated, zero otherwise. +*/ +const TSensrvPropertyId KSensrvPropIdTappingAxisActive = 0x00001001; + +/** +* - Name: Tapping axis threshold value +* - Type: TReal +* - Scope: Channel item property +* - Mandatory: No +* - Capability: None +* - Description: Threshold value for a sensor channel +*/ +const TSensrvPropertyId KSensrvPropIdTappingAxisThresholdValue = 0x00001002; + +/** +* - Name: Tap duration in milliseconds +* - Type: TInt +* - Scope: Channel property +* - Mandatory: No +* - Capability: None +* - Description: Tapping duration setting +*/ +const TSensrvPropertyId KSensrvPropIdTapDurationValue = 0x00001003; + +/** +* - Name: Double tap latency +* - Type: TInt +* - Scope: Channel property +* - Mandatory: No +* - Capability: None +* - Description: Double tap latency in milliseconds +*/ +const TSensrvPropertyId KSensrvPropIdDblTapLatency = 0x00001004; + +/** +* - Name: Double tap interval +* - Type: TInt +* - Scope: Channel property +* - Mandatory: No +* - Capability: None +* - Description: Double tap interval in milliseconds +*/ +const TSensrvPropertyId KSensrvPropIdDblTapInterval = 0x00001005; + + + +// TAPPING RELATED DATATYPES + +/** +* Direction of the tapping data. If direction (plus or minus) is not known, +* direction is, for example in x-axis case +* KSensrvAccelerometerDirectionXplus | KSensrvAccelerometerDirectionXminus +*/ +const TUint8 KSensrvAccelerometerDirectionXplus = 0x01; +const TUint8 KSensrvAccelerometerDirectionXminus = 0x02; +const TUint8 KSensrvAccelerometerDirectionYplus = 0x04; +const TUint8 KSensrvAccelerometerDirectionYminus = 0x08; +const TUint8 KSensrvAccelerometerDirectionZplus = 0x10; +const TUint8 KSensrvAccelerometerDirectionZminus = 0x20; + +/** +* Tapping data type +*/ +class TSensrvTappingData + { +public: + /** + * Channel data type Id number + */ + static const TSensrvChannelDataTypeId KDataTypeId = 0x1020507F; + + /** + * Channel data type index numbers + */ + enum TSensrvAccelerometerAxisDataIndexes + { + ETimeStamp = 0, + EDirection + }; + +public: + /** + * - Item name: Sampling time. + * - Item Index: 0 + * - Conditions: None + * - Description: Timestamp for a sample. + */ + TTime iTimeStamp; + + /** + * - Item name: Tapping direction bitmask + * - Item Index: 1 + * - Conditions: Binary + * - Description: Direction bitmask of the tapping event. + * See constant definitions above. + */ + TUint32 iDirection; + }; + +#endif //SSYREFERENCEACCELEROMETER_H diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/inc/ssyreferencemagnetometer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/inc/ssyreferencemagnetometer.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,170 @@ +// ssyreferencemagnetometer.h + +/* +* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalAll Sensor framework Reference SSY header file + @test +*/ + + +#ifndef SSYREFERENCEMAGNETOMETER_H +#define SSYREFERENCEMAGNETOMETER_H + +// INCLUDES +#include +#include + + +// MAGNETOMETER RELATED CHANNELS + +/** +* - Name: Magnetometer XYZ-axis data channel type +* - Type: Rawdata +* - Datatype: TSensrvMagnetometerAxisData +* - Description: Magnetometer x-, y-, z-axis data +*/ +const TSensrvChannelTypeId KSensrvChannelTypeIdMagnetometerXYZAxisData = 0x2000BEE0; + + +// MAGNETOMETER RELATED PROPERTIES + +/** +* - Name: Name of the property +* - Type: Defines type of the property (TInt/TReal/TBuf) +* - Scope: Defines a property scope. Property can be defined for a channel, +* for a specific item in a channel or for a server related to +* channel. +* - Mandatory: Defines is property mandatory +* - Capability: Capabilities needed to set this property +* - Description: Description of the property +*/ + +/** +* - Name: Auto calibration active +* - Type: TInt +* - Scope: Channel item property +* - Mandatory: No +* - Capability: None +* - Description: Indicates is auto calibration active. +* Value is one if calibration is activated, zero otherwise. +*/ +const TSensrvPropertyId KSensrvPropAutoCalibrationActive = 0x00001006; + +/** +* - Name: Calibration status +* - Type: TInt +* - Scope: Channel item property +* - Mandatory: No +* - Capability: None +* - Description: Indicates the calibration level. +* Calibration level scales between minimum and maximum value. +* Maximum indicates that calibration level is at its best +* level. Minimum indicates that calibration is undefined. +*/ +const TSensrvPropertyId KSensrvPropCalibrationLevel = 0x00001007; + +// MAGNETOMETER RELATED DATATYPES + +/** +* Magnetometer axis data type +*/ +class TSensrvMagnetometerAxisData + { +public: + /** + * Channel data type Id number + */ + static const TSensrvChannelDataTypeId KDataTypeId = 0x2000BEE0; + + /** + * Channel data type index numbers + */ + enum TSensrvMagnetometerAxisDataIndexes + { + ETimeStamp = 0, + EAxisX, + EAxisY, + EAxisZ + }; + +public: + + /** + * - Item name: Sampling time. + * - Item Index: 0 + * - Conditions: None + * - Description: Timestamp for a sample. + */ + TTime iTimeStamp; + + /** + * - Item name: Magnetometer x-axis + * - Item Index: 1 + * - Conditions: Single limit and range + * - Description: Magnetometer values from x-axis + */ + TInt iAxisXRaw; + + /** + * - Item name: Magnetometer y-axis + * - Item Index: 2 + * - Conditions: Single limit and range + * - Description: Magnetometer values from y-axis + */ + TInt iAxisYRaw; + + /** + * - Item name: Magnetometer z-axis + * - Item Index: 3 + * - Conditions: Single limit and range + * - Description: Magnetometer values from z-axis + */ + TInt iAxisZRaw; + + /** + * - Item name: Magnetometer x-axis + * - Item Index: 1 + * - Conditions: Single limit and range + * - Description: Magnetometer values from x-axis + */ + TInt iAxisXCalibrated; + + /** + * - Item name: Magnetometer y-axis + * - Item Index: 2 + * - Conditions: Single limit and range + * - Description: Magnetometer values from y-axis + */ + TInt iAxisYCalibrated; + + /** + * - Item name: Magnetometer z-axis + * - Item Index: 3 + * - Conditions: Single limit and range + * - Description: Magnetometer values from z-axis + */ + TInt iAxisZCalibrated; + }; + +#endif //SSYREFERENCEMAGNETOMETER_H + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/inc/ssyreferenceorientation.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/inc/ssyreferenceorientation.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,172 @@ +// ssyreferenceorientation.h + +/* +* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalAll Sensor framework Reference SSY header file + @test +*/ + + +#ifndef SSYREFERENCEORIENTATION_H +#define SSYREFERENCEORIENTATION_H + +// INCLUDES +#include +#include + + +// ORIENTATION RELATED CHANNELS + +/** +* - Name: Orientation event channel type +* - Type: Event +* - Datatype: TSensrvOrientationData +* - Description: Orientation events +*/ +const TSensrvChannelTypeId KSensrvChannelTypeIdOrientationData = 0x10205088; + +/** +* - Name: Rotation event channel type +* - Type: Event +* - Datatype: TSensrvRotationData +* - Description: Rotation events +*/ +const TSensrvChannelTypeId KSensrvChannelTypeIdRotationData = 0x10205089; + +// ORIENTATION RELATED DATATYPES + +class TSensrvOrientationData + { +public: + /** + * Channel data type Id number + */ + static const TSensrvChannelDataTypeId KDataTypeId = 0x10205088; + + /** + * Channel data type index numbers + */ + enum TSensrvOrientationEventIndexes + { + ETimeStamp = 0, + EDeviceOrientation + }; + + /** + * Possible device orientations + */ + enum TSensrvDeviceOrientation + { + EOrientationUndefined = 0, + EOrientationDisplayUp, + EOrientationDisplayDown, + EOrientationDisplayLeftUp, + EOrientationDisplayRightUp, + EOrientationDisplayUpwards, + EOrientationDisplayDownwards + }; + +public: + + /** + * - Item name: Sampling time + * - Item Index: 0 + * - Description: Timestamp for a sample + */ + TTime iTimeStamp; + + /** + * - Item name: Device orientation + * - Item Index: 1 + * - Description: Contains one of the six basic orientations of the device + */ + TSensrvDeviceOrientation iDeviceOrientation; + }; + + +class TSensrvRotationData + { +public: + /** + * Channel data type Id number + */ + static const TSensrvChannelDataTypeId KDataTypeId = 0x10205089; + + /** + * Rotation axis value equals -1 when it cannot be defined. + * The undefined situation varies depending on the sensor type. + * In the case of an accelerometer, the rotation value cannot be defined + * when the corresponding axis is parallel to the gravitational force or + * the device is in motion. In the case of a magnetometer, there are + * difficulties in measuring values, when the axis is parallel to the + * magnetic field. + */ + static const TInt KSensrvRotationUndefined = -1; + + /** + * Channel data type index numbers + */ + enum TSensrvRotationDataIndexes + { + ETimeStamp = 0, + EDeviceRotationAboutXAxis, + EDeviceRotationAboutYAxis, + EDeviceRotationAboutZAxis, + }; + +public: + /** + * - Item name: Sampling time. + * - Item Index: 0 + * - Description: Timestamp for a sample + */ + TTime iTimeStamp; + + /** + * - Item name: Rotation about x-axis + * - Item Index: 1 + * - Description: Positive rotation in Cartesian coordinate system about the x-axis. + * If the value cannot be defined it is set to KSensrvRotationUndefined. + */ + TInt iDeviceRotationAboutXAxis; + + /** + * - Item name: Rotation about y-axis + * - Item Index: 2 + * - Description: Positive rotation in Cartesian coordinate system about the y-axis. + * If the value cannot be defined it is set to KSensrvRotationUndefined. + */ + TInt iDeviceRotationAboutYAxis; + + + /** + * - Item name: Rotation about z-axis + * - Item Index: 3 + * - Description: Positive rotation in Cartesian coordinate system about the z-axis. + * If the value cannot be defined it is set to KSensrvRotationUndefined. + */ + TInt iDeviceRotationAboutZAxis; + }; + +#endif //SSYREFERENCEORIENTATION_H + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/inc/ssyreferenceproximity.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/inc/ssyreferenceproximity.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,101 @@ +// ssyreferenceproximity.h + +/* +* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalAll Sensor framework Reference SSY header file + @test +*/ + + +#ifndef SSYREFERENCEPROXIMITY_H +#define SSYREFERENCEPROXIMITY_H + +// INCLUDES +#include +#include + + +// PROXIMITY RELATED CHANNELS + +/** +* - Name: Proximity data channel +* - Type: Event +* - Datatype: TSensrvProximityMonitorData +* - Description: Proximity status +*/ +const TSensrvChannelTypeId KSensrvChannelTypeIdProximityMonitor = 0x2000E585; + +// PROXIMITY RELATED DATATYPES + +/** +* Proximity monitoring data type +*/ +class TSensrvProximityData + { +public: + /** + * Channel data type Id number + */ + static const TSensrvChannelDataTypeId KDataTypeId = 0x2000E585; + + /** + * Channel data type index numbers + */ + enum TSensrvProximityDataIndexes + { + ETimeStamp = 0, + EState + }; + + /** + * Possible values for proximito state + */ + enum TProximityState + { + EProximityUndefined = 0, + EProximityIndiscernible, + EProximityDiscernible + }; + +public: + + /** + * - Item name: Sampling time. + * - Item Index: 0 + * - Conditions: None + * - Description: Timestamp for a sample. + */ + TTime iTimeStamp; + + /** + * - Item name: Proximity state + * - Item Index: 0 + * - Conditions: None + * - Description: - + */ + TProximityState iProximityState; + +}; + +#endif //SSYREFERENCEPROXIMITY_H + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/10205089.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/10205089.rss Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,80 @@ +// 10205089.rss + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +#include +#include + +// RESOURCE DEFINITIONS +// ----------------------------------------------------------------------------- +// +// Declares info for SSYReference ECom plugin +// +// ----------------------------------------------------------------------------- + +RESOURCE REGISTRY_INFO SSYReferencePlugin + { + // UID for the DLL. See ssyreferenceplugin.mmp + resource_format_version = RESOURCE_FORMAT_VERSION_2; + dll_uid = 0x10205089; + interfaces = + { + INTERFACE_INFO + { + // UID of interface that is implemented + interface_uid = KSsyControlInterfaceUid; + implementations = + { + BINARY_IMPLEMENTATION_INFO + { + implementation_uid = 0x10205088; + version_no = 1; + display_name = "SSYReferencePlugin"; + default_data = { + // Double tap channel + 0x01, // ChannelInfoVersion + 0x2E, // ChannelInfoLength + 0x1E, // Flags + 0x81, 0x50, 0x20, 0x10, // ChannelType + 0x02, 0x00, 0x00, 0x00, // ContextType + 0x0B, 0x00, 0x00, 0x00, // Quantity + 0x05, 0x4e, 0x6f, 0x4c, 0x6f, 0x63, // Location: NoLoc + 0x0C, 0x53, 0x73, 0x79, 0x52, 0x65, 0x66, 0x56, 0x65, 0x6E, 0x64, 0x6F, 0x72, // VendorId: SsyRefVendor + 0x7F, 0x50, 0x20, 0x10, // ChannelDataTypeId + 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // ChannelSecurityPolicy + + // Accelerometer channel + 0x01, // ChannelInfoVersion + 0x30, // ChannelInfoLength + 0x1E, // Flags + 0x7E, 0x50, 0x20, 0x10, // ChannelType + 0x02, 0x00, 0x00, 0x00, // ContextType + 0x0A, 0x00, 0x00, 0x00, // Quantity + 0x07, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x25, 0x64, // Location + 0x0C, 0x53, 0x73, 0x79, 0x52, 0x65, 0x66, 0x56, 0x65, 0x6E, 0x64, 0x6F, 0x72, // VendorId: SsyRefVendor + 0x7E, 0x50, 0x20, 0x10, // ChannelDataTypeId + 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF // ChannelSecurityPolicy + + }; + opaque_data = {}; + } + }; + } + }; + } + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ecomentrypoint.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ecomentrypoint.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,40 @@ +// ecomentrypoint.cpp + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + + +// INCLUDE FILES +#include +#include +#include "ssyreferencecontrol.h" + +// Define the interface UIDs +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_PROXY_ENTRY( 0x10205088, + CSsyReferenceControl::NewL ) + }; + +// The one and only exported function that is the ECom entry point +EXPORT_C const TImplementationProxy* ImplementationGroupProxy + (TInt& aTableCount) + { + aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy ); + + return ImplementationTable; + } diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencechannel.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencechannel.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,443 @@ +// ssyreferencechannel.cpp + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +#include // MSsyCallback +#include "ssyreferencechannel.h" +#include "ssyreferencecontrol.h" // SSY Control +#include "ssyreferencepropertyprovider.h" // iChannelPropertyProvider +#include "ssyreferencechanneldataprovider.h" // iChannelDataProvider +#include "ssyreferencetrace.h" +#include "ssyreferencecmdhandler.h" + + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel C++ constructor +// --------------------------------------------------------------------------- +// +CSsyReferenceChannel::CSsyReferenceChannel( CSsyReferenceControl& aSsyControl, TSensrvChannelInfo aChannelInfo ) : + iSsyControl( aSsyControl ), + iChannelInfo( aChannelInfo ), + iState( ESsyReferenceChannelIdle ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::CSsyReferenceChannel()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::CSsyReferenceChannel() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// Symbian 2nd phase constructor +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannel::ConstructL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ConstructL()" ) ) ); + + // Create command handler + iCmdHandler = CSsyReferenceCmdHandler::NewL( *this ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ConstructL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::NewL +// --------------------------------------------------------------------------- +// +CSsyReferenceChannel* CSsyReferenceChannel::NewL( CSsyReferenceControl& aSsyControl, TSensrvChannelInfo aChannelInfo ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::NewL()" ) ) ); + CSsyReferenceChannel* self = new ( ELeave ) CSsyReferenceChannel( aSsyControl, aChannelInfo ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::NewL() - return" ) ) ); + return self; + } + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CSsyReferenceChannel::~CSsyReferenceChannel() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::~CSsyReferenceChannel()" ) ) ); + + // In case channel is not closed before destruction, providers are not deleted + if ( iChannelDataProvider ) + { + delete iChannelDataProvider; + iChannelDataProvider = NULL; + } + + if ( iChannelPropertyProvider ) + { + delete iChannelPropertyProvider; + iChannelPropertyProvider = NULL; + } + + if ( iCmdHandler ) + { + delete iCmdHandler; + iCmdHandler = NULL; + } + + iProperties.Reset(); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::~CSsyReferenceChannel() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::ChannelId +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceChannel::ChannelId() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ChannelId() - %i" ), iChannelInfo.iChannelId ) ); + return iChannelInfo.iChannelId; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::SsyControl +// --------------------------------------------------------------------------- +// +CSsyReferenceControl& CSsyReferenceChannel::SsyControl() const + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::SsyControl()" ) ) ); + return iSsyControl; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::SsyCmdHandler +// --------------------------------------------------------------------------- +// +CSsyReferenceCmdHandler& CSsyReferenceChannel::CommandHandler() const + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::SsyCmdHandler()" ) ) ); + return *iCmdHandler; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::FindPropertyL +// --------------------------------------------------------------------------- +// +TSensrvProperty& CSsyReferenceChannel::FindPropertyL( + const TSensrvPropertyId aPropertyId, + TInt aItemIndex, + TInt aArrayIndex ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::FindPropertyL()" ) ) ); + TSensrvProperty* property = NULL; + TBool propertyFound( EFalse ); + + // Search property + for ( TInt i = 0; i < iProperties.Count() && !propertyFound; i++ ) + { + property = static_cast( &iProperties[i] ); + + // Compare property IDs and array index + if ( property->GetPropertyId() == aPropertyId ) + { + // Compare item index if it is given + if ( ( KErrNotFound == aItemIndex ) || ( property->PropertyItemIndex() == aItemIndex ) ) + { + // Correct property ID is found, now check is it array type of property. + // Either array indexes must match or propertys array index has to be array info + if ( ( property->GetArrayIndex() == aArrayIndex ) || + ( ( property->GetArrayIndex() == ESensrvArrayPropertyInfo ) && + ( ESensrvSingleProperty == aArrayIndex ) ) ) + { + // Correct array index found + propertyFound = ETrue; + } + } + } + } + + // Leave if not found + if ( !propertyFound ) + { + iSsyControl.FindPropertyL( aPropertyId, aArrayIndex, *property ); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::FindPropertyL() - return" ) ) ); + return *property; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::FindAndUpdatePropertyL +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannel::FindAndUpdatePropertyL( const TSensrvProperty& aProperty ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::FindAndUpdatePropertyL()" ) ) ); + TBool propertyFound( EFalse ); + + // Search property + for ( TInt i = 0; i < iProperties.Count() && !propertyFound; i++ ) + { + // Compare property IDs + if ( iProperties[i].GetPropertyId() == aProperty.GetPropertyId() ) + { + // Compare item index if it is given + if ( ( KErrNotFound != aProperty.PropertyItemIndex() ) && + ( iProperties[i].PropertyItemIndex() == aProperty.PropertyItemIndex() ) ) + { + // Property found -> update if possible + if ( iProperties[i].ReadOnly() ) + { + User::Leave( KErrAccessDenied ); + } + // If modifiable, get type and update value + switch ( iProperties[i].PropertyType() ) + { + case ESensrvIntProperty: + { + TInt value( 0 ); + aProperty.GetValue( value ); + iProperties[i].SetValue( value ); + break; + } + case ESensrvRealProperty: + { + TReal value( 0 ); + aProperty.GetValue( value ); + iProperties[i].SetValue( (TReal) value ); + break; + } + case ESensrvBufferProperty: + { + TBuf8<20> propValue; + aProperty.GetValue( propValue ); + iProperties[i].SetValue( propValue ); + break; + } + default: + { + break; + } + } + propertyFound = ETrue; + } + } + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::FindPropertyL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::GetProperties +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannel::GetProperties( RSensrvPropertyList& aPropertyList ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::GetProperties()" ) ) ); + // Copy properties one by one to param aPropertyList + TInt propCount( iProperties.Count() ); + RSensrvPropertyList propList( propCount ); + + for ( TInt i = 0; i < propCount; i++ ) + { + propList.Append( iProperties[i] ); + } + + aPropertyList = propList; + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::GetProperties() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::UpdateState +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannel::UpdateState( const TSsyReferenceChannelState aNewState ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::UpdateState() - %i" ), aNewState ) ); + iState = aNewState; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::ProcessResponse +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannel::ProcessResponse( TSsyReferenceMsg* aMessage ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse()" ) ) ); + + if ( aMessage ) + { + switch ( aMessage->Function() ) + { + case ESsyReferenceOpenChannelResp: + { + // Open channel specific handling here + TRAPD( err, HandleOpenChannelRespL( aMessage->Error() ) ); + if ( KErrNone != err ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse() - Error opening channel: %i" ), err ) ); + } + break; + } + case ESsyReferenceDataItemReceived: + { + // Send data item to data provider + TRAPD( err, iChannelDataProvider->ChannelDataReceivedL( aMessage ) ); + if ( KErrNone != err ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse() - Error receiving data: %i" ), err ) ); + } + break; + } + case ESsyReferenceCloseChannelResp: + { + // Close channel specific handling here + HandleCloseChannelResp(); + break; + } + default: + { + // This command was not intended to process here, try Control class + iSsyControl.ProcessResponse( aMessage ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse() - Unknown function" ) ) ); + } + } + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::OpenChannel +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceChannel::OpenChannel() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::OpenChannel()" ) ) ); + + TInt err( KErrAlreadyExists ); + + // Check that this channel is not already open + if ( ESsyReferenceChannelIdle == iState ) + { + // Update state and issue request. Will continue in HandleOpenChannelResp + UpdateState( ESsyReferenceChannelOpening ); + + // Create message with function spesific information + // and pass it to command handler + err = iCmdHandler->ProcessCommand( TSsyReferenceMsg( ChannelId(), ESsyReferenceOpenChannel ) ); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::OpenChannel() - return" ) ) ); + return err; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::HandleOpenChannelResp +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannel::HandleOpenChannelRespL( const TInt aError ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::HandleOpenChannelResp()" ) ) ); + + // Open channel asynhronously and complete request with MSsyCallback::ChannelOpened() when + // channel is opened. + + // Create instance of the data provider of this channel + iChannelDataProvider = CSsyReferenceChannelDataProvider::NewL( *this ); + // Create instance of the property provider of this channel + iChannelPropertyProvider = CSsyReferencePropertyProvider::NewL( *this ); + + TInt error( aError ); + + // If channel opening succeeds, update state to Open + if ( KErrNone == aError ) + { + // Update state to Open + UpdateState( ESsyReferenceChannelOpen ); + // Get channel properties + TRAP( error, iSsyControl.SsyConfig().GetChannelPropertiesL( ChannelId(), iProperties ) ); + } + else + { + // Channel opening failed, back to idle + UpdateState( ESsyReferenceChannelIdle ); + } + + // Complete transaction + iSsyControl.SsyCallback().ChannelOpened( ChannelId(), + error, + iChannelDataProvider, + iChannelPropertyProvider ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::HandleOpenChannelResp() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::CloseChannel +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceChannel::CloseChannel() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::CloseChannel()" ) ) ); + + TInt err( KErrNotFound ); + + // Check that this channel is open + if ( ESsyReferenceChannelOpen == iState ) + { + // Update state and issue request. Will continue in HandleCloseChannelResp + UpdateState( ESsyReferenceChannelClosing ); + // Create message with function spesific information + // and pass it to command handler + err = iCmdHandler->ProcessCommand( TSsyReferenceMsg( ChannelId(), ESsyReferenceCloseChannel ) ); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::CloseChannel() - return" ) ) ); + return err; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannel::HandleCloseChannelResp +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannel::HandleCloseChannelResp() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::HandleCloseChannelResp()" ) ) ); + + // Close channel and complete request with MSsyCallback::ChannelClosed() when + // channel is closed. + + // Delete providers + delete iChannelDataProvider; + iChannelDataProvider = NULL; + + delete iChannelPropertyProvider; + iChannelPropertyProvider = NULL; + + // Update state to idle + UpdateState( ESsyReferenceChannelIdle ); + + // Reset properties + iProperties.Reset(); + + // Complete transaction + iSsyControl.SsyCallback().ChannelClosed( ChannelId() ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::HandleCloseChannelResp() - return" ) ) ); + } + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencechannel.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencechannel.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,228 @@ +// ssyreferencechannel.h + +/* +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalComponent +*/ + +#ifndef SSYREFERENCECHANNEL_H +#define SSYREFERENCECHANNEL_H + +#include +#include +#include "ssyreferenceconfig.h" + +class CSsyReferenceControl; +class CSsyReferenceChannelDataProvider; +class CSsyReferencePropertyProvider; +class CSsyReferenceCmdHandler; + +/** + * Main control class for SSY. Controls sensor basic functionality and provides mandatory + * ECOM interface specific things. + */ +class CSsyReferenceChannel : public CBase + { + +public: + + /** + * Enumeration of the state of this channel + */ + enum TSsyReferenceChannelState + { + ESsyReferenceChannelIdle, // Channel created, not opened + ESsyReferenceChannelOpening, // Processing channel opening + ESsyReferenceChannelOpen, // Channel is open + ESsyReferenceChannelReceiving, // Channel is receiving data + ESsyReferenceChannelClosing // Processing channel closing. After this state is idle + }; + +public: + + /** + * Two-phase constructor + * + * @param[in] aSsyControl Reference to SSY control instance. + * @param[in] aChannelInfo Information of this channel + * @return Pointer to created CSsyReferenceControl object + */ + static CSsyReferenceChannel* NewL( CSsyReferenceControl& aSsyControl, TSensrvChannelInfo aChannelInfo ); + + /** + * Virtual destructor + */ + virtual ~CSsyReferenceChannel(); + + /** + * Request for SSY to open a sensor channel asynchronously. + * Response to the request is delivered through MSsyCallback::ChannelOpened(). + * Initilizes SSY (and the sensor) to be ready for other control commands via + * data and property providers. Multiple OpenChannel()-requests can be + * active for different channels at the same time. + * + * @return Symbian error code + */ + TInt OpenChannel(); + + /** + * Request to close a sensor channel asynchronously. + * Response to the request is delivered through MSsyCallback::ChannelClosed(). + * Multiple CloseChannel()-requests can be active for different channels + * at the same time. + * + * @return Symbian error code + */ + TInt CloseChannel(); + + /** + * Returns ID of this channel + */ + TInt ChannelId(); + + /** + * Handles response directed to this channel + * + * @param[in] aMessage Contains information of the response + */ + void ProcessResponse( TSsyReferenceMsg* aMessage ); + + /** + * Updates the state of this channel + * + * @param[in] aNewState State to update this channel + */ + void UpdateState( const TSsyReferenceChannelState aNewState ); + + /** + * Reference to SsyControl + */ + CSsyReferenceControl& SsyControl() const; + + /** + * Reference to command handler + */ + CSsyReferenceCmdHandler& CommandHandler() const; + + /** + * Search property of given property id from the channel properties and + * returns reference to that. Leaves with KErrNotFound if property is not found + * + * @param[in] aPropertyId Property ID to locate + * @param[in] aItemIndex Item index if this search conserns specific property + * @param[in] aArrayIndex Indicates array index of property + */ + TSensrvProperty& FindPropertyL( const TSensrvPropertyId aPropertyId, + TInt aItemIndex = KErrNotFound, + TInt aArrayIndex = ESensrvSingleProperty ); + + /** + * Search property of given property id from the channel properties and + * update property values, if not read only + * + * @param[in] aProperty Property to find and update + */ + void FindAndUpdatePropertyL( const TSensrvProperty& aProperty ); + + + /** + * Copies properties to param PropertyList + * + * @param[in, out] aPropertyList List where to copy properties + */ + void GetProperties( RSensrvPropertyList& aPropertyList ); + +private: + + /** + * C++ constructor. + * + * @param[in] aSsyControl Reference to SSY Control instance. + * @param[in] aChannelInfo Information of this channel + */ + CSsyReferenceChannel( CSsyReferenceControl& aSsyControl, TSensrvChannelInfo aChannelInfo ); + + /** + * Symbian 2nd phase constructor. + */ + void ConstructL(); + + /** + * Handles response for OpenChannel and completes transaction by calling + * MSsyCallback::ChannelOpened + * + * @param[in] aError Error code indicating the channel opening status + */ + void HandleOpenChannelRespL( const TInt aError ); + + /** + * Handles response for CloseChannel and completes transaction by calling + * MSsyCallback::ChannelClosed + */ + void HandleCloseChannelResp(); + + /** + * Handles response for StartChannelData. Loops all channel data items and sends + * each item to ChannelDataProvider + */ + void HandleDataReceivedResp(); + +private: // data + + /** + * Reference to SSY Control to send responses to Sensor Server + */ + CSsyReferenceControl& iSsyControl; + + /** + * Pointer to CSsyReferenceChannelDataProvider owned by this channel + */ + CSsyReferenceChannelDataProvider* iChannelDataProvider; + + /** + * Pointer to CSsyReferencePropertyProvider owned by this channel + */ + CSsyReferencePropertyProvider* iChannelPropertyProvider; + + /** + * Pointer to command handler + */ + CSsyReferenceCmdHandler* iCmdHandler; + + /** + * Information of this channel + */ + TSensrvChannelInfo iChannelInfo; + + /** + * State of this channel. See CSsyReferenceChannel::TSsyReferenceChannelState + */ + TInt iState; + + /** + * Property list of this channel + */ + RSensrvPropertyList iProperties; + }; + +#endif // SSYREFERENCECHANNEL_H diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencechanneldataprovider.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencechanneldataprovider.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,269 @@ +// ssyreferencechanneldataprovider.cpp + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +#include "ssyreferencechanneldataprovider.h" +#include "ssyreferencetrace.h" +#include "ssyreferencechannel.h" +#include "ssyreferencecontrol.h" +#include "ssyreferencecmdhandler.h" +#include + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// CSsyReferenceChannelDataProvider C++ constructor +// --------------------------------------------------------------------------- +// +CSsyReferenceChannelDataProvider::CSsyReferenceChannelDataProvider( CSsyReferenceChannel& aChannel ) : + iChannel( aChannel ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::CSsyReferenceChannelDataProvider()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::CSsyReferenceChannelDataProvider() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// Symbian 2nd phase constructor +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannelDataProvider::ConstructL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ConstructL()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ConstructL() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// CSsyReferenceChannelDataProvider::NewL +// --------------------------------------------------------------------------- +// +CSsyReferenceChannelDataProvider* CSsyReferenceChannelDataProvider::NewL( CSsyReferenceChannel& aChannel ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::NewL()" ) ) ); + CSsyReferenceChannelDataProvider* self = new ( ELeave ) CSsyReferenceChannelDataProvider( aChannel ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::NewL() - return" ) ) ); + return self; + } + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CSsyReferenceChannelDataProvider::~CSsyReferenceChannelDataProvider() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::~CSsyReferenceChannelDataProvider()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::~CSsyReferenceChannelDataProvider() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannelDataProvider::StartChannelDataL +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannelDataProvider::StartChannelDataL( + const TSensrvChannelId aChannelId, + TUint8* aBuffer, + TInt aCount ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::StartChannelDataL()" ) ) ); + + if ( iChannel.ChannelId() != aChannelId ) + { + User::Leave( KErrNotFound ); + } + + // Store buffer pointer + iDataBuffer = aBuffer; + iMaxCount = aCount; + iDataCount = 0; + + // Udpate channel state + iChannel.UpdateState( CSsyReferenceChannel::ESsyReferenceChannelReceiving ); + + // Start receiving + iChannel.CommandHandler().ProcessCommand( TSsyReferenceMsg( aChannelId, ESsyReferenceStartChannelData ) ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::StartChannelDataL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannelDataProvider::StopChannelDataL +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannelDataProvider::StopChannelDataL( const TSensrvChannelId aChannelId ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::StopChannelDataL()" ) ) ); + + // Leave if wrong channel + if ( iChannel.ChannelId() != aChannelId ) + { + User::Leave( KErrNotFound ); + } + + // Udpate channel state + iChannel.UpdateState( CSsyReferenceChannel::ESsyReferenceChannelOpen ); + + // Stop receiving + iChannel.CommandHandler().ProcessCommand( TSsyReferenceMsg( aChannelId, ESsyReferenceStopChannelData ) ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::StopChannelDataL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannelDataProvider::ForceBufferFilledL +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannelDataProvider::ForceBufferFilledL( const TSensrvChannelId aChannelId ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ForceBufferFilledL()" ) ) ); + + // Leave if wrong channel + if ( iChannel.ChannelId() != aChannelId ) + { + User::Leave( KErrNotFound ); + } + + // Send current buffer. Channel keeps receiveing + SendBufferFilled(); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ForceBufferFilledL() - return" ) ) ); + } + +// ----------------------------------------------------------------------------- +// CSensrvTestCases::GetChannelDataProviderInterfaceL +// ----------------------------------------------------------------------------- +// +void CSsyReferenceChannelDataProvider::GetChannelDataProviderInterfaceL( TUid /*aInterfaceUid*/, + TAny*& aInterface ) + { + aInterface = NULL; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannelDataProvider::ChannelDataReceived +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannelDataProvider::ChannelDataReceivedL( TSsyReferenceMsg* aMessage ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ChannelDataReceived()" ) ) ); + + // Get base class from message + TSsyRefChannelDataBase* dataItemBase = aMessage->DataItem(); + + if ( !dataItemBase ) + { + User::Leave( KErrArgument ); + } + + // get size of the object + TInt size( dataItemBase->Size() ); + + // First, resolve data item type + switch ( dataItemBase->ChannelDataType() ) + { + case TSsyRefChannelDataBase::ESsyRefChannelTypeTapping: + { + // Cast data item base to tapping data item + TSsyRefChannelDataTapping* tappingData = static_cast( dataItemBase ); + TSensrvTappingData senSrvTapping; + senSrvTapping.iTimeStamp = tappingData->Timestamp(); + senSrvTapping.iDirection = tappingData->Direction(); + + // Add mapped data item into buffer + AddDataToBuffer( reinterpret_cast( &senSrvTapping ), size ); + break; + } + case TSsyRefChannelDataBase::ESsyRefChannelTypeAxis: + { + // Cast data item base to Axis data item + TSsyRefChannelDataAxis* axisData = static_cast( dataItemBase ); + TSensrvAccelerometerAxisData senSrvAxis; + senSrvAxis.iTimeStamp = axisData->Timestamp(); + senSrvAxis.iAxisX = axisData->XAxis(); + senSrvAxis.iAxisY = axisData->YAxis(); + senSrvAxis.iAxisZ = axisData->ZAxis(); + + // Add data to buffer + AddDataToBuffer( reinterpret_cast( &senSrvAxis ), size ); + break; + } + case TSsyRefChannelDataBase::ESsyRefChannelTypeProximity: + { + // Cast data item base to tapping data item + TSsyRefChannelDataProximity* proximityData = static_cast( dataItemBase ); + TSensrvProximityData senSrvProximity; + senSrvProximity.iProximityState = ( TSensrvProximityData::TProximityState ) proximityData->ProximityState(); + + // Add mapped data item into buffer + AddDataToBuffer( reinterpret_cast( &senSrvProximity ), size ); + break; + } + default: + { + // Unknown data item -> Leave + User::Leave( KErrUnknown ); + } + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ChannelDataReceived() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannelDataProvider::AddDataToBuffer +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannelDataProvider::AddDataToBuffer( TUint8* aData, const TInt aSize ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::AddDataToBuffer()" ) ) ); + // Write data to buffer. If buffer is full, send notification to SensorServer + + // Write data bytes one by one to buffer pointer. The actual buffer is in Sensor Server + for ( TInt i = 0; i < aSize; i++ ) + { + *iDataBuffer++ = *aData++; + } + + // Increase number of items count + iDataCount++; + + // Check is maximum data count received + if ( iDataCount == iMaxCount ) + { + // Send BufferFilled notification to Sensor server + SendBufferFilled(); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::AddDataToBuffer() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceChannelDataProvider::SendBufferFilled +// --------------------------------------------------------------------------- +// +void CSsyReferenceChannelDataProvider::SendBufferFilled() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::SendBufferFilled()" ) ) ); + // Send BufferFilled notification to Sensor server + iChannel.SsyControl().SsyCallback().BufferFilled( iChannel.ChannelId(), iDataCount, iDataBuffer, iMaxCount ); + iDataCount = 0; + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::SendBufferFilled() - return" ) ) ); + } + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencechanneldataprovider.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencechanneldataprovider.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,149 @@ +// ssyreferencechanneldataprovider.h + +/* +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalComponent +*/ + +#ifndef SSYREFERENCECHANNELDATAPROVIDER_H +#define SSYREFERENCECHANNELDATAPROVIDER_H + +#include + +class CSsyReferenceChannel; +class TSsyReferenceMsg; + +/** + * Channel data provider implementation. + */ +class CSsyReferenceChannelDataProvider : public CBase, public MSsyChannelDataProvider + { + +public: + + /** + * Two-phase constructor + * + * @param[in] aChannel Reference to channel this provider belongs to + * @return Pointer to created CSsyReferenceControl object + */ + static CSsyReferenceChannelDataProvider* NewL( CSsyReferenceChannel& aChannel ); + + /** + * Virtual destructor + */ + virtual ~CSsyReferenceChannelDataProvider(); + +// from base class MSsyChannelDataProvider + + /** + * From MSsyChannelDataProvider + * Starts asynchronous data listening. Multiple OpenChannel()-requests + * can be active for different channels at the same time. + * + * @param[in] aBuffer Pointer to a data buffer + * @param[in] aCount Indicates data buffer size as a count of the data objects. + */ + void StartChannelDataL( const TSensrvChannelId aChannelId, TUint8* aBuffer, TInt aCount ); + + /** + * From MSsyChannelDataProvider + * Stops asynchronous data listening. The data buffer is not valid after call of + * this function. + */ + void StopChannelDataL( const TSensrvChannelId aChannelId ); + + /** + * From MSsyChannelDataProvider + * Forces SSY to call BufferFilled() regardless of how many data items have been + * written to buffer. Even if no data items have yet been written, BufferFilled() + * must be called. + */ + void ForceBufferFilledL( const TSensrvChannelId aChannelId ); + + /** + * Returns a pointer to a specified interface - to allow future extension + * of this class without breaking binary compatibility + * + * @param aInterfaceUid Identifier of the interface to be retrieved + * @param aInterface A reference to a pointer that retrieves the specified interface. + */ + void GetChannelDataProviderInterfaceL( TUid aInterfaceUid, TAny*& aInterface ); + + /** + * Channel data item received + * + * @param[in] aMessage Contains channel item + */ + void ChannelDataReceivedL( TSsyReferenceMsg* aMessage ); + +private: + + /** + * C++ constructor. + * @param[in] aChannel Reference to channel this provider belongs to + */ + CSsyReferenceChannelDataProvider( CSsyReferenceChannel& aChannel ); + + /** + * Symbian 2nd phase constructor. + */ + void ConstructL(); + + /** + * Adds data into buffer. + * + *@param[in] aData Data to add to buffer + *@param[in] aSize Size of data + */ + void AddDataToBuffer( TUint8* aData, const TInt aSize ); + + /** + * Sends BufferFilled notification to MSsyCallback + */ + void SendBufferFilled(); + +private: // data + + /** + * Reference to channel for which this provider belongs to + */ + CSsyReferenceChannel& iChannel; + + /** + * Pointer to data buffer in Sensor Server side + */ + TUint8* iDataBuffer; + + /** + * Maximum requested data items + */ + TInt iMaxCount; + + /** + * Number of items in buffer + */ + TInt iDataCount; + }; + +#endif // SSYREFERENCECHANNELDATAPROVIDER_H diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencecmdhandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencecmdhandler.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,367 @@ +// ssyreferencecmdhandler.cpp + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +#include +#include "ssyreferencecmdhandler.h" +#include "ssyreferencecontrol.h" +#include "ssyreferencechannel.h" +#include "ssyreferencetrace.h" + +// ======== CONSTANTS ======== +const TInt KSsyRefShortDelay = 100; + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler C++ constructor +// --------------------------------------------------------------------------- +// +CSsyReferenceCmdHandler::CSsyReferenceCmdHandler( CSsyReferenceChannel& aSsyChannel ) : + CActive( EPriorityNormal ), + iSsyChannel( aSsyChannel ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::CSsyReferenceCmdHandler()" ) ) ); + CActiveScheduler::Add( this ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::CSsyReferenceCmdHandler() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// Symbian 2nd phase constructor +// --------------------------------------------------------------------------- +// +void CSsyReferenceCmdHandler::ConstructL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ConstructL()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ConstructL() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::NewL +// --------------------------------------------------------------------------- +// +CSsyReferenceCmdHandler* CSsyReferenceCmdHandler::NewL( CSsyReferenceChannel& aSsyChannel ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::NewL()" ) ) ); + CSsyReferenceCmdHandler* self = new ( ELeave ) CSsyReferenceCmdHandler( aSsyChannel ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::NewL() - return" ) ) ); + return self; + } + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CSsyReferenceCmdHandler::~CSsyReferenceCmdHandler() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::~CSsyReferenceCmdHandler()" ) ) ); + + if ( iMessage ) + { + // Send ProcessResponse + iMessage->SetError( KErrCancel ); + iSsyChannel.ProcessResponse( iMessage ); + delete iMessage; + iMessage = NULL; + } + + if ( iTimer ) + { + iTimer->Cancel(); + delete iTimer; + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::~CSsyReferenceCmdHandler() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::ProcessCommand +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceCmdHandler::ProcessCommand( TSsyReferenceMsg aMessage ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ProcessCommand()" ) ) ); + TInt err( KErrAlreadyExists ); + + // Special case, when channel is reciving, iMessage is not deleted after ProcessCommand + if ( aMessage.Function() == ESsyReferenceStopChannelData ) + { + // Stop 'receiving'. No need to handle this asynchronously + if ( iTimer ) + { + iTimer->Cancel(); + delete iTimer; + iTimer = NULL; + } + + iDataItemArray.Reset(); + iDataItemPtr = 0; + err = KErrNone; + // No need to send ProcessResponse either + delete iMessage; + iMessage = NULL; + } + else if ( !iMessage ) + { + iMessage = new TSsyReferenceMsg( aMessage ); + if(iMessage) + { + switch( aMessage.Function() ) + { + case ESsyReferenceStartChannelData: + { + // Get channel data items and start 'receiving' + IssueRequest(); + err = KErrNone; + break; + } + case ESsyReferenceOpenChannel: + { + // Open channel specific handling here + IssueRequest(); + err = KErrNone; + break; + } + case ESsyReferenceCloseChannel: + { + // Close channel specific handling here + IssueRequest(); + err = KErrNone; + break; + } + default: + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ProcessCommand() - Unknown function" ) ) ); + err = KErrNotFound; + } + } + } + else + { + err = KErrNoMemory; + } + } + else + { + err = KErrUnknown; + } + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ProcessCommand() - return" ) ) ); + return err; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::IssueRequest +// --------------------------------------------------------------------------- +// +void CSsyReferenceCmdHandler::IssueRequest( TInt aError ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::IssueRequest()" ) ) ); + // Provides synchronous function calls to be handled as asynchronous + if ( !IsActive() ) + { + TRequestStatus *s = &iStatus; + User::RequestComplete( s, aError ); + SetActive(); + } + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::IssueRequest() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::SendResponse +// --------------------------------------------------------------------------- +// +void CSsyReferenceCmdHandler::SendResponse( TInt aError ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::SendResponse()" ) ) ); + // Send response to channel + if ( iMessage ) + { + iMessage->SetError( aError ); + iSsyChannel.ProcessResponse( iMessage ); + delete iMessage; + iMessage = NULL; + } + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::SendResponse() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::RunL +// --------------------------------------------------------------------------- +// +void CSsyReferenceCmdHandler::RunL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::RunL() - %i" ), iStatus.Int() ) ); + + TInt err( iStatus.Int() ); + + if ( iMessage ) + { + switch( iMessage->Function() ) + { + case ESsyReferenceStartChannelData: + { + TInt startInterval( 0 ); + + // Get all Channel data information from config file + iSsyChannel.SsyControl().SsyConfig(). + GetChannelDataInformationL( iMessage->ChannelId(), iDataItemArray, startInterval ); + + // Check that channel data items were found + if ( iDataItemArray.Count() ) + { + // If interval is zero, set small interval + if ( startInterval == 0 ) + { + startInterval = KSsyRefShortDelay; + } + + // wait that interval + if ( iTimer ) + { + iTimer->Cancel(); + delete iTimer; + iTimer = NULL; + } + + // Reset pointer + iDataItemPtr = 0; + + // Start timer and continue processing in callback function + iTimer = CPeriodic::NewL( EPriorityNormal ); + iTimer->Start( startInterval * 1000, 0, TCallBack( DataItemCallback, this ) ); + } + break; + } + case ESsyReferenceOpenChannel: + { + // Open channel response specific handling here + iMessage->SetFunction( ESsyReferenceOpenChannelResp ); + SendResponse(); + break; + } + case ESsyReferenceCloseChannel: + { + // Close channel response specific handling here + iMessage->SetFunction( ESsyReferenceCloseChannelResp ); + SendResponse(); + break; + } + default: + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ProcessCommand() - Unknown function" ) ) ); + err = KErrNotFound; + } + } + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::RunL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::DoCancel +// --------------------------------------------------------------------------- +// +void CSsyReferenceCmdHandler::DoCancel() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::DoCancel()" ) ) ); + + // Handle cancel for this channel. Cancel any ongoing requests + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::DoCancel() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::RunError +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceCmdHandler::RunError( TInt /*aError*/ ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::RunError()" ) ) ); + + // Handle possible errors here and return KErrNone to prevent SSY from panic + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::RunError() - return" ) ) ); + return KErrNone; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::DataItemCallback +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceCmdHandler::DataItemCallback( TAny* aThis ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::DataItemCallback()" ) ) ); + return static_cast( aThis )->GenerateChannelDataItem(); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceCmdHandler::GenerateChannelDataItem +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceCmdHandler::GenerateChannelDataItem() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::GenerateChannelDataItem()" ) ) ); + + // Get next item from list and set pointer to next item + TSsyRefChannelDataBase dataItem = iDataItemArray[iDataItemPtr++]; + + // Get next item interval from data item + TInt nextInterval( dataItem.Interval() ); + + // Set timestamp to data item + TTime time; + time.HomeTime(); + dataItem.SetTimestamp( time ); + + // If interval is zero, set small interval + if ( nextInterval == 0 ) + { + nextInterval = KSsyRefShortDelay; + } + + // Add data item to message + iMessage->SetDataItem( &dataItem ); + + // If in last data item, set pointer back to first item + if ( iDataItemArray.Count() == iDataItemPtr ) + { + iDataItemPtr = 0; + } + + // Send response and start new timer + iMessage->SetFunction( ESsyReferenceDataItemReceived ); + iSsyChannel.ProcessResponse( iMessage ); + + if ( iTimer ) + { + delete iTimer; + iTimer = NULL; + } + + TRAP_IGNORE( iTimer = CPeriodic::NewL( EPriorityNormal ); + iTimer->Start( nextInterval * 1000, 0, TCallBack( DataItemCallback, this ) ); ) + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::GenerateChannelDataItem() - return" ) ) ); + return KErrNone; + } + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencecmdhandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencecmdhandler.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,147 @@ +// ssyreferencecmdhandler.h + +/* +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalComponent +*/ + +#ifndef SSYREFERENCECMDHANDLER_H +#define SSYREFERENCECMDHANDLER_H + +#include +#include "ssyreferenceconfig.h" + +// FORWARD DECLARATIONS +class CSsyReferenceChannel; + +/** + * Command handler class for handling commands of one channel. Each opened + * channel has its own instance of this class + */ +class CSsyReferenceCmdHandler : public CActive + { + +public: + + /** + * Two-phase constructor + * + * @param[in] aSsyChannel Reference to SSY Channel instance. + * @return Pointer to created CSsyReferenceCmdHandler object + */ + static CSsyReferenceCmdHandler* NewL( CSsyReferenceChannel& aSsyChannel ); + + /** + * Virtual destructor + */ + virtual ~CSsyReferenceCmdHandler(); + +// from base class CSsyControl + + /** + * Processes command specified in param aMessage. + * + * @param[in] aMessage Contains command information to process + * @return Symbian error code + */ + TInt ProcessCommand( TSsyReferenceMsg aMessage ); + + /** + * From CActive + */ + void RunL(); + + /** + * From CActive + */ + void DoCancel(); + + /** + * From CActive + */ + TInt RunError( TInt aError ); + + /** + * Callback function for DataItem generation + */ + static TInt DataItemCallback( TAny* aThis ); + + /** + * Handles data item generation. Called from DataItemCallback + */ + TInt GenerateChannelDataItem(); + +private: + + /** + * C++ constructor. + * + * @param[in] aSsyChannel Reference to SSY Channel instance. + */ + CSsyReferenceCmdHandler( CSsyReferenceChannel& aSsyChannel ); + + /** + * Symbian 2nd phase constructor. + */ + void ConstructL(); + + /** + * Makes synchronous calls asynchronous + */ + void IssueRequest( TInt aError = KErrNone ); + + /** + * Sends response to channel + */ + void SendResponse( TInt aError = KErrNone ); + +private: // data + + /** + * Reference to SSY Conrtol to send responses for commands + */ + CSsyReferenceChannel& iSsyChannel; + + /** + * Pointer to currently processing message + */ + TSsyReferenceMsg* iMessage; + + /** + * Data item array + */ + TSsyRefDataItemArray iDataItemArray; + + /** + * Pointer to next item to generate in iDataItemArray + */ + TInt iDataItemPtr; + + /** + * Periodic timer for generating channel data + */ + CPeriodic* iTimer; + }; + +#endif // SSYREFERENCECMDHANDLER_H + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferenceconfig.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferenceconfig.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,896 @@ +// ssyreferenceconfig.cpp + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ssyreferencecontrol.h" +#include "ssyreferenceconfig.h" +#include "ssyreferencetrace.h" + + +// ======== CONSTANTS ======= +_LIT( KSsyReferenceCfgFileOrig, "z:\\refssy\\ssyreferenceconfig.xml" ); +_LIT( KSsyReferenceCfgFileExt, "c:\\refssy\\ssyreferenceconfig.xml" ); + +// Config file definitions + +// Maximum attribute length +const TInt KSsyRefMaxAttribLength = 20; + +// TAG DEFINITIONS +_LIT( KSsyRefRootTag, "SsyReferenceConfig" ); // Ssy general information tag +_LIT( KSsyRefGeneralInfoTag, "SsyGeneralInformation" ); // Ssy general information tag +_LIT( KSsyRefChannelInfoGroupTag, "ChannelInformationGroup" ); // Channel information group tag +_LIT( KSsyRefChannelItemTag, "ChannelItem" ); // Channel item tag +_LIT( KSsyRefChannelDataTag, "ChannelData" ); // Channel data tag +_LIT( KSsyRefChannelDataItemTag, "ChannelDataItem" ); // Channel data item tag + +_LIT( KSsyRefProperties, "Properties" ); // Properties tag +_LIT( KSsyRefPropertyItem, "PropertyItem" ); // PropertyItem tag + +// Data item definitions +_LIT( KSsyRefAxisDataItemTag, "SsyRefChannelDataAxis" ); // SsyRefChannelDataAxis data item tag +_LIT( KSsyRefXAxis, "XAxis" ); // XAxis from SsyRefChannelDataAxis +_LIT( KSsyRefYAxis, "YAxis" ); // YAxis from SsyRefChannelDataAxis +_LIT( KSsyRefZAxis, "ZAxis" ); // ZAxis from SsyRefChannelDataAxis + +_LIT( KSsyRefTappingDataItemTag, "SsyRefChannelDataTapping" ); // SsyRefChannelDataTapping data item tag +_LIT( KSsyRefDirection, "Direction" ); // Direction from SsyRefChannelDataTapping + +_LIT( KSsyRefProximityDataItemTag, "SsyRefChannelDataProximity" ); // SsyRefChannelDataProximity data item tag +_LIT( KSsyRefProximityState, "ProximityState" ); // ProximityStatus from SsyRefChannelDataProximity + +// ATTRIBUTE DEFINITIONS +_LIT( KSsyRefChannelCount, "ChannelCount" ); // Channel count from ChannelInformationGroup +_LIT( KSsyRefChannelId, "ChannelId" ); // Channel ID from ChannelItem +_LIT( KSsyRefContextType, "ContextType" ); // Context type from ChannelItem +_LIT( KSsyRefQuantity, "Quantity" ); // Quantity from ChannelItem +_LIT( KSsyRefChannelType, "ChannelType" ); // ChannelType from ChannelItem +_LIT( KSsyRefLocation, "Location" ); // Location from ChannelItem +_LIT( KSsyRefVendorId, "Vendor" ); // Vendor from ChannelItem + + +// Channel data item specific attribute definitions +_LIT( KSsyRefStartInterval, "StartIntervalMs" ); // StartInterval from ChannelData +_LIT( KSsyRefDataItemCount, "count" ); // count from ChannelDataItem +_LIT( KSsyRefDataTypeID, "DataTypeId" ); // DataTypeId from ChannelDataItem +_LIT( KSsyRefInterval, "IntervalMs" ); // IntervalMs from ChannelDataItem + +// Property spesific attributes +_LIT( KSsyRefPropertyId, "PropertyId" ); // PropertyId from PropertyItem +_LIT( KSsyRefArrayIndex, "ArrayIndex" ); // ArrayIndex from PropertyItem +_LIT( KSsyRefItemIndex, "ItemIndex" ); // ItemIndex from PropertyItem +_LIT( KSsyRefPropertyValue, "PropertyValue" ); // PropertyValue from PorpertyItem +_LIT( KSsyRefPropertyType, "PropertyType" ); // PropertyType from PropertyItem +_LIT( KSsyRefMaxValue, "MaxValue" ); // MaxValue from PropertyItem +_LIT( KSsyRefMinValue, "MinValue" ); // MinValue from PorpertyItem +_LIT( KSsyRefReadOnly, "ReadOnly" ); // ReadOnly from PropertyItem + + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig C++ constructor +// --------------------------------------------------------------------------- +// +CSsyReferenceConfig::CSsyReferenceConfig() : + CActive( EPriorityMuchLess ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::CSsyReferenceConfig()" ) ) ); + CActiveScheduler::Add( this ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::CSsyReferenceConfig() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// Symbian 2nd phase constructor +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::ConstructL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ConstructL()" ) ) ); + // Create config file parser + iConfigParser = CMDXMLParser::NewL( this ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ConstructL() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::NewL +// --------------------------------------------------------------------------- +// +CSsyReferenceConfig* CSsyReferenceConfig::NewL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::NewL()" ) ) ); + CSsyReferenceConfig* self = new ( ELeave ) CSsyReferenceConfig(); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::NewL() - return" ) ) ); + return self; + } + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CSsyReferenceConfig::~CSsyReferenceConfig() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::~CSsyReferenceConfig()" ) ) ); + + if ( iConfigParser ) + { + delete iConfigParser; + iConfigParser = NULL; + } + + if ( iGenralInfoElement ) + { + delete iGenralInfoElement; + iGenralInfoElement = NULL; + } + + if ( iChannelGroupElement ) + { + delete iChannelGroupElement; + iChannelGroupElement = NULL; + } + + if ( iSsyReferenceConfig ) + { + delete iSsyReferenceConfig; + iSsyReferenceConfig = NULL; + } + + if ( iConfigFile ) + { + delete iConfigFile; + iConfigFile = NULL; + } + + iChannelPairArray.Reset(); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::~CSsyReferenceConfig() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::InitConfig +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::InitConfigL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::InitConfig()" ) ) ); + + // Open config file + RFs fileSession; + User::LeaveIfError( fileSession.Connect() ); + + // Locate extrenal file... + RFile file; + TInt err( file.Open( fileSession, KSsyReferenceCfgFileExt, EFileRead ) ); + file.Close(); + + // Check is external file found + if ( KErrNone == err ) + { + // Use SSY with external configuration + User::LeaveIfError( iConfigParser->ParseFile( fileSession, KSsyReferenceCfgFileExt ) ); + } + else + { + // Use SSY with original configuration + + // Start parsing file and wait notification to ParseFileCompleteL + // XML Parser takes ownership of the RFs and closes it when file is parsed + User::LeaveIfError( iConfigParser->ParseFile( fileSession, KSsyReferenceCfgFileOrig ) ); + } + + iConfigFileParsed = EFalse; + + // This active object has very low priority since XML parser uses Active objects also, + // so it is mandatory to let XML parser to complete sooner than this active object + IssueRequest(); + iSchedulerWait.Start(); // Blocks until file is parsed + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::InitConfig() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::IssueRequest +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::IssueRequest( TInt aError ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::IssueRequest()" ) ) ); + // Provides synchronous function calls to be handled as asynchronous + if ( !IsActive() ) + { + SetActive(); + TRequestStatus *s = &iStatus; + User::RequestComplete( s, aError ); + } + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::IssueRequest() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::RunL +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::RunL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::RunL() - %i" ), iStatus.Int() ) ); + + if ( iConfigFileParsed ) + { + // Stop blocking + iSchedulerWait.AsyncStop(); + } + else + { + // Continue RunL loop + IssueRequest(); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::RunL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::DoCancel +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::DoCancel() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::DoCancel()" ) ) ); + + // Stop blocking + iSchedulerWait.AsyncStop(); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::DoCancel() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::RunError +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceConfig::RunError( TInt /*aError*/ ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::RunError()" ) ) ); + + // Handle possible errors here and return KErrNone to prevent SSY from panic + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::RunError() - return" ) ) ); + return KErrNone; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::ParseFileCompleteL +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::ParseFileCompleteL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ParseFileCompleteL()" ) ) ); + // First get document + iConfigFile = iConfigParser->DetachXMLDoc(); + // Then get document element + CMDXMLElement* documentElement = iConfigFile->DocumentElement(); + // Get root element, 'SsyReferenceConfig' + iSsyReferenceConfig = documentElement->FirstChildOfType( KSsyRefRootTag ); + // Get gereral information element + iGenralInfoElement = iSsyReferenceConfig->FirstChildOfType( KSsyRefGeneralInfoTag ); + // Get channel information group element + iChannelGroupElement = iSsyReferenceConfig->FirstChildOfType( KSsyRefChannelInfoGroupTag ); + // Get channel count + iChannelCount = GetAttributeIntValue( *iChannelGroupElement, KSsyRefChannelCount ); + + // No need to delete documentElement, it is owned by iConfigFile. + documentElement = NULL; + iConfigFileParsed = ETrue; + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ParseFileCompleteL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GetAttributeIntValue +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceConfig::GetAttributeIntValue( CMDXMLElement& aElement, const TDesC& aAttrib ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeIntValue()" ) ) ); + COMPONENT_TRACE( ( _L( " Element: %s", aElement.NodeName() ) ) ); + COMPONENT_TRACE( ( _L( " Attribute: %s", aAttrib ) ) ); + + TInt intValue( 0 ); + + // Check availability + if ( aElement.IsAttributeSpecified( aAttrib ) ) + { + // Buffer to where to read value + TBufC buffer( KNullDesC ); + TPtrC ptr( buffer ); + + // Read attribute value + aElement.GetAttribute( aAttrib, ptr ); + + // Cast literal value into TInt + TLex lexValue( ptr ); + lexValue.Val( intValue ); + } + + COMPONENT_TRACE( ( _L( " IntValue: %i", intValue ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeIntValue() - return" ) ) ); + return intValue; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GetAttributeStrValue +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::GetAttributeStrValue( CMDXMLElement& aElement, const TDesC& aAttrib, TDes8& aTarget ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeStrValue()" ) ) ); + COMPONENT_TRACE( ( _L( " Element: %s", aElement.NodeName() ) ) ); + COMPONENT_TRACE( ( _L( " Attribute: %s", aAttrib ) ) ); + + // Check availability + if ( aElement.IsAttributeSpecified( aAttrib ) ) + { + // Buffer to where to read value + TBufC buffer( KNullDesC ); + TPtrC ptr( buffer ); + + // Read attribute value + aElement.GetAttribute( aAttrib, ptr ); + + // Copy string from 16-bit descriptor to 8-bit descriptor + aTarget.Copy( ptr ); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeStrValue() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GetAttributeHexValue +// --------------------------------------------------------------------------- +// +TUint CSsyReferenceConfig::GetAttributeHexValue( CMDXMLElement& aElement, const TDesC& aAttrib ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeHexValue()" ) ) ); + COMPONENT_TRACE( ( _L( " Element: %s", aElement.NodeName() ) ) ); + COMPONENT_TRACE( ( _L( " Attribute: %s", aAttrib ) ) ); + + TUint32 hexValue( 0 ); + + // Check availability + if ( aElement.IsAttributeSpecified( aAttrib ) ) + { + // Buffer to where to read value + TBufC buffer( KNullDesC ); + TPtrC ptr( buffer ); + + // Read attribute value + aElement.GetAttribute( aAttrib, ptr ); + + // Get bounded value and cast it into TUint32 (hex) + TRadix radix( EHex ); + TUint limit( 0xFFFFFFFF ); + + // Append string into Lex and skip first two characters, 0x + TLex lexValue( ptr ); + lexValue.Inc( 2 ); + + // Read value + lexValue.BoundedVal( hexValue, radix, limit ); + } + + COMPONENT_TRACE( ( _L( " HexValue: %x", hexValue ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeHexValue() - return" ) ) ); + return hexValue; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GetAttributeRealValue +// --------------------------------------------------------------------------- +// +TReal CSsyReferenceConfig::GetAttributeRealValue( CMDXMLElement& aElement, const TDesC& aAttrib ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeRealValue()" ) ) ); + COMPONENT_TRACE( ( _L( " Element: %s", aElement.NodeName() ) ) ); + COMPONENT_TRACE( ( _L( " Attribute: %s", aAttrib ) ) ); + + TReal realValue( 0 ); + + // Check availability + if ( aElement.IsAttributeSpecified( aAttrib ) ) + { + + // Buffer to where to read value + TBufC buffer( KNullDesC ); + TPtrC ptr( buffer ); + + // Read attribute value + aElement.GetAttribute( aAttrib, ptr ); + + // Cast literal value into TReal + TLex lexValue( ptr ); + TInt error = lexValue.Val( realValue ); + if( error!=KErrNone ) + { + realValue = error; + } + } + + COMPONENT_TRACE( ( _L( " IntValue: %i", realValue ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeRealValue() - return" ) ) ); + return realValue; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::ChannelCount +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceConfig::ChannelCount() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ChannelCount() - %i" ), iChannelCount ) ); + return iChannelCount; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GenerateChannels +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::GenerateChannels( RSensrvChannelInfoList& aChannelList ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GenerateChannels()" ) ) ); + + // Initialize channel pair array + TSsyRefChannelIdArray tempArray( iChannelCount ); + iChannelPairArray = tempArray; + + // Go through Channel group element and get all information + TSensrvChannelInfo channelInfo; + CMDXMLElement* channelElement = iChannelGroupElement->FirstChildOfType( KSsyRefChannelItemTag ); + + while( channelElement ) + { + // check is element correct type of node + if ( channelElement->NodeType() == CMDXMLNode::EElementNode ) + { + // read channel identifier + iChannelPairArray.Append( TSsyRefChannelIdPair( GetAttributeIntValue( *channelElement, KSsyRefChannelId ) ) ); + + // Read attributes + channelInfo.iContextType = ( TSensrvContextType ) GetAttributeIntValue( *channelElement, KSsyRefContextType ); + channelInfo.iQuantity = ( TSensrvQuantity ) GetAttributeIntValue( *channelElement, KSsyRefQuantity ); + channelInfo.iChannelType = ( TSensrvChannelTypeId ) GetAttributeHexValue( *channelElement, KSsyRefChannelType ); + GetAttributeStrValue( *channelElement, KSsyRefLocation, channelInfo.iLocation ); + GetAttributeStrValue( *channelElement, KSsyRefVendorId, channelInfo.iVendorId ); + channelInfo.iChannelDataTypeId = ( TSensrvChannelDataTypeId ) GetAttributeHexValue( *channelElement, KSsyRefDataTypeID ); + + // Calculate data item size based on channel type + switch ( channelInfo.iChannelType ) + { + case KSensrvChannelTypeIdAccelerometerXYZAxisData: + { + channelInfo.iDataItemSize = KSsyRefAxisDataItemSize; + break; + } + case KSensrvChannelTypeIdProximityMonitor: + { + channelInfo.iDataItemSize = KSsyRefProximityDataItemSize; + break; + } + case KSensrvChannelTypeIdAccelerometerWakeupData: + case KSensrvChannelTypeIdAccelerometerDoubleTappingData: + { + channelInfo.iDataItemSize = KSsyRefTappingDataItemSize; + break; + } + default: + { + channelInfo.iDataItemSize = 0; + break; + } + } + + // Append channel info to list + aChannelList.Append( channelInfo ); + } + channelElement = static_cast( channelElement->NextSibling() ); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GenerateChannels() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GetChannelDataInformation +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::GetChannelDataInformationL( + const TInt aSrvChannelId, + TSsyRefDataItemArray& aDataItemList, + TInt& aStartInterval ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetChannelDataInformation()" ) ) ); + + // First, get correct config channel element corresponding to aSrvChannelId + CMDXMLElement* channelElement = ChannelElement( aSrvChannelId ); + + if ( channelElement ) + { + // Channel element found, get channel data group element + CMDXMLElement* groupElement = channelElement->FirstChildOfType( KSsyRefChannelDataTag ); + + if ( groupElement ) + { + // Get start interval + aStartInterval = GetAttributeIntValue( *groupElement, KSsyRefStartInterval ); + + // First, loop channel data items to get total count + CMDXMLElement* dataItemElement = groupElement->FirstChildOfType( KSsyRefChannelDataItemTag ); + + // Take channel data item type at this point. One channel can produce only one type of + // channel data item + TUint channelType( GetAttributeHexValue( *dataItemElement, KSsyRefDataTypeID ) ); + + TInt channelItemCount( 0 ); // Total number of data items + TInt definitionCount( 0 ); // Total number of different definitions + + // Go through elements and get counters + while ( dataItemElement ) + { + definitionCount++; + channelItemCount = channelItemCount + GetAttributeIntValue( *dataItemElement, KSsyRefDataItemCount ); + // This will return NULL if no next sibling found + dataItemElement = static_cast( dataItemElement->NextSibling() ); + } + + // Now, start all over to get item information + dataItemElement = groupElement->FirstChildOfType( KSsyRefChannelDataItemTag ); + + // Create temp array now that we know the data item count + TSsyRefDataItemArray tempArray( channelItemCount ); + + for ( TInt i = 0; i < definitionCount; i++ ) + { + // Check element type + if ( dataItemElement->NodeType() == CMDXMLNode::EElementNode ) + { + // First we get interval and count from channel item + TInt interval( GetAttributeIntValue( *dataItemElement, KSsyRefInterval ) ); + TInt countOfType( GetAttributeIntValue( *dataItemElement, KSsyRefDataItemCount ) ); + + // Read next child values to corresponding data type class + switch ( channelType ) + { + case TSensrvAccelerometerAxisData::KDataTypeId: + { + CMDXMLElement* axisDataElement = dataItemElement->FirstChildOfType( KSsyRefAxisDataItemTag ); + TInt axisX( GetAttributeIntValue( *axisDataElement, KSsyRefXAxis ) ); + TInt axisY( GetAttributeIntValue( *axisDataElement, KSsyRefYAxis ) ); + TInt axisZ( GetAttributeIntValue( *axisDataElement, KSsyRefZAxis ) ); + + // Create channel data type item + TSsyRefChannelDataAxis channelData( axisX, axisY, axisZ, interval ); + // add items into array + for ( TInt k = 0; k < countOfType; k++ ) + { + tempArray.Append( channelData ); + } + break; + } + case TSensrvTappingData::KDataTypeId: + { + CMDXMLElement* tappingDataElement = dataItemElement->FirstChildOfType( KSsyRefTappingDataItemTag ); + TInt direction( GetAttributeHexValue( *tappingDataElement, KSsyRefDirection ) ); + + // Create channel data type item + TSsyRefChannelDataTapping channelData( direction, interval ); + // add items into array + for ( TInt k = 0; k < countOfType; k++ ) + { + tempArray.Append( channelData ); + } + break; + } + case TSensrvProximityData::KDataTypeId: + { + CMDXMLElement* proximityDataElement = dataItemElement->FirstChildOfType( KSsyRefProximityDataItemTag ); + TInt state( GetAttributeIntValue( *proximityDataElement, KSsyRefProximityState ) ); + + // Create channel data type item + TSsyRefChannelDataProximity channelData( state, interval ); + // add items into array + for ( TInt k = 0; k < countOfType; k++ ) + { + tempArray.Append( channelData ); + } + break; + } + default: + { + // Other data items are not supported + User::Leave( KErrGeneral ); + } + } + } + + // Get next channel data item element + dataItemElement = static_cast( dataItemElement->NextSibling() ); + } + + // Compress temp array in case there were comments + tempArray.Compress(); + + // copy information to param array + aDataItemList = tempArray; + } + else + { + User::Leave( KErrNotFound ); + } + } + else + { + User::Leave( KErrNotFound ); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetChannelDataInformation() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GetElementPropertiesL +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::GetElementPropertiesL( + CMDXMLElement& aElement, + RSensrvPropertyList& aPropertyList ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetElementPropertiesL()" ) ) ); + + // First we need 'Properties' element + CMDXMLElement* properties = aElement.FirstChildOfType( KSsyRefProperties ); + + if ( !properties ) + { + // Wrong element... or properties are not defined + User::Leave( KErrNotFound ); + } + + // Get first property get started + CMDXMLElement* propertyItem = properties->FirstChildOfType( KSsyRefPropertyItem ); + TInt propertyCount( 0 ); + + // Loop properties to get count of properties + while ( propertyItem ) + { + propertyCount++; + propertyItem = static_cast( propertyItem->NextSibling() ); // returns NULL if next not found + } + + if ( !propertyCount ) + { + // Check that there are properties + User::Leave( KErrNotFound ); + } + + // Temporary property list now that we know the property count + RSensrvPropertyList tempList( propertyCount ); + + // Start loop again from the start and read each property + propertyItem = properties->FirstChildOfType( KSsyRefPropertyItem ); + for ( TInt i = 0; i < propertyCount; i++ ) + { + // Check element type + if ( propertyItem->NodeType() == CMDXMLNode::EElementNode ) + { + // Read property values + const TSensrvPropertyId propertyId( ( TSensrvPropertyId )GetAttributeHexValue( *propertyItem, KSsyRefPropertyId ) ); + const TInt itemIndex( GetAttributeIntValue( *propertyItem, KSsyRefItemIndex ) ); + const TBool readOnly( ( TBool )GetAttributeIntValue( *propertyItem, KSsyRefReadOnly ) ); + const TSensrvPropertyType propertyType( ( TSensrvPropertyType ) GetAttributeIntValue( *propertyItem, KSsyRefPropertyType ) ); + + // Array index must be handled in different way as it is not mandatory and it may not exist in XML file + TInt arrayIndex( ESensrvSingleProperty ); + + // Extra check is needed, otherwise this value is always '0' when it should be 'ESensrvSingleProperty' by default + if ( propertyItem->IsAttributeSpecified( KSsyRefArrayIndex ) ) + { + // Attribute exists, now we can read the value + arrayIndex = GetAttributeIntValue( *propertyItem, KSsyRefArrayIndex ); + } + + // Resolve type, get correct type value and append property into list + switch ( propertyType ) + { + case ESensrvIntProperty: + { + const TInt intValue( GetAttributeIntValue( *propertyItem, KSsyRefPropertyValue ) ); + const TInt maxValue( GetAttributeIntValue( *propertyItem, KSsyRefMaxValue ) ); + const TInt minValue( GetAttributeIntValue( *propertyItem, KSsyRefMinValue ) ); + TSensrvProperty property( propertyId, itemIndex, intValue, maxValue, minValue, readOnly, propertyType ); + property.SetArrayIndex( arrayIndex ); + tempList.Append( property ); + break; + } + case ESensrvRealProperty: + { + const TReal intValue( GetAttributeRealValue( *propertyItem, KSsyRefPropertyValue ) ); + const TReal maxValue( GetAttributeRealValue( *propertyItem, KSsyRefMaxValue ) ); + const TReal minValue( GetAttributeRealValue( *propertyItem, KSsyRefMinValue ) ); + TSensrvProperty property( propertyId, itemIndex, intValue, maxValue, minValue, readOnly, propertyType ); + property.SetArrayIndex( arrayIndex ); + tempList.Append( property ); + break; + } + case ESensrvBufferProperty: + { + TBuf8 desValue; + GetAttributeStrValue( *propertyItem, KSsyRefPropertyValue, desValue ); + TSensrvProperty property( propertyId, itemIndex, desValue, readOnly, propertyType ); + property.SetArrayIndex( arrayIndex ); + tempList.Append( property ); + break; + } + default: + { + // Unknown property type -> leave + User::Leave( KErrArgument ); + } + } + } + + // Next property + propertyItem = static_cast( propertyItem->NextSibling() ); // returns NULL if next not found + } + + // Compress temp list in case there were comment nodes + tempList.Compress(); + + // copy temp list to parameter list + aPropertyList = tempList; + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetElementPropertiesL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::ChannelElement +// --------------------------------------------------------------------------- +// +CMDXMLElement* CSsyReferenceConfig::ChannelElement( const TInt aSrvChannelId ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ChannelElement()" ) ) ); + + const TInt configId( ConfigChannelId( aSrvChannelId ) ); + TBool channelFound( EFalse ); + + // Loop channel group and match configId for the channel ID in element + CMDXMLElement* channelItemElement = iChannelGroupElement->FirstChildOfType( KSsyRefChannelItemTag ); + + for ( TInt i = 0; i < iChannelCount && !channelFound; i++ ) + { + TInt channelId( GetAttributeIntValue( *channelItemElement, KSsyRefChannelId ) ); + if ( configId == channelId ) + { + // Channel found, no need to loop + channelFound = ETrue; + } + else + { + // Take next channel + channelItemElement = static_cast( channelItemElement->NextSibling() ); + } + } + + // If not found, return NULL + if ( !channelFound ) + { + channelItemElement = NULL; + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ChannelElement() - return" ) ) ); + return channelItemElement; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::UpdateChannelIds +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::UpdateChannelIds( RSensrvChannelInfoList aChannelList ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::UpdateChannelIds()" ) ) ); + + + if ( ChannelCount() == aChannelList.Count() ) + { + for ( TInt i = 0; i < aChannelList.Count(); i++ ) + { + iChannelPairArray[i].SetServerId( aChannelList[i].iChannelId ); + } + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::UpdateChannelIds() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::ConfigChannelId +// --------------------------------------------------------------------------- +// +TInt CSsyReferenceConfig::ConfigChannelId( const TInt aSrvChannelId ) const + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ConfigChannelId()" ) ) ); + TInt returnValue( 0 ); + + for ( TInt i = 0; i < iChannelPairArray.Count(); i++ ) + { + if ( iChannelPairArray[i].ServerId() == aSrvChannelId ) + { + returnValue = iChannelPairArray[i].ConfigId(); + } + } + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ConfigChannelId() - return" ) ) ); + return returnValue; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GetSensorPropertiesL +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::GetSensorPropertiesL( RSensrvPropertyList& aPropertyList ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetSensorPropertiesL()" ) ) ); + + // We already have SsyGeneralInformation element, read properties from that + GetElementPropertiesL( *iGenralInfoElement, aPropertyList ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetSensorPropertiesL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceConfig::GetChannelPropertiesL +// --------------------------------------------------------------------------- +// +void CSsyReferenceConfig::GetChannelPropertiesL( + const TInt aSrvChannelId, + RSensrvPropertyList& aPropertyList ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetChannelPropertiesL()" ) ) ); + + // Get channel element first + CMDXMLElement* channelElement = ChannelElement( aSrvChannelId ); + + if ( !channelElement ) + { + // Leave, channel element is not found + User::Leave( KErrNotFound ); + } + + // Get properties of this channel element + GetElementPropertiesL( *channelElement, aPropertyList ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetChannelPropertiesL() - return" ) ) ); + } + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferenceconfig.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferenceconfig.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,522 @@ +// ssyreferenceconfig.h + +/* +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalComponent +*/ + + +#ifndef SSYREFERENCECONFIG_H +#define SSYREFERENCECONFIG_H + +// INCLUDES +#include +#include +#include +#include +#include +#include +#include +#include + +// CONSTANTS +// Data item sizes +const TInt KSsyRefAxisDataItemSize = sizeof( TSensrvAccelerometerAxisData ); +const TInt KSsyRefTappingDataItemSize = sizeof( TSensrvTappingData ); +const TInt KSsyRefProximityDataItemSize = sizeof( TSensrvProximityData ); + +// ENUMS +enum TSsyReferenceFunctions + { + ESsyReferenceOpenChannel, + ESsyReferenceOpenChannelResp, + ESsyReferenceDataItemReceived, + ESsyReferenceCloseChannel, + ESsyReferenceCloseChannelResp, + ESsyReferenceStartChannelData, + ESsyReferenceStopChannelData + }; + +/** + * Base class for Channel data types. Contains iChannelDataType which is set + * by derived classes on construction. + */ +class TSsyRefChannelDataBase + { + public: + /** + * Enumeration for possible channel data types + */ + enum TSsyRefChannelDataType + { + ESsyRefChannelTypeTapping = 5000, + ESsyRefChannelTypeAxis, + ESsyRefChannelTypeProximity, + ESsyRefChannelTypeAmbientLight + }; + + TInt ChannelDataType() const { return iChannelDataType; } + TInt Interval() const { return iInterval; } + + void SetTimestamp( const TTime aTimestamp ) { iTimestamp = aTimestamp; } + TTime Timestamp() const { return iTimestamp; } + + TInt Size() const { return iSize; } + + protected: + + /** + * Protected constructor as this class is not supposed to be instantiate + * directly. + */ + TSsyRefChannelDataBase() {} + + protected: // data + + /** + * Identifies the type of data type class derived from this base class + */ + TInt iChannelDataType; + + /** + * Interval. Indicates time in ms from previous item until next item is produced + */ + TInt iInterval; + + /** + * Timestamp. Time when this data item is generated. + */ + TTime iTimestamp; + + /** + * Size of one data item. This is filled by derived class + */ + TInt iSize; + + /** + * Axis data item values. + * Accessible only from TSsyRefChannelDataAxis class + */ + TInt iXAxis; + TInt iYAxis; + TInt iZAxis; + + + /** + * Proximity data item values. + * Accessible only from TSsyRefChannelProximity class + */ + TInt iProximityState; + + /** + * AmbientLight data item values. + * Accessible only from TSsyRefChannelAmbientLight class + */ + TInt iAmbientLightState; + + /** + * Tapping data item values. Difrection of the tapping. + * Accessible only from TSsyRefChannelDataTapping class + */ + TInt iDirection; + }; + +// Type definition array for Data item base class +typedef RArray TSsyRefDataItemArray; + +/** + * Message item for SSY <--> Sensor communications + * Contains Channel ID for which the message belongs to, + * Function ID that identifies the command and + * error for error cases. + */ +class TSsyReferenceMsg + { + public: + + /** + * Constructor of the TSsyReferenceMsg + * + * @param[in] aChannelId Channel identifier + * @param[in] aFunction See TSsyReferenceFunctions + */ + TSsyReferenceMsg( TInt aChannelId, TInt aFunction ) : + iChannelId( aChannelId ), + iFunction( aFunction ), + iError( KErrNone ) + {} + + /** + * Copy constructor of the TSsyReferenceMsg + * + * @param[in] aMsg Object to be copied to constructed object + */ + TSsyReferenceMsg( const TSsyReferenceMsg& aMsg ) : + iChannelId( aMsg.iChannelId ), + iFunction( aMsg.iFunction ), + iError( aMsg.iError ) + {} + + TInt ChannelId() { return iChannelId; } + + void SetFunction( TInt aFunction ) { iFunction = aFunction; } + TInt Function() { return iFunction; } + + void SetError( TInt aError ) { iError = aError; } + TInt Error() { return iError; } + + void SetDataItem( TSsyRefChannelDataBase* aDataItem ) { iDataItem = aDataItem; } + TSsyRefChannelDataBase* DataItem() const { return iDataItem; } + + private: // data + + TInt iChannelId; // Identifies the channel + TInt iFunction; // Identifies the command + TInt iError; // Error is passed to response handler + + // Data item for received data. This is casted to correct data item + // class implementation according to ChannelDataType + TSsyRefChannelDataBase* iDataItem; + }; + +/** + * Tapping data type class implementation. + */ +class TSsyRefChannelDataTapping : public TSsyRefChannelDataBase + { + public: + + TSsyRefChannelDataTapping( TInt aDirection, TInt aInterval ) + { + iChannelDataType = ESsyRefChannelTypeTapping; + iSize = KSsyRefTappingDataItemSize; + iInterval = aInterval; + iDirection = aDirection; + } + + TInt Direction() const { return iDirection; } + }; + +/** + * XYZ Axis data type class implementation. + */ +class TSsyRefChannelDataAxis : public TSsyRefChannelDataBase + { + public: + + TSsyRefChannelDataAxis( TInt aXAxis, TInt aYAxis, TInt aZAxis, + TInt aInterval ) + { + iChannelDataType = ESsyRefChannelTypeAxis; + iSize = KSsyRefAxisDataItemSize; + iInterval = aInterval; + iXAxis = aXAxis; + iYAxis = aYAxis; + iZAxis = aZAxis; + } + + TInt XAxis() const { return iXAxis; } + TInt YAxis() const { return iYAxis; } + TInt ZAxis() const { return iZAxis; } + }; + + +/** + * Proximity data type class implementation. + */ +class TSsyRefChannelDataProximity : public TSsyRefChannelDataBase + { + public: + + TSsyRefChannelDataProximity( TInt aProximityState, TInt aInterval ) + { + iChannelDataType = ESsyRefChannelTypeProximity; + iSize = KSsyRefProximityDataItemSize; + iInterval = aInterval; + iProximityState = aProximityState; + } + + TInt ProximityState() const { return iProximityState; } + }; + +/** + * Channel ID pair class for pairing config file channel id and + * Sensor Server generated channel ID. + */ +class TSsyRefChannelIdPair + { + public: + /** + * Constructor of the TSsyRefChannelIdPair + * + * @param[in] aConfigChannelId Channel identifier from config file + */ + TSsyRefChannelIdPair( TInt aConfigChannelId ) : + iConfigChannelId( aConfigChannelId ) + {} + + TInt ConfigId() const { return iConfigChannelId; } + TInt ServerId() const { return iSrvChannelId; } + + void SetServerId( const TInt aSrvId ) { iSrvChannelId = aSrvId; } + + private: // data + + TInt iConfigChannelId; // Config file ID of the channel + TInt iSrvChannelId; // Sensor server assigned ID of the channel + }; + +typedef RArray TSsyRefChannelIdArray; + + +// CONSTANTS + +/** + * Configuration class for SSY reference plugin. Generates configured SSY channel information. + * This keeps reference SSY implementation independent from 'sensor' it uses. This class is fully + * modifiable regarding to the needs of this SSY. It may be for example accelerometer sensor + * without any changes in the SSY reference implementation. Only this class is modified. + */ +class CSsyReferenceConfig : public CActive, public MMDXMLParserObserver + { + +public: + + /** + * Two-phase constructor + * + * @return Pointer to created CSsyReferenceControl object + */ + static CSsyReferenceConfig* NewL(); + + /** + * Virtual destructor + */ + virtual ~CSsyReferenceConfig(); + + /** + * From CActive + */ + void RunL(); + + /** + * From CActive + */ + void DoCancel(); + + /** + * From CActive + */ + TInt RunError( TInt aError ); + + /** + * From MMDXMLParserObserver + * + * Call back function used to inform a client of the Parser when a parsing operation completes. + */ + void ParseFileCompleteL(); + + /** + * Starts parsing config file. This function blocks until file is parsed + */ + void InitConfigL(); + + /** + * Total number of channels this SSY provides + * + * @return Count of channels this SSY is configured to provide + */ + TInt ChannelCount(); + + /** + * Generates channels this SSY is configured to provide + * + * @param[in,out] aChannnelList Filled with generated channels by this configurator + */ + void GenerateChannels( RSensrvChannelInfoList& aChannelList ); + + /** + * Updates Sensor server's generated channel Ids + * + * @param[in] aChannnelList Same list as GenerateChannels produces but + * this contains channel identifiers + */ + void UpdateChannelIds( RSensrvChannelInfoList aChannelList ); + + /** + * Reads all channel data information from config file and fills + * parameters with information + * + * @param[in] aSrvChannelId Sensor server generated channel id of the target channel + * @param[in,out] aDataItemList Contains data item objects defined in config file. Each + * Data item is presented as Data Item class derived from TSsyRefChannelDataBase. + * List can contain only one type of derived channel data items + * @param[in,out] aStartInterval Contains start interval to start producing data items + */ + void GetChannelDataInformationL( const TInt aSrvChannelId, + TSsyRefDataItemArray& aDataItemList, + TInt& aStartInterval ); + + /** + * Reads sensor properties from config file and adds them to list + * + * @param[out] aPropertyList List where to append properties + */ + void GetSensorPropertiesL( RSensrvPropertyList& aPropertyList ); + + /** + * Reads channel properties from config file and adds them to list + * + * @param[in] aSenSrvChannelId Sensor server generated channel id + * @param[out] aPropertyList List where to append properties + */ + void GetChannelPropertiesL( const TInt aSrvChannelId, + RSensrvPropertyList& aPropertyList ); + +private: + + /** + * C++ constructor. + */ + CSsyReferenceConfig(); + + /** + * Symbian 2nd phase constructor. + */ + void ConstructL(); + + /** + * Makes synchronous calls asynchronous + */ + void IssueRequest( TInt aError = KErrNone ); + + /** + * Reads attribute value from element and casts it into TInt value + * + * @param[in] aElement Element from where to read attribute + * @param[in] aAttrib Attribute name which to read + * @return Integer value of read value + */ + TInt GetAttributeIntValue( CMDXMLElement& aElement, const TDesC& aAttrib ); + + /** + * Reads attribute value from element and casts it into literal value + * + * @param[in] aElement Element from where to read attribute + * @param[in] aAttrib Attribute name which to read + * @param[in/out] aTarget Target descriptor where to copy read literal + */ + void GetAttributeStrValue( CMDXMLElement& aElement, const TDesC& aAttrib, TDes8& aTarget ); + + /** + * Reads attribute value from element and casts it into TReal value + * + * @param[in] aElement Element from where to read attribute + * @param[in] aAttrib Attribute name which to read + * @return value of the attribute + */ + TReal GetAttributeRealValue( CMDXMLElement& aElement, const TDesC& aAttrib ); + + /** + * Reads Hexadesimal attribute value from element and casts it into Integer value + * + * @param[in] aElement Element from where to read attribute + * @param[in] aAttrib Attribute name which to read + * @return Unsigned integer value of read Hexadesimal value + */ + TUint GetAttributeHexValue( CMDXMLElement& aElement, const TDesC& aAttrib ); + + /** + * Compares Sensor server generated channel IDs and return corresponding + * ConfigFile channel id + * + * @param[in] aSrvChannelId SenServer generated channel ID for which pair is needed + * @return ConfigFile channel ID that is paired with aSrvChannelId + */ + TInt ConfigChannelId( const TInt aSrvChannelId ) const; + + /** + * Searches channel element for given SensorServer generated channel ID + * + * @param[in] aSrvChannelId SenServer generated channel ID identifying wanted channel element + * @return Pointer to found channel element or NULL if not found + */ + CMDXMLElement* ChannelElement( const TInt aSrvChannelId ); + + /** + * Reads properties from given element and adds them to list. + * Element can be either 'SsyGenealInformation' or 'ChannelItem' + * + * @param[in] aElement Element from where to read properties + * @param[out] aPropertyList List where to append properties + */ + void GetElementPropertiesL( CMDXMLElement& aElement, RSensrvPropertyList& aPropertyList ); + + +private: // data + + /** + * Pointer of the config xml-file parser + */ + CMDXMLParser* iConfigParser; + + /** + * Contains Ssy general information element and all of its childs + */ + CMDXMLElement* iGenralInfoElement; + + /** + * Contains Ssy Channel information group element and all of its childs + * including each channel information and channel data for testing purpose + */ + CMDXMLElement* iChannelGroupElement; + + /** + * Number of channels defined in config file + */ + TInt iChannelCount; + + /** + * Active scheduler wait for blocking construction until config file is parsed + */ + CActiveSchedulerWait iSchedulerWait; + + /** + * Indicates is config file parsed + */ + TBool iConfigFileParsed; + + /** + * Channel ID pair array + */ + TSsyRefChannelIdArray iChannelPairArray; + + /** + * Elements of the config file. These needs to be stored + */ + CMDXMLDocument* iConfigFile; + CMDXMLElement* iSsyReferenceConfig; // Root of the config + }; + +#endif //SSYREFERENCECONFIG_H + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencecontrol.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencecontrol.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,281 @@ +// ssyreferencecontrol.cpp + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + + +#include // MSsyCallback +#include "ssyreferencecontrol.h" +#include "ssyreferencetrace.h" +#include "ssyreferencechannel.h" +#include "ssyreferencecmdhandler.h" + + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// CSsyReferenceControl C++ constructor +// --------------------------------------------------------------------------- +// +CSsyReferenceControl::CSsyReferenceControl( MSsyCallback& aSsyCallback ) : + iSsyCallback( aSsyCallback ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::CSsyReferenceControl()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::CSsyReferenceControl() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// Symbian 2nd phase constructor +// --------------------------------------------------------------------------- +// +void CSsyReferenceControl::ConstructL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ConstructL()" ) ) ); + + // Create configurator and start config file parsing + iConfigFile = CSsyReferenceConfig::NewL(); + TRAPD( err, iConfigFile->InitConfigL() ); // This will block until config is ready + + if ( KErrNone != err ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ConstructL() - Init config failed: %i" ), err ) ); + } + + // --------------------------------------------------------------- + + // Store channel count for later use + const TInt channelCount( iConfigFile->ChannelCount() ); + + // Instantiate channel info list + RSensrvChannelInfoList channelInfoList( channelCount ); + CleanupClosePushL( channelInfoList ); + + // Fills channel info list with generated channel info objects + iConfigFile->GenerateChannels( channelInfoList ); + + // Register channels. Sensor Server generates unique ID for each channel + iSsyCallback.RegisterChannelsL( channelInfoList ); + + // Update channel IDs to ConfigFile + iConfigFile->UpdateChannelIds( channelInfoList ); + + // Create channels + iChannelArray = new ( ELeave ) CArrayPtrFlat( channelCount ); + for ( TInt i = 0; i < channelCount; i++ ) + { + CSsyReferenceChannel* channel = CSsyReferenceChannel::NewL( *this, channelInfoList[i] ); + iChannelArray->AppendL( channel ); + } + + // Clean up + CleanupStack::PopAndDestroy( &channelInfoList ); + + // Get properties of this SSY. Leaves with KErrNotFound if not found. These properties are + // not mandatory, so we can ignore that leave + TRAP_IGNORE( iConfigFile->GetSensorPropertiesL( iProperties ) ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ConstructL() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::NewL +// --------------------------------------------------------------------------- +// +CSsyReferenceControl* CSsyReferenceControl::NewL( MSsyCallback& aSsyCallback ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::NewL()" ) ) ); + CSsyReferenceControl* self = new ( ELeave ) CSsyReferenceControl( aSsyCallback ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::NewL() - return" ) ) ); + return self; + } + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CSsyReferenceControl::~CSsyReferenceControl() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::~CSsyReferenceControl()" ) ) ); + + if ( iChannelArray ) + { + if ( iChannelArray->Count() ) + { + iChannelArray->ResetAndDestroy(); + } + + delete iChannelArray; + } + + if ( iConfigFile ) + { + delete iConfigFile; + iConfigFile = NULL; + } + + iProperties.Reset(); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::~CSsyReferenceControl() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::SsyCallback +// --------------------------------------------------------------------------- +// +MSsyCallback& CSsyReferenceControl::SsyCallback() const + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::SsyCallback()" ) ) ); + return iSsyCallback; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::SsyConfig +// --------------------------------------------------------------------------- +// +CSsyReferenceConfig& CSsyReferenceControl::SsyConfig() const + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::SsyConfig()" ) ) ); + return *iConfigFile; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::FindPropertyL +// --------------------------------------------------------------------------- +// +void CSsyReferenceControl::FindPropertyL( + const TSensrvPropertyId aPropertyId, + const TInt aArrayIndex, + TSensrvProperty& aProperty ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::FindPropertyL()" ) ) ); + TSensrvProperty* property = NULL; + TBool propertyFound( EFalse ); + + // Search property + for ( TInt i = 0; i < iProperties.Count() && !propertyFound; i++ ) + { + property = static_cast( &iProperties[i] ); + + // Compare property IDs + if ( property->GetPropertyId() == aPropertyId ) + { + // Correct property ID is found, now check is it array type of property. + // Either array indexes must match or propertys array index has to be array info + if ( ( property->GetArrayIndex() == aArrayIndex ) || + ( ( property->GetArrayIndex() == ESensrvArrayPropertyInfo ) && + ( ESensrvSingleProperty == aArrayIndex ) ) ) + { + // Correct array index found + propertyFound = ETrue; + } + } + } + + // Leave if not found + if ( !propertyFound ) + { + User::Leave( KErrNotFound ); + } + + aProperty = *property; + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::FindPropertyL() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::FindChannel +// --------------------------------------------------------------------------- +// +CSsyReferenceChannel* CSsyReferenceControl::FindChannelL( TSensrvChannelId aChannelID ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::FindChannel()" ) ) ); + + if ( !iChannelArray ) + { + User::Leave( KErrNotFound ); + } + + const TInt channelCount( iChannelArray->Count() ); + CSsyReferenceChannel* channel = NULL; + + // Check that there are channels + if ( channelCount ) + { + // Loop channels until correct channel is found + for ( TInt i = 0; i < channelCount; i++ ) + { + channel = iChannelArray->At( i ); + + // Compare channel id + if ( channel->ChannelId() == aChannelID ) + { + // Channel found, no need to loop rest + i = channelCount; + } + } + } + + // Leave if channel is not found + if ( !channel ) + { + User::Leave( KErrNotFound ); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::FindChannel() - return" ) ) ); + return channel; + } + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::OpenChannelL +// --------------------------------------------------------------------------- +// +void CSsyReferenceControl::OpenChannelL( TSensrvChannelId aChannelID ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::OpenChannelL()" ) ) ); + // Find and open channel + User::LeaveIfError( FindChannelL( aChannelID )->OpenChannel() ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::OpenChannelL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::CloseChannelL +// --------------------------------------------------------------------------- +// +void CSsyReferenceControl::CloseChannelL( TSensrvChannelId aChannelID ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::CloseChannelL()" ) ) ); + // Find and close channel + User::LeaveIfError( FindChannelL( aChannelID )->CloseChannel() ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::CloseChannelL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferenceControl::ProcessResponse +// --------------------------------------------------------------------------- +// +void CSsyReferenceControl::ProcessResponse( TSsyReferenceMsg* /*aMessage*/ ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ProcessResponse()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ProcessResponse() - return" ) ) ); + } + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencecontrol.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencecontrol.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,156 @@ +// ssyreferencecontrol.h + +/* +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalComponent +*/ + +#ifndef SSYREFERENCECONTROL_H +#define SSYREFERENCECONTROL_H + +#include +#include "ssyreferenceconfig.h" + +// FORWARD DECLARATIONS +class CSsyReferenceChannel; + +/** + * Main control class for SSY. Controls sensor basic functionality and provides mandatory + * ECOM interface specific things. + */ +class CSsyReferenceControl : public CSsyControl + { + +public: + + /** + * Two-phase constructor + * + * @param[in] aSsyCallback Reference to SSY callback instance. + * @return Pointer to created CSsyReferenceControl object + */ + static CSsyReferenceControl* NewL( MSsyCallback& aSsyCallback ); + + /** + * Virtual destructor + */ + virtual ~CSsyReferenceControl(); + +// from base class CSsyControl + + /** + * From CSsyControl + * Request for SSY to open a sensor channel asynchronously. + * Response to the request is delivered through MSsyCallback::ChannelOpened(). + * Initilizes SSY (and the sensor) to be ready for other control commands via + * data and property providers. Multiple OpenChannel()-requests can be + * active for different channels at the same time. + * + * @param[in] aChannelID Channel that is requested to be opened + * @return Symbian error code + */ + void OpenChannelL( TSensrvChannelId aChannelID ); + + /** + * From CSsyControl + * Request to close a sensor channel asynchronously. + * Response to the request is delivered through MSsyCallback::ChannelClosed(). + * Multiple CloseChannel()-requests can be active for different channels + * at the same time. + * + * @param[in] aChannelID Channel that is reqeusted to be closed + * @leave Any One of the system wide error codes + */ + void CloseChannelL( TSensrvChannelId aChannelID ); + + /** + * Reference to SSY Callback instance + */ + MSsyCallback& SsyCallback() const; + + /** + * Reference to SSY Config file + */ + CSsyReferenceConfig& SsyConfig() const; + /** + * Handles response to CSsyReferenceCmdHandler::ProcessCommand + * + * @param[in] aMessage Contains information of the response + */ + void ProcessResponse( TSsyReferenceMsg* aMessage ); + + /** + * Search property of given property id from the channel properties and + * returns reference to that. Leaves with KErrNotFound if property is not found + * + * @param[in] aPropertyId Property ID to locate + * @param[in] aArrayIndex Propertys array index + * @param[out] aProperty Contains found property + */ + void FindPropertyL( const TSensrvPropertyId aPropertyId, + const TInt aArrayIndex, + TSensrvProperty& aProperty ); + +private: + + /** + * C++ constructor. + * + * @param[in] aSsyCallback Reference to SSY callback instance. + */ + CSsyReferenceControl( MSsyCallback& aSsyCallback ); + + /** + * Symbian 2nd phase constructor. + */ + void ConstructL(); + + /** + * Finds and returns pointer to channel + */ + CSsyReferenceChannel* FindChannelL( TSensrvChannelId aChannelID ); + +private: // data + + /** + * Reference to SSY CallBack to send responses to Sensor Server + */ + MSsyCallback& iSsyCallback; + + /** + * Pointer array of all channels provided by this SSY + */ + CArrayPtrFlat* iChannelArray; + + /** + * Pointer to config file parser + */ + CSsyReferenceConfig* iConfigFile; + + /** + * Property list of general properties of this SSY + */ + RSensrvPropertyList iProperties; + }; + +#endif // SSYREFERENCECONTROL_H diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencepropertyprovider.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencepropertyprovider.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,164 @@ +// ssyreferencepropertyprovider.cpp + +// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + + +#include "ssyreferencepropertyprovider.h" +#include "ssyreferencetrace.h" +#include "ssyreferencechannel.h" + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// CSsyReferencePropertyProvider C++ constructor +// --------------------------------------------------------------------------- +// +CSsyReferencePropertyProvider::CSsyReferencePropertyProvider( CSsyReferenceChannel& aChannel ) : + iChannel( aChannel ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::CSsyReferencePropertyProvider()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::CSsyReferencePropertyProvider() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// Symbian 2nd phase constructor +// --------------------------------------------------------------------------- +// +void CSsyReferencePropertyProvider::ConstructL() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::ConstructL()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::ConstructL() - return" ) ) ); + } + + +// --------------------------------------------------------------------------- +// CSsyReferencePropertyProvider::NewL +// --------------------------------------------------------------------------- +// +CSsyReferencePropertyProvider* CSsyReferencePropertyProvider::NewL( CSsyReferenceChannel& aChannel ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::NewL()" ) ) ); + CSsyReferencePropertyProvider* self = new ( ELeave ) CSsyReferencePropertyProvider( aChannel ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::NewL() - return" ) ) ); + return self; + } + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CSsyReferencePropertyProvider::~CSsyReferencePropertyProvider() + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::~CSsyReferencePropertyProvider()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::~CSsyReferencePropertyProvider() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferencePropertyProvider::CheckPropertyDependenciesL +// --------------------------------------------------------------------------- +// +void CSsyReferencePropertyProvider::CheckPropertyDependenciesL( + const TSensrvChannelId /*aChannelId*/, + const TSensrvProperty& /*aProperty*/, + RSensrvChannelList& /*aAffectedChannels*/ ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::CheckPropertyDependenciesL()" ) ) ); + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::CheckPropertyDependenciesL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferencePropertyProvider::SetPropertyL +// --------------------------------------------------------------------------- +// +void CSsyReferencePropertyProvider::SetPropertyL( + const TSensrvChannelId aChannelId, + const TSensrvProperty& aProperty ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::SetPropertyL()" ) ) ); + + if ( iChannel.ChannelId() != aChannelId ) + { + User::Leave( KErrArgument ); + } + + // Search property. Leaves with KErrNotFound if property is not found. + // Leaves with KErrAccessDenied if found property is Read only + iChannel.FindAndUpdatePropertyL( aProperty ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::SetPropertyL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferencePropertyProvider::GetPropertyL +// --------------------------------------------------------------------------- +// +void CSsyReferencePropertyProvider::GetPropertyL( + const TSensrvChannelId aChannelId, + TSensrvProperty& aProperty ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::GetPropertyL()" ) ) ); + + if ( iChannel.ChannelId() != aChannelId && aChannelId != 0 ) + { + User::Leave( KErrArgument ); + } + else + { + // Search property. Leaves with KErrNotFound if property is not found + aProperty = iChannel.FindPropertyL( + aProperty.GetPropertyId(), + aProperty.PropertyItemIndex(), + aProperty.GetArrayIndex() ); + } + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::GetPropertyL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferencePropertyProvider::GetAllPropertiesL +// --------------------------------------------------------------------------- +// +void CSsyReferencePropertyProvider::GetAllPropertiesL( + const TSensrvChannelId aChannelId, + RSensrvPropertyList& aChannelPropertyList ) + { + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::GetAllPropertiesL()" ) ) ); + + if ( iChannel.ChannelId() != aChannelId ) + { + User::Leave( KErrArgument ); + } + + iChannel.GetProperties( aChannelPropertyList ); + + COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::GetAllPropertiesL() - return" ) ) ); + } + +// --------------------------------------------------------------------------- +// CSsyReferencePropertyProvider::GetPropertyProviderInterfaceL +// --------------------------------------------------------------------------- +// +void CSsyReferencePropertyProvider::GetPropertyProviderInterfaceL( TUid /*aInterfaceUid*/, + TAny*& aInterface ) + { + aInterface = NULL; + } + diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencepropertyprovider.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencepropertyprovider.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,139 @@ +// ssyreferencepropertyprovider.h + +/* +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalComponent +*/ + + +#ifndef SSYREFERENCEPROPERTYPROVIDER_H +#define SSYREFERENCEPROPERTYPROVIDER_H + +#include + + +class CSsyReferenceChannel; + +/** + * Channel property provider implementation. + */ +class CSsyReferencePropertyProvider : public CBase, public MSsyPropertyProvider + { + +public: + + /** + * Two-phase constructor + * + * @param[in] aChannel Reference to channel this provider belongs to + * @return Pointer to created CSsyReferenceControl object + */ + static CSsyReferencePropertyProvider* NewL( CSsyReferenceChannel& aChannel ); + + /** + * Virtual destructor + */ + virtual ~CSsyReferencePropertyProvider(); + +// from base class MSsyPropertyProvider + + /** + * From MSsyPropertyProvider + * Check if property value affects other sensor channels already open. + * If the new property value is legal but affects somehow other channels' properties, + * SSY must return list of the affected channels so that the sensor server can + * check if the client allowed to set this property. If the SSY value + * is not legal SSY must leave with KErrArgument-value. + * + * @param[in] aProperty Property to be checked. + * @param[out] aAffectedChannels Return list of the channel which will be affected if the property + * value will be set. + * @leave KErrArgument If the property value is illegal. + */ + void CheckPropertyDependenciesL( const TSensrvChannelId aChannelId, + const TSensrvProperty& aProperty, + RSensrvChannelList& aAffectedChannels ); + + /** + * From MSsyPropertyProvider + * Set property for the channel. Before the sensor server sets the property value, + * it is checked with CheckPropertyDependenciesL()-function. + * This means a property value should always be valid for the SSY. + * + * @param[in] aProperty Rereference to a property object to be set + */ + void SetPropertyL( const TSensrvChannelId aChannelId, + const TSensrvProperty& aProperty ); + + /** + * From MSsyPropertyProvider + * Get channel property value. The property parameter contains channel id and + * item index. SSY fills values and attributes to the property object. + * + * @param[in, out] aProperty Reference to a property object to be filled + * with property values and attributes. + */ + void GetPropertyL( const TSensrvChannelId aChannelId, + TSensrvProperty& aProperty ); + + /** + * From MSsyPropertyProvider + * Get all channel properties. Returns all properties which are related to this channel. + * + * @param[out] aChannelPropertyList List of the all properties of the channel. + */ + void GetAllPropertiesL( const TSensrvChannelId aChannelId, + RSensrvPropertyList& aChannelPropertyList ); + + /** + * Returns a pointer to a specified interface - to allow future extension + * of this class without breaking binary compatibility + * + * @param aInterfaceUid Identifier of the interface to be retrieved + * @param aInterface A reference to a pointer that retrieves the specified interface. + */ + void GetPropertyProviderInterfaceL( TUid aInterfaceUid, + TAny*& aInterface ); + +private: + + /** + * C++ constructor. + * @param[in] aChannel Reference to channel this provider belongs to + */ + CSsyReferencePropertyProvider( CSsyReferenceChannel& aChannel ); + + /** + * Symbian 2nd phase constructor. + */ + void ConstructL(); + +private: // data + + /** + * Reference to channel for which this provider belongs to + */ + CSsyReferenceChannel& iChannel; + }; + +#endif // SSYREFERENCEPROPERTYPROVIDER_H diff -r a4d95d2c2540 -r 2fee514510e5 sensorsupport/testsensor/src/ssyreferencetrace.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sensorsupport/testsensor/src/ssyreferencetrace.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,117 @@ +// ssyreferencetrace.h + +/* +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +/** + @file + @internalComponent +*/ +#ifndef SSYREFERENCETRACE_H +#define SSYREFERENCETRACE_H + + +// INCLUDES +#include + + +// PC-LINT OPTIONS +// Removes null statement not in line by itself warnings from +// COMPONENT_TRACE macros +//lint -esym(960,54) + +// Removes "area too small" pointer cast warnings. +//lint -e826 + + + +// CONSTANTS +// MACROS +#ifdef _DEBUG + + #ifdef THREAD_TRACE_FLAG + + #define THREAD_TRACE RDebug::Print(RThread().Name()); + + #else + + #define THREAD_TRACE + + #endif // #ifdef THREAD_TRACE_FLAG + + #ifdef BUFFER_TRACE_FLAG + + #define BUFFER_TRACE_DEBUG + #define DEBUG_PRINT_BUFFER DebugPrintBuffer(); + #define BUFFER_TRACE( a ) RDebug::Print a + + #else + + #define DEBUG_PRINT_BUFFER + #define BUFFER_TRACE( a ) + + #endif // #ifdef THREAD_TRACE_FLAG + + #ifdef COMPONENT_TRACE_FLAG + + #define COMPONENT_TRACE( a ) THREAD_TRACE;RDebug::Print a + #define COMPONENT_TRACE_DEBUG + + #else // #ifdef COMPONENT_TRACE_FLAG + + #define COMPONENT_TRACE( a ) + + #endif //#ifdef COMPONENT_TRACE_FLAG + + #ifdef API_TRACE_FLAG + + #define API_TRACE( a ) THREAD_TRACE;RDebug::Print a + #define API_TRACE_DEBUG + + #else //#ifdef API_TRACE_FLAG + + #define API_TRACE( a ) + + #endif //#ifdef API_TRACE_FLAG + + #ifdef ERROR_TRACE_FLAG + + #define ERROR_TRACE( a ) THREAD_TRACE;RDebug::Print a + #define ERROR_TRACE_DEBUG + + #else //#ifdef ERROR_TRACE_FLAG + + #define ERROR_TRACE( a ) + + #endif //#ifdef ERROR_TRACE_FLAG + +#else // #ifdef _DEBUG + + #define COMPONENT_TRACE( a ) + #define API_TRACE( a ) + #define ERROR_TRACE( a ) + #define BUFFER_TRACE( a ) + #define THREAD_TRACE + #define DEBUG_PRINT_BUFFER + +#endif //#ifdef _DEBUG + +#endif // SSYREFERENCETRACE_H + diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Distribution.Policy.S60 --- a/startupservices/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/Bwins/Distribution.Policy.S60 --- a/startupservices/SplashScreen/Bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/Data/Distribution.Policy.S60 --- a/startupservices/SplashScreen/Data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/Distribution.Policy.S60 --- a/startupservices/SplashScreen/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/group/Distribution.Policy.S60 --- a/startupservices/SplashScreen/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/group/bld.inf --- a/startupservices/SplashScreen/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/SplashScreen/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -25,25 +25,20 @@ PRJ_EXPORTS ../rom/splashscreen.iby CORE_MW_LAYER_IBY_EXPORT_PATH(splashscreen.iby) ../rom/splashscreen_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(splashscreen_variant.iby) -#ifdef USE_SF_SPLASH_SVG -// Export to SF-specific subdirectory -../sfimage/sfsplash.svg /epoc32/s60/icons/sf_startup_screen.svg -#endif +/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/data/z/resource/apps/qgn_startup_screen.svg +/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/release/winscw/udeb/z/resource/apps/qgn_startup_screen.svg +/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/release/winscw/urel/z/resource/apps/qgn_startup_screen.svg PRJ_MMPFILES -#ifdef USE_SF_SPLASH_SVG -sf_splashscreen.mmp -#else splashscreen.mmp -#endif PRJ_EXTENSIONS START EXTENSION s60/mifconv OPTION TARGETFILE splashscreen.mif OPTION HEADERFILE splashscreen.mbg #ifdef USE_SF_SPLASH_SVG - OPTION SOURCES -c8 sf_startup_screen -#else + // use the local file (also called qgn_startup_screen to keep the mbg file the same) + OPTION SOURCEDIR ../sfimage +#endif OPTION SOURCES -c8 qgn_startup_screen -#endif END diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/group/sf_splashscreen.mmp --- a/startupservices/SplashScreen/group/sf_splashscreen.mmp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -/* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is project specification file for the SplashScreen which -* displays splash screen upon booting the device. -* -*/ - -macro USE_SF_SPLASH_ENUM -#include "splashscreen.mmp" diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/group/splashscreen.mmp --- a/startupservices/SplashScreen/group/splashscreen.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/SplashScreen/group/splashscreen.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -20,7 +20,7 @@ #include #include -TARGET SPLASHSCREEN.EXE +TARGET splashscreen.exe TARGETTYPE EXE TARGETPATH PROGRAMS_DIR UID 0x100039CE 0x100059DE @@ -45,5 +45,8 @@ LIBRARY euser.lib LIBRARY ws32.lib LIBRARY efsrv.lib -LIBRARY AknIcon.lib // AknIconUtils LIBRARY fbscli.lib +LIBRARY SVGEngine.lib +LIBRARY gdi.lib +LIBRARY cone.lib +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/inc/Distribution.Policy.S60 --- a/startupservices/SplashScreen/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/inc/SplashScreen.h --- a/startupservices/SplashScreen/inc/SplashScreen.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/SplashScreen/inc/SplashScreen.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -42,8 +42,6 @@ void ConstructL(CMainWindow* aWindow); void RunL(); void SetMainWindow(CMainWindow* aWindow); -//protected: -// TCallBack iCallBack; private: CMainWindow* iWindow; }; @@ -69,7 +67,7 @@ // destruct ~CWsClient(); // main window - virtual void ConstructMainWindowL(); + virtual void ConstructMainWindowL()=0; // terminate cleanly void Exit(); // active object protocol @@ -157,6 +155,7 @@ CMainWindow (CWsClient* aClient); ~CMainWindow (); void Draw (const TRect& aRect); + CFbsBitmap* ReadSVGL (TFileName aFileName); void HandlePointerEvent (TPointerEvent& aPointerEvent); void ConstructL (const TRect& aRect, CWindow* aParent=0); private: diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/inc/SplashScreenDefines.h --- a/startupservices/SplashScreen/inc/SplashScreenDefines.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/SplashScreen/inc/SplashScreenDefines.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -20,7 +20,7 @@ #define SPLASHSCREENDEFINES_H //CONSTANTS -_LIT(KSplashBitmapName, "Z:SPLASHSCREEN.MIF"); +_LIT(KSplashBitmapName, "Z:QGN_STARTUP_SCREEN.SVG"); _LIT(KPanicMsg,"SplashScreen"); _LIT(KSplashScreenWindowGroup, "S60SplashScreenGroup"); @@ -28,6 +28,8 @@ _LIT_SECURITY_POLICY_C1(KReadPolicy, ECapabilityReadDeviceData); _LIT_SECURITY_POLICY_C1(KWritePolicy, ECapabilityWriteDeviceData); +#define SIZE_X 360 +#define SIZE_Y 360 // MACROS #define TRACE_ADDPREFIX(aText) (TPtrC((const TText *)L"SplashScreen: \"" L##aText L"\"")) diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/rom/Distribution.Policy.S60 --- a/startupservices/SplashScreen/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/rom/splashscreen.iby --- a/startupservices/SplashScreen/rom/splashscreen.iby Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/SplashScreen/rom/splashscreen.iby Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -20,5 +20,6 @@ #define __SplashScreen_IBY__ file=ABI_DIR\BUILD_DIR\SplashScreen.exe System\Programs\SplashScreen.exe +data=DATAZ_\resource\apps\qgn_startup_screen.svg resource\apps\qgn_startup_screen.svg #endif diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/sfimage/qgn_startup_screen.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/startupservices/SplashScreen/sfimage/qgn_startup_screen.svg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,10 @@ + + +]> + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/sfimage/sfsplash.svg --- a/startupservices/SplashScreen/sfimage/sfsplash.svg Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - -]> - - - - - - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/src/Distribution.Policy.S60 --- a/startupservices/SplashScreen/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/SplashScreen/src/SplashScreen.cpp --- a/startupservices/SplashScreen/src/SplashScreen.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/SplashScreen/src/SplashScreen.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -18,11 +18,13 @@ // SYSTEM INCLUDES #include +#include #include #include -#include -#include #include +#include +#include +#include // USER INCLUDES #include "SplashScreen.h" @@ -243,7 +245,6 @@ // construct redrawer iRedrawer=new (ELeave) CWsRedrawer; iRedrawer->ConstructL(this); - User::LeaveIfError( RAknIconSrvClient::Connect() ); // construct main window ConstructMainWindowL(); @@ -261,7 +262,6 @@ CWsClient::~CWsClient() { TRACES("CWsClient::~CWsClient(): Start"); - RAknIconSrvClient::Disconnect(); // neutralize us as an active object Deque(); // cancels and removes from scheduler // get rid of scheduler and all attached objects @@ -301,11 +301,6 @@ TRACES("CWsClient::DoCancel(): End"); } -void CWsClient::ConstructMainWindowL() - { - TRACES("CWsClient::ConstructMainWindowL()"); - } - ////////////////////////////////////////////////////////////////////////////// @@ -336,6 +331,57 @@ TRACES("CMainWindow::~CMainWindow(): End"); } +CFbsBitmap* CMainWindow::ReadSVGL (TFileName aFileName) + { + TRACES("CMainWindow::ReadSVGL(): Start"); + TFontSpec fontspec; + TDisplayMode mode = EColor16MA; + TSize size(SIZE_X, SIZE_Y); + + //if ( mode >= (TDisplayMode)13 ) { mode = EColor16MA; } + + CFbsBitmap* frameBuffer = new ( ELeave ) CFbsBitmap; + CleanupStack::PushL( frameBuffer ); + frameBuffer->Create( size, mode ); + + CSvgEngineInterfaceImpl* svgEngine = NULL; + svgEngine = CSvgEngineInterfaceImpl::NewL(frameBuffer, NULL, fontspec ); + + if (svgEngine == NULL) + { + TRACES("CMainWindow::ReadSVGL(): Splashscreen SVG engine creation failed"); + } + + CleanupStack::PushL( svgEngine ); + TInt domHandle = 0; + svgEngine->PrepareDom( aFileName, domHandle ) ; + if (domHandle == 0) + { + TRACES("CMainWindow::ReadSVGL(): Splashscreen DOM handle creation failed"); + } + + CFbsBitmap* bitmap = new(ELeave) CFbsBitmap; + CleanupStack::PushL( bitmap ); + User::LeaveIfError( bitmap->Create( size, EColor64K ) ); + + svgEngine->UseDom( domHandle, bitmap, NULL ) ; + + MSvgError* err; + svgEngine->Start( err ); + if (err->HasError()) + { + TRACES("CMainWindow::ReadSVGL(): Splashscreen SVG Engine Start failed"); + } + + svgEngine->DeleteDom( domHandle ); + CleanupStack::Pop( bitmap ); + CleanupStack::PopAndDestroy( svgEngine ); + CleanupStack::PopAndDestroy( frameBuffer ); + + TRACES("CMainWindow::ReadSVGL(): End"); + return bitmap; + } + void CMainWindow::ConstructL (const TRect& aRect, CWindow* aParent) { TRACES("CMainWindow::ConstructL(): Start"); @@ -361,13 +407,7 @@ if ( !err ) { TRACES("CMainWindow::ConstructL(): Image found"); -#ifdef USE_SF_SPLASH_ENUM - iBitmap = AknIconUtils::CreateIconL( fp->FullName(), EMbmSplashscreenSf_startup_screen ); -#else - iBitmap = AknIconUtils::CreateIconL( fp->FullName(), EMbmSplashscreenQgn_startup_screen ); -#endif - AknIconUtils::ExcludeFromCache(iBitmap); - AknIconUtils::SetSize( iBitmap, iRect.Size(), EAspectRatioPreservedAndUnusedSpaceRemoved ); + iBitmap = ReadSVGL(fp->FullName()); } else { @@ -432,8 +472,7 @@ void CMainWindow::HandlePointerEvent (TPointerEvent& /*aPointerEvent*/) { TRACES("CMainWindow::HandlePointerEvent(): Start"); -// TPoint point = aPointerEvent.iPosition; -// (void)point; + TRACES("CMainWindow::HandlePointerEvent(): End"); } diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/Distribution.Policy.S60 --- a/startupservices/Startup/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/MediatorPlugin/Distribution.Policy.S60 --- a/startupservices/Startup/MediatorPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/MediatorPlugin/group/Distribution.Policy.S60 --- a/startupservices/Startup/MediatorPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/MediatorPlugin/group/StartupMediatorPlugin.mmp --- a/startupservices/Startup/MediatorPlugin/group/StartupMediatorPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/MediatorPlugin/group/StartupMediatorPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -20,14 +20,14 @@ // Build target -TARGET StartupMediatorPlugin.dll +TARGET startupmediatorplugin.dll CAPABILITY CAP_ECOM_PLUGIN TARGETTYPE PLUGIN UID 0x10009D8D 0x102750AF VENDORID VID_DEFAULT START RESOURCE ../src/102750AF.rss -TARGET StartupMediatorPlugin.rsc +TARGET startupmediatorplugin.rsc TARGETPATH resource/plugins END @@ -45,13 +45,16 @@ LIBRARY euser.lib // Core -LIBRARY ECom.lib // ECom -LIBRARY MediatorClient.lib // Mediator client -LIBRARY MediatorPluginBase.lib // Mediator client +LIBRARY ecom.lib // ECom +LIBRARY mediatorclient.lib // Mediator client +LIBRARY mediatorpluginbase.lib // Mediator client LIBRARY featmgr.lib // FeatureManager LIBRARY centralrepository.lib // Central Repository // Logger DEBUGLIBRARY flogger.lib + +SMPSAFE // End of File + diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/MediatorPlugin/inc/Distribution.Policy.S60 --- a/startupservices/Startup/MediatorPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/MediatorPlugin/src/Distribution.Policy.S60 --- a/startupservices/Startup/MediatorPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/aif/Distribution.Policy.S60 --- a/startupservices/Startup/aif/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/bmarm/Distribution.Policy.S60 --- a/startupservices/Startup/bmarm/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/bwins/Distribution.Policy.S60 --- a/startupservices/Startup/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/cenrep/Distribution.Policy.S60 --- a/startupservices/Startup/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/conf/Distribution.Policy.S60 --- a/startupservices/Startup/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/conf/startup.confml Binary file startupservices/Startup/conf/startup.confml has changed diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/data/Distribution.Policy.S60 --- a/startupservices/Startup/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/group/Distribution.Policy.S60 --- a/startupservices/Startup/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/group/bld.inf --- a/startupservices/Startup/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -36,9 +36,9 @@ ../loc/startup.loc MW_LAYER_LOC_EXPORT_PATH(startup.loc) - ../data/backup_registration.xml /epoc32/data/z/private/100058F4/backup_registration.xml - ../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/100058F4/backup_registration.xml - ../data/backup_registration.xml /epoc32/release/winscw/urel/z/private/100058F4/backup_registration.xml + ../data/backup_registration.xml /epoc32/data/z/private/100058f4/backup_registration.xml + ../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/100058f4/backup_registration.xml + ../data/backup_registration.xml /epoc32/release/winscw/urel/z/private/100058f4/backup_registration.xml PRJ_EXTENSIONS START EXTENSION s60/mifconv diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/group/startup.mmp --- a/startupservices/Startup/group/startup.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/group/startup.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -33,20 +33,10 @@ SOURCE StartupApplication.cpp SOURCE StartupAppUi.cpp -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION SOURCE startupanimationwrapper.cpp SOURCE startupview.cpp -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION -SOURCE StartupWelcomeAnimation.cpp -SOURCE StartupOperatorAnimation.cpp -SOURCE StartupTone.cpp -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION SOURCE StartupDocument.cpp -SOURCE StartupUserWelcomeNote.cpp -SOURCE StartupQueryDialog.cpp SOURCE StartupSubscriber.cpp -SOURCE StartupMediatorObserver.cpp -SOURCE StartupPopupList.cpp SOURCE StartupPubSubObserver.cpp @@ -56,12 +46,7 @@ LANGUAGE_IDS END // RESOURCE -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - START RESOURCE ../data/operatoranimation.rss - HEADER - TARGETPATH APP_RESOURCE_DIR - END // RESOURCE -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + START RESOURCE ../data/Startup_reg.rss HEADER @@ -74,14 +59,15 @@ USERINCLUDE ../../inc USERINCLUDE ../../../inc +SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets + APP_LAYER_SYSTEMINCLUDE // dependency to app layer (Profiles) LIBRARY eikcoctl.lib LIBRARY euser.lib LIBRARY apparc.lib LIBRARY cone.lib -LIBRARY avkon.lib -LIBRARY eikdlg.lib + LIBRARY eikcore.lib LIBRARY efsrv.lib LIBRARY fbscli.lib @@ -89,23 +75,18 @@ LIBRARY commonengine.lib //use of SharedData LIBRARY starterclient.lib //use of Starter to remove splash screen LIBRARY ws32.lib -LIBRARY aknnotify.lib //AknGlobalNote + LIBRARY apgrfx.lib // -LIBRARY Egul.lib //DrawUtils +LIBRARY egul.lib //DrawUtils LIBRARY featmgr.lib LIBRARY bafl.lib -LIBRARY timezonelocalization.lib -LIBRARY tzclient.lib -LIBRARY AknIcon.lib LIBRARY mediatorclient.lib -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + LIBRARY sanimctrl.lib -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION -LIBRARY CdlEngine.lib -LIBRARY MediaClientAudio.lib //for playing startup tone -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + +LIBRARY hbwidgets.lib +LIBRARY hbCore.lib LIBRARY bmpanim.lib -#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2 -LIBRARY gfxtrans.lib -#endif -LIBRARY aknskins.lib + + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/Distribution.Policy.S60 --- a/startupservices/Startup/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupAppUi.h --- a/startupservices/Startup/inc/StartupAppUi.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/inc/StartupAppUi.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -27,53 +27,27 @@ #ifndef STARTUPAPPUI_H #define STARTUPAPPUI_H -// FLAGS -//#define USE_STARTUPTEST_APP - - -// SYSTEM INCLUDES -#include //appui - -#include -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - #include -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION #include // USER INCLUDES #include "startup.hrh" //internal state types #include "StartupDefines.h" //some common defines -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - #include "StartupTone.h" -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - -// CONSTANTS -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - const TInt KConnectionRetryTime = 50000; // 50 ms -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + #include // FORWARD DECLARATIONS -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - class CStartupWelcomeAnimation; - class CStartupOperatorAnimation; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + class CStartupUserWelcomeNote; class CStartupPubSubObserver; -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + class CStartupAnimationWrapper; class CStartupView; -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - class CStartupTone; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -class CStartupMediatorObserver; /** * 'AppUi' class. * */ -class CStartupAppUi : public CAknAppUi +class CStartupAppUi : public CEikAppUi //: public CAknAppUi { public: // Constructors and destructor @@ -125,65 +99,13 @@ */ TBool HiddenReset(); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * Continue startup when startup tone completes. - * @param None - * @return void - */ - void ContinueStartupAfterToneL(TToneType aToneType); /** - * Stop startuptone - * @param None - * @return void - */ - void StopStartupTone(); - - /** - * Stop startuptone - * @param None - * @return void - */ - void StopOperatorTone(); - - /** - * Checks if StartupTone is playing - * @param None - * @return TBool - */ - TBool StartupTonePlaying(); - - /** - * Checks if OperatorTone is playing - * @param None - * @return TBool - */ - TBool OperatorTonePlaying(); - -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - /** * Called when welcome or operator animation has finished. * * @since S60 3.2 */ void AnimationFinished(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * Brings Startup application to foregound after Touch Screen Calibration and emergency call from PIN query. - * @param None - * @return void - */ - void BringToForeground(); - - /** - * Send Startup application to background before Touch Screen Calibration. - * @param None - * @return void - */ - void SendToBackground(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION /** * Sets iCleanBoot to EStartupCleanBoot. @@ -192,77 +114,6 @@ */ void SetCleanBoot(); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * - * @param None - * @return void - */ - void WaitingTouchScreenCalibL(); - -#ifdef RD_SCALABLE_UI_V2 - /** - * - * @param None - * @return void - */ - void TouchScreenCalibrationDoneL(); -#endif // RD_SCALABLE_UI_V2 -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * - * @param None - * @return void - */ - void CoverUIWelcomeAnimationSyncOKL(); - - /** - * - * @param None - * @return void - */ - void WaitingCoverUIWelcomeAnimationSyncL(); - - /** - * - * @param None - * @return void - */ - void CoverUIOperatorAnimationSyncOKL(); - - /** - * - * @param None - * @return void - */ - void WaitingCoverUIOperatorAnimationSyncL(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - /** - * - * @param None - * @return void - */ - void WaitingCoverUIStartupReadySyncL(); - - /** - * - * @param None - * @return void - */ - void CoverUIStartupReadySyncOKL(); - - /** - * - * @param None - * @return void - */ - void RaiseCoverUIEvent( TUid aCategory, - TInt aEventId, - const TDesC8& aData ); void SetCriticalBlockEndedL(); @@ -285,12 +136,12 @@ /** System state has changed to EmergencyCallsOnly. Skip the animations. */ void SetEmergencyCallsOnlyL(); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + /** * Check if animation should be loaded in advance and do it. */ void TryPreLoadAnimation(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + /** * Propagates fatal startup error state. @@ -300,22 +151,6 @@ */ void SwStateFatalStartupErrorL( TBool aPropertyChanged ); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * Returns value of iOfflineModeQueryShown. - * @param None - * @return TBool - */ - TBool GetOfflineModeQueryShown(); - - /** - * Sets value of iOfflineModeQueryShown. - * @param TBool - * @return void - */ - void SetOfflineModeQueryShown(TBool aValue); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - /** * Return value of the__SIMCARD feature * @param None @@ -323,12 +158,7 @@ */ TBool SimSupported(); - /** - * Return value of KFeatureIdCoverDisplay feature - * @param None - * @return TBool - */ - TBool CoverUISupported(); + /** * Checks if DOS is in Offline Mode @@ -349,31 +179,7 @@ */ TBool SimStatusChangedReset(); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - private: - /** - * For starting startup tone initialization timer when needed - * @param None - * @return void - */ - void WaitingStartupToneL(); - - /** - * Callback function of startup tone initialization timer - * @param TAny* - * @return TInt - */ - static TInt ToneInitTimerTimeoutL(TAny* aObject); - - /** - * For checking startup tone initialization status - * @param None - * @return void - */ - void StartupToneWaitStatusL(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - private: // from MEikMenuObserver + public: // from MEikMenuObserver /** * EPOC default constructor. @@ -382,8 +188,9 @@ private: // from CEikAppUi -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + /** + * Functionality Commented as no support from Qt * From CAknAppUi. * Handles a change to the application's resources which are shared across * the environment. @@ -391,9 +198,10 @@ * @since S60 3.2 * * @param aType The type of resources that have changed. - */ + void HandleResourceChangeL( TInt aType ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + */ + /** * Takes care of command handling. @@ -439,19 +247,6 @@ void DoStartupShowOperatorAnimationL(); /** - * This part of the startup phases - * shows the user welcome note. - */ - void DoStartupShowUserWelcomeNoteL(); - - /** - * Returns EFalse if date, time and city - * queries are disabled for testing purposes - * @return TBool - */ - TBool StartupQueriesEnabled(); - - /** * Predictive Time and Country selection support * Returns ETrue when enabled. * @return TBool @@ -467,13 +262,6 @@ void DoStartupFirstBootAndRTCCheckL(); /** - * Shows the needed startup queries in first boot - * or when real time clock value is invalid - * @return void - */ - void ShowStartupQueriesL(); - - /** * Last part of the startup phases. * This part does some cleaning things and * calls the Exit(). @@ -524,48 +312,7 @@ */ TBool UiInOfflineMode(); - /** - * Shows country and city selection lists to the user. - * This is shown in first boot. - */ - void ShowCountryAndCityListsL(); - - /** - * Shows country selection list to the user. - * This is shown in first boot. - * @return TInt - */ - TInt ShowCountryListL(); - - /** - * Shows city selection list to the user. - * This is shown in first boot. - * @return TBool - */ - TBool ShowCityListL(TUint8 cityGroupId); - - /** - * Shows time query to the user. - * This is shown in first boot or when - * real time clock isn't valid. - * @return TBool - */ - TBool ShowTimeQueryL(); - - /** - * Shows date query to the user. - * This is shown in first boot or when - * real time clock isn't valid. - * @return TBool - */ - TBool ShowDateQueryL(); - - /** - * Gets default time and date from cenrep - * @param aTime - * @return void - */ - void GetDefaultTimeAndDate( TTime& aTime ); + /** * Returns information about is this the first boot happening. @@ -586,74 +333,40 @@ */ void SystemFatalErrorL(); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + /** * Updates startup UI phase to Publish&Subscribe key KPSStartupUiPhase. * * @param aValue the new value to be written to the key KPSStartupUiPhase. */ void UpdateStartupUiPhase( TInt aValue ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + private: // ***** Member Data ******************************************** -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + // The only window-owning control of the Startup application. CStartupView* iMainView; // Used for showing Welcome Animation. Owned. May not be NULL. CStartupAnimationWrapper* iAnimation; -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - //used for showing Welcome Animation - CStartupWelcomeAnimation* iWelcomeAnimation; //owns - //used for showing Operator Animation - CStartupOperatorAnimation* iOperatorAnimation; //owns -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + - //used for showing User Welcome Note - CStartupUserWelcomeNote* iUserWelcomeNote; //owns -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - //used for showing welcome animation - CPeriodic* iAnimTimer; //owns -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION //used for showing user welcome note CPeriodic* iNoteTimer; //owns //used for exiting application, smoothly without tricky errors CPeriodic* iExitTimer; //owns - - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - // Used for playing startup tone - CStartupTone* iStartupTone; //owns - - // Used for waiting startup tone initialization - CPeriodic* iToneInitTimer; //owns - - // Used for playing operator startup tone - CStartupTone* iOpStartupTone; //owns - - // Used for following tone initialization time - TInt iToneInitWaitTime; - - //used for telling if the user welcome note is animation - TBool iAnimation; -#endif RD_STARTUP_ANIMATION_CUSTOMIZATION - + + //internal execution state TStartupInternalState iInternalState; -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - //is used for telling the application that - //splashscreen should be removed for showing the code queries - //or welcome note - TBool iSplashScreenShouldBeRemoved; -#endif RD_STARTUP_ANIMATION_CUSTOMIZATION //is used for quarantee only one time continuing TBool iStartupFirstBootAndRTCCheckAlreadyCalled; @@ -690,18 +403,14 @@ //is used for telling if SIM card is supported TBool iSimSupported; - CStartupMediatorObserver* iStartupMediatorObserver; //owns + + - TBool iCoverUISupported; - - TInt iCounryListIndex; + TTime iTime; -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - TBool iTouchScreenCalibSupport; - TBool iTouchScreenCalibrationDone; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + }; #endif // STARTUPAPPUI_H diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupApplication.h --- a/startupservices/Startup/inc/StartupApplication.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/inc/StartupApplication.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -21,7 +21,9 @@ #define STARTUPAPPLICATION_H // INCLUDES -#include + + +#include // CONSTANTS @@ -32,7 +34,7 @@ /** * CStartupApp application class. */ -class CStartupApplication : public CAknApplication +class CStartupApplication : public CEikApplication { private: // from CApaApplication /** diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupDocument.h --- a/startupservices/Startup/inc/StartupDocument.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/inc/StartupDocument.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -21,7 +21,7 @@ #define STARTUPDOCUMENT_H // INCLUDES -#include +#include // FORWARD DECLARATIONS class CEikAppUi; @@ -31,14 +31,14 @@ /** * CStartupDocument application class. */ -class CStartupDocument : public CAknDocument +class CStartupDocument : public CEikDocument { public: /** * C++ default constructor. */ - CStartupDocument(CEikApplication& aApp): CAknDocument(aApp) { } + CStartupDocument(CEikApplication& aApp): CEikDocument(aApp) { } /** * Two-phased constructor. diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupOperatorAnimation.h --- a/startupservices/Startup/inc/StartupOperatorAnimation.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -/* -* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class is the container class of the CStartupOperatorAnimation. -* It is used for showing predefined animation. -* -*/ - - - -#ifndef STARTUPOPERATORANIMATION_H -#define STARTUPOPERATORANIMATION_H - -// INCLUDES -#include -#include "Startup.hrh" -#include "StartupWelcomeAnimation.h" - -// CONSTANTS - -// FORWARD DECLARATIONS -class CStartupModel; -class CAknBitmapAnimation; -class CStartupAppUi; - -// CLASS DECLARATION - -/** -* This class takes care of showing welcome animatio to the user. -*/ -class CStartupOperatorAnimation : public CStartupWelcomeAnimation - { - public: - - - /** - * Two-phased constructor. - */ - static CStartupOperatorAnimation* NewL( CStartupAppUi* aStartupAppUi, const TRect& aRect); - - /** - * This handles the key events in this control. - */ - TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType); - - private: - /** - * C++ default constructor. - */ - CStartupOperatorAnimation( CStartupAppUi* aStartupAppUi ); - - /** - * EPOC default constructor - */ - void ConstructL(const TRect& aRect); - - /** - * Is called by Draw()-function and contains - * the drawing intelligence about different states of the execution. - */ - void DoDrawing() const; - }; - -#endif // STARTUPOPERATORANIMATION_H - -// End of File diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupPopupList.h --- a/startupservices/Startup/inc/StartupPopupList.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This class implements a customized pop-up - which disables LSK if no city/country match is there -* -*/ - - -#ifndef STARTUPPOPUPLIST_H -#define STARTUPPOPUPLIST_H - -#include -#include -#include - -NONSHARABLE_CLASS(CStartupPopupList) : public CAknPopupList, - public MListBoxItemChangeObserver -{ - private: - - /** - * Constructor - */ - CStartupPopupList(); - - /** - * @param aListBox Pre-existing listbox-derived class - * @param aCbaResource Softkey pane to display while pop-up is active - */ - void ConstructL(CAknSinglePopupMenuStyleListBox* aListBox, - TInt aCbaResource, AknPopupLayouts::TAknPopupLayouts aType); - - public: - /** - * Destructor - */ - ~CStartupPopupList(); - - /** - * Two-phased constructor. - * @param aListBox Pre-existing listbox-derived class - * @param aCbaResource Softkey pane to display while pop-up is active - * @return CStartupPopupList* - */ - static CStartupPopupList* NewL(CAknSinglePopupMenuStyleListBox* - aListBox, TInt aCbaResource, - AknPopupLayouts::TAknPopupLayouts aType); - - /** - * From CCoeControl, handle activation of control. - */ - void ActivateL(); - - /** - * From MListBoxItemChangeObserver, handle enable/disable LSK - */ - void ListBoxItemsChanged(CEikListBox* aListBox); - - /** - * From CCoeControl, handles pointer events in this control. - */ - void HandlePointerEventL(const TPointerEvent& aPointerEvent); -}; - -#endif //STARTUPPOPUPLIST_H - - - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupQueryDialog.h --- a/startupservices/Startup/inc/StartupQueryDialog.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -/* -* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class adds send-key to acknowledge the time/date query. -* Feature is implemented to needs of the PET-chamber in production tests. -* More information can be found in Change Request-database. -* -*/ - - -#ifndef STARTUPQUERYDIALOG_H -#define STARTUPQUERYDIALOG_H - -// INCLUDES -#include //used for Time and Date query - -// FORWARD DECLARATIONS - -// CLASS DECLARATION - -// CONSTANTS - -// CLASS DECLARATION - -/** -* CStartupQueryDialog class. -*/ -class CStartupQueryDialog : public CAknTimeQueryDialog - { - public://construction and destruction - /** - * C++ Constructor. - */ - CStartupQueryDialog(TTime& aTime,const TTone aTone = ENoTone); - - /** - * C++ Destructor. - */ - virtual ~CStartupQueryDialog(); - - public:// from CCoeControl - - /** - * From CCoeControl Handle key events. When a key event occurs, - * CONE calls this function for each control on the control stack, - * until one of them returns EKeyWasConsumed to indicate that it processed the key event. - * @param aKeyEvent The key event. - * @param aType The type of the event: EEventKey, EEventKeyUp or EEventKeyDown. - * @return Indicates whether or not the key event was used by this control. - */ - TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType); - - public://from MAknQueryControlObeserver - - /** - * Called by OfferkeyEventL(), gives a change to dismiss the query with - * send/answer key. - */ - virtual TBool NeedToDismissQueryL(const TKeyEvent& aKeyEvent); - - /** - * Called by NeedToDismissQueryL(), gives a change to either accept or reject - * the query. Default implementation is to accept the query if the Left soft - * key is displayed and reject it otherwise. Left softkey is only displayed if - * the query has valid data into it. - */ - virtual void DismissQueryL(); - - /** - * Returns whether the left softkey is visible - * @return ETrue is the left softkey is visible - */ - TBool IsLeftSoftkeyVisible(); - - }; - -#endif // STARTUPAPPLICATION_H - -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupTone.h --- a/startupservices/Startup/inc/StartupTone.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class is the container class of the CStartupTone. -* It is used for playing startup tone. -* -*/ - - -#ifndef __STARTUPTONE_H__ -#define __STARTUPTONE_H__ - -// INCLUDES -#include -#include "startupdefines.h" -#include "startup.hrh" - -// CLASS DECLARATION -/** -* CStartupTone -* This class is used for playing of startup tone. -*/ -class CStartupAppUi; - -class CStartupTone : public CBase, public MMdaAudioPlayerCallback - { - public: //Constructors and destructor - /** - * C++ constructor. - */ - CStartupTone( CStartupAppUi* aStartupAppUi ); - - /** - * Two-phased constructor. - */ - static CStartupTone* NewL( CStartupAppUi* aStartupAppUi, TToneType aToneType ); - - /** - * Destructor - */ - virtual ~CStartupTone(); - - /** - * Two phase constructor - this creates the audio player object - */ - void ConstructL(TToneType aToneType); - - public: // New Functions - - /** - * Play tone - */ - TInt Play(); - - /** - * Stop tone - */ - void Stop(); - - /** - * Check is tone currectly playing - */ - TBool Playing(); - - /** - * Audio ready query - * @return ETrue= audio ready, EFalse=audio not ready - */ - TBool AudioReady(); - - /** - * Check if Startup tone is defined and found - */ - TBool ToneFound(); - - /** - */ - void StartupWaiting(TBool aValue); - private: - - /** - */ - TInt GetRingingToneVolumeL(); - - public: // Functions from base classes - - /** - * From MMdaAudioPlayerCallback, audio initialization complete (Audio ready) - * @param aError - * @param aDuration not used internally - */ - void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration); - - /** - * From MMdaAudioPlayerCallback, audio playing complete - * @param aError - */ - void MapcPlayComplete(TInt aError); - - private: //data - CMdaAudioPlayerUtility* iTone; - TBool iAudioReady; - TBool iPlaying; - TToneType iToneType; - CStartupAppUi* iStartupAppUi; //uses - TBool iHiddenReset; - TInt iVolume; - TBool iStartupWaitingForTone; - }; - -#endif // __STARTUPTONE_H__ - -// End of File diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupUserWelcomeNote.h --- a/startupservices/Startup/inc/StartupUserWelcomeNote.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,247 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class is the container class of the CStartupUerWelcomeNote. -* It is used for showing user defined image or text. -* -*/ - - -#ifndef STARTUPUSERWELCOMENOTE_H -#define STARTUPUSERWELCOMENOTE_H - -// INCLUDES -#include -#include "startup.hrh" -#include "startupdomaincrkeys.h" - -// CONSTANTS -const TInt KStartupTBufMaxLength( 100 ); - -// FORWARD DECLARATIONS -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION -class CStartupView; -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION -class CStartupModel; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -class CStartupAppUi; - -// CLASS DECLARATION - -/** -* This class takes care of showing user welcome note to the user. -* User welcome note type can be predefined default animation, -* user defined image or text. -*/ -class CStartupUserWelcomeNote - : public CCoeControl -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - , MCoeControlObserver -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - { - public: // Constructors and destructor - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * Two-phased constructor. - * - * @param aView The compound control that is the container for this - * control. - */ - static CStartupUserWelcomeNote* NewL( - CStartupAppUi& aStartupAppUi, - const TRect& aRect, - CStartupView& aView ); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * C++ default constructor. - */ - CStartupUserWelcomeNote( CStartupAppUi& aStartupAppUi ); - - /** - * Two-phased constructor. - */ - static CStartupUserWelcomeNote* NewL( CStartupAppUi& aStartupAppUi, const TRect& aRect); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - /** - * Destructor - */ - ~CStartupUserWelcomeNote(); - - /** - * Returns the information about the type of - * the selected welcome note. This also consider - * the product variant types of welcome note. - * Return type can be animation, text or image. - */ - TStartupNoteTypeInformation NoteTypeInformation(); - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * This handles the key events in this control. - */ - TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType); - - /** - * This cancels iNoteCancelTimer - */ - void CancelNoteCancelTimer(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - /** - * This function performs the actual user welcome note showing. - */ - void StartL(); - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * Update screen with white bitmap. - */ - void DrawBlankScreen() const; - - /** - * EPOC default constructor - */ - void ConstructL(const TRect& aRect); - - /** - * Sets the iUserWelcomeNoteShowing member value - * @return void - */ - void SetUserWelcomeNoteShowing(TBool aValue); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - private: - - /** - * Returns the component specified by aIndex parameter. - */ - CCoeControl* ComponentControl(TInt aIndex) const; - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** - * Handles the event of the control. - */ - void HandleControlEventL(CCoeControl* aControl,TCoeEvent aEventType); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - /** - * Loads the data about selected welcome note info from the Cental Repository. - */ - TInt GetUserWelcomeNoteTypeInfo(); - - /** - * Shows the text type of user welcome note. - */ - void ShowInformationNoteWrapperL(); - - /** - * Returns information about the selected user welcome note type. - * Text, image or default(no note). - */ - TStartupWelcomeNoteType UserWelcomeNoteType(); - - /** - * Draws a image type of welcome note to the center of - * the screen. Both user selected image and operator - * image as a product variant feature. - */ - void DrawImageWelcomeNote(); - - TInt CheckImage( const TDesC& aPath); - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - private: - - /** - * C++ default constructor. - * - * @param aView The compound control that is the container for this - * control. - */ - CStartupUserWelcomeNote( CStartupAppUi& aStartupAppUi, CStartupView& aView ); - - /** - * Second phase constructor. - */ - void ConstructL( const TRect& aRect ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - private: // Data - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - /** Parent control for the animation control(s). */ - CStartupView& iView; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - //Used for showing user selected image - CFbsBitmap* iBitmap; //owns - - //contains the type information of the user welcome note as selected from - //General Settings (variant information doesn't include in this) - TStartupWelcomeNoteType iNoteType; - - //contains the possible variation information of the default user welcome note - TStartupUserWelcomeNoteDefaultVariationType iNoteDefaultVariationType; - - //is used for storing image path information - TBuf iNotePath; - - //is used for storing text note information - TBuf iNoteText; - - //is used for storing image path information - TBuf iNoteOperPath; - - //is used for storing text note information - TBuf iNoteOperText; - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - //stores the information about the execution state - //of the application. This information is used - //in drawing properly in current situation. - TStartupDrawInfo iDrawUpdateInfo; - - //is uded for guarantee that RStarterSession is made - //and used only once when RemoveSplashScreen is called. - //In other words it is used for preventing needless work... - TBool iSplashScreenRemoved; - - //is used in redrawing in various execution phases (DoDrawingL()-function) - TStartupNoteTypeInformation iWelcomeNoteType; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - //is used when user cancels the welcome note showing by - //pressing any key. - CStartupAppUi& iStartupAppUi; //uses - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - //is used when user cancels the welcome note showing by - //pressing any key. The reason for using callback in OfferKeyEvent() - //guarantees that EKeyWasConsumed is returned properly before application - //continues the tight execution. - CPeriodic* iNoteCancelTimer; //owns - - //used for telling when the UWN is showing - TBool iUserWelcomeNoteShowing; - - //used for telling if UWN is cancelled by user. - TBool iUserWelcomeNoteCancelled; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - }; - -#endif // STARTUPUSERWELCOMENOTE_H - -// End of File diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/StartupWelcomeAnimation.h --- a/startupservices/Startup/inc/StartupWelcomeAnimation.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,208 +0,0 @@ -/* -* Copyright (c) 2003-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class is the container class of the CStartupUerWelcomeNote. -* It is used for showing predefined animation. -* -*/ - - - -#ifndef STARTUPWELCOMEANIMATION_H -#define STARTUPWELCOMEANIMATION_H - -// INCLUDES -#include -#include "Startup.hrh" - -// CONSTANTS - -// FORWARD DECLARATIONS -class CStartupModel; -class CAknBitmapAnimation; -class CStartupAppUi; - -// CLASS DECLARATION - -/** -* This class takes care of showing welcome animatio to the user. -*/ -class CStartupWelcomeAnimation : public CCoeControl , MCoeControlObserver - { - public: // Constructors and destructor - - /** - * C++ default constructor. - */ - CStartupWelcomeAnimation( CStartupAppUi* aStartupAppUi ); - - /** - * Two-phased constructor. - */ - static CStartupWelcomeAnimation* NewL( CStartupAppUi* aStartupAppUi, const TRect& aRect); - - /** - * Destructor - */ - ~CStartupWelcomeAnimation(); - - /** - * This handles the pointer events in this control. - */ - void HandlePointerEventL(const TPointerEvent& aPointerEvent); - - /** - * This handles the key events in this control. - */ - TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType); - - /** - * This cancels the animation. - */ - void CancelAnimation(); - - /** - * This function performs the actual user welcome note showing. - */ - void StartL(); - - /** - * This makes the animation module to stop showing animation. - */ - void EndAnimation() const; - - /** - * Returns the whole duration of the animation, in milliseconds. - */ - TInt ShowingTime(); - - /** - * Update screen with white bitmap. - */ - void DrawBlankScreen() const; - - /** - * EPOC default constructor - */ - void ConstructL(const TRect& aRect); - - /** - * Set the info about which state in execution the - * application is, so that view class can draw window - * properly. - */ - void UpdateDrawInfo( TStartupDrawInfo aValue ); - - /** - * Removes the splashscreen - * @return void - */ - void RemoveSplashScreen() const; - - /** - * Tells is the animation cancelled by user - * @return TBool - */ - TBool IsAnimationCancelled(); - - /** - * Sets the iAnimationShowing member value - * @return void - */ - void SetAnimationShowing(TBool aValue); - - /** - * Handle resource change - * @param aType Type of change - */ - void HandleResourceChange(TInt aType); - - //TEJ - void CancelAnimCancelTimer(); - private: - - /** - * Is called when size is changed. - */ - void SizeChanged(); - - /** - * Returns the count of the components in the container. - */ - TInt CountComponentControls() const; - - /** - * Returns the component specified by aIndex parameter. - */ - CCoeControl* ComponentControl(TInt aIndex) const; - - /** - * Handles the event of the control. - */ - void HandleControlEventL(CCoeControl* aControl,TCoeEvent aEventType); - - /** - * Is called by Draw()-function and contains - * the drawing intelligence about different states of the execution. - */ - virtual void DoDrawingL() const; - - private: // Functions from base classes - - /** - * Returns the count of the components in the container. - */ - void Draw(const TRect& aRect) const; - - protected: // Data - - //Used for showing animation - CAknBitmapAnimation *iAnim; //owns - - //Used for showing white background - CFbsBitmap* iBackgroundBitmap; //owns - - //Is used for setting the timer over the animation - TInt iShowingTime; //in milli - - //stores the information about the execution state - //of the application. This information is used - //in drawing properly in current situation. - TStartupDrawInfo iDrawUpdateInfo; - - //is uded for guarantee that RStarterSession is made - //and used only once when RemoveSplashScreen is called. - //In other words it is used for preventing needless work... - TBool iSplashScreenRemoved; - - //is used when user cancels the welcome note showing by - //pressing any key. - CStartupAppUi* iStartupAppUi; //uses - - //is used when user cancels the welcome note showing by - //pressing any key. The reason for using callback in OfferKeyEvent() - //guarantees that EKeyWasConsumed is returned properly before application - //continues the tight execution. - CPeriodic* iAnimCancelTimer; //owns - - //used for telling when the animation is showing - TBool iAnimationShowing; - - //used for telling if animation is cancelled by user. - TBool iAnimationCancelled; - }; - -#endif // STARTUPWELCOMEANIMATION_H - -// End of File diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/inc/startupview.h --- a/startupservices/Startup/inc/startupview.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/inc/startupview.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007,2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -21,7 +21,6 @@ #include -class CAknsBasicBackgroundControlContext; // Skin support /** * Main view for the Startup application. @@ -108,8 +107,7 @@ /** Component control. */ CCoeControl* iComponent; - /** Skin support */ - CAknsBasicBackgroundControlContext* iBgContext; + }; diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/loc/Distribution.Policy.S60 --- a/startupservices/Startup/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/pubsub/Distribution.Policy.S60 --- a/startupservices/Startup/pubsub/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/pubsub/StartupAppInternalPSKeys.h --- a/startupservices/Startup/pubsub/StartupAppInternalPSKeys.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/pubsub/StartupAppInternalPSKeys.h Thu Jun 24 13:52:58 2010 +0100 @@ -20,7 +20,7 @@ #define STARTUPAPPINTERNALPSKEYS_H // INCLUDES -#include +#include // ============================================================================= // Touch Screen Calibration API diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/pubsub/startupappprivatepskeys.h --- a/startupservices/Startup/pubsub/startupappprivatepskeys.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/pubsub/startupappprivatepskeys.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -38,4 +38,6 @@ // and finished showing country & time queries. }; +const TUint32 KPSStartupAppStarted = 0x00000002; + #endif // STARTUPAPPPRIVATEPSKEYS_H diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/rom/Distribution.Policy.S60 --- a/startupservices/Startup/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/Distribution.Policy.S60 --- a/startupservices/Startup/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupAppUi.cpp --- a/startupservices/Startup/src/StartupAppUi.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/src/StartupAppUi.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -18,14 +18,7 @@ // SYSTEM INCLUDES #include -#include //used for Selftest failed note -#include -#include -#include -#include -#include -#include -#include + #include // Feature Manager #include #include @@ -35,52 +28,20 @@ #include #include #include - -#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2 -// Transition effects -#include -#include -#endif - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - #include "sanimstartupctrl.h" -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - #include // For layout change event definitions - #include -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION +#include +#include "sanimstartupctrl.h" // USER INCLUDES #include "StartupAppUi.h" #include "StartupApplication.h" -#include "StartupUserWelcomeNote.h" -#include "StartupQueryDialog.h" //used for Startup own Time and Date queries -#include "StartupPopupList.h" //used for Startup own City and Country queries -#include "StartupMediatorObserver.h" + #include "StartupPubSubObserver.h" - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - #include "startupanimationwrapper.h" - #include "startupview.h" -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - #include "StartupDocument.h" - #include "StartupOperatorAnimation.h" - #include "StartupTone.h" - #include "StartupWelcomeAnimation.h" -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION +#include "startupanimationwrapper.h" +#include "startupview.h" + +#include -// CONSTANTS -const TInt KUserWelcomeNoteShowPeriodTime = 3000000; // 3 sec - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - const TInt KOneMilliSecondInMicroSeconds = 1000; - const TInt KMaxToneInitWait = 200; // 200 ms -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - -static const TInt KMaxCityLength(120); -static const TInt KMaxCountryLength(120); - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION static const CSAnimStartupCtrl::TAnimationParams KStartupAnimationParams = { KCRUidStartupConf, @@ -90,15 +51,7 @@ KStartupTonePath, KStartupToneVolume }; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -_LIT(KEmpty, " "); - -// Default date and time value is used if cenrep string is not valid -// Default date is 01.01.2007 and default time is 09:00 AM -_LIT( KDefaultDateTimeValue, "20070000:090000" ); // YYYYMMDD:HHMMSS - -static const TInt KTimeFormatLength(16); // "20070000:090000." _LIT_SECURITY_POLICY_C1(KReadDeviceDataPolicy, ECapabilityReadDeviceData); _LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData); @@ -106,7 +59,6 @@ // ======== LOCAL FUNCTIONS ================================================== -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION namespace { TInt AnimationFinishedFunc( TAny* aPtr ) @@ -115,7 +67,7 @@ return KErrNone; } } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + // ================= MEMBER FUNCTIONS ======================================== @@ -124,17 +76,8 @@ // CStartupAppUi::CStartupAppUi() // --------------------------------------------------------------------------- CStartupAppUi::CStartupAppUi() : - iUserWelcomeNote( NULL ), -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iStartupTone( NULL ), - iOpStartupTone( NULL ), - iToneInitWaitTime( 0 ), - iAnimation( EFalse ), -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - iInternalState( EStartupStartingUp ), -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iSplashScreenShouldBeRemoved( EFalse ), -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + iInternalState( EStartupStartingUp ), + iStartupFirstBootAndRTCCheckAlreadyCalled( EFalse ), iChargingOrAlarmBoot( EFalse ), iFirstBoot( ETrue ), @@ -144,15 +87,8 @@ iCriticalBlockEnded( EFalse ), iSwStateFatalStartupError( EFalse ), iStartupWaitingShowStartupAnimation( EFalse ), - iSimSupported( ETrue ), - iStartupMediatorObserver( NULL ), - iCoverUISupported( EFalse ), - iCounryListIndex( 0 ) - , iTime( 0 ) -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - , iTouchScreenCalibSupport( EFalse ) - , iTouchScreenCalibrationDone( EFalse ) -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + iSimSupported( ETrue ) + { TRACES("CStartupAppUi::CStartupAppUi"); } @@ -163,17 +99,14 @@ void CStartupAppUi::ConstructL() { TRACES("CStartupAppUi::ConstructL()"); - TInt flags = EStandardApp|EAknEnableSkin|EAknEnableMSK ; - - BaseConstructL(flags); + TInt flags = EStandardApp; + BaseConstructL( flags ); + + iMainView = CStartupView::NewL( ApplicationRect() ); + + + iAnimation = CStartupAnimationWrapper::NewL( *iMainView ); - iAvkonAppUi->SetKeyEventFlags( CAknAppUiBase::EDisableSendKeyShort | - CAknAppUiBase::EDisableSendKeyLong ); - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - iMainView = CStartupView::NewL( ApplicationRect() ); - iAnimation = CStartupAnimationWrapper::NewL( *iMainView ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION TInt err = RProperty::Define( KPSUidStartupApp, KPSStartupAppState, @@ -198,42 +131,9 @@ iStartupPubSubObserver = CStartupPubSubObserver::NewL( this ); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - err = RProperty::Define( KPSUidStartup, - KStartupBootIntoOffline, - RProperty::EInt, - KReadDeviceDataPolicy, - KWriteDeviceDataPolicy ); - if( KErrNone != err && - KErrAlreadyExists != err ) - { - TRACES1("CStartupAppUi::ConstructL(): KStartupBootIntoOffline define err %d", err); - } - err = RProperty::Define( KPSUidStartup, - KStartupSecurityCodeQueryStatus, - RProperty::EInt, - KReadDeviceDataPolicy, - KWriteDeviceDataPolicy ); - if( KErrNone != err && - KErrAlreadyExists != err ) - { - TRACES1("CStartupAppUi::ConstructL(): KStartupSecurityCodeQueryStatus define err %d", err); - } - err = RProperty::Define( KPSUidStartup, - KStartupCleanBoot, - RProperty::EInt, - KReadDeviceDataPolicy, - KWriteDeviceDataPolicy ); - if( KErrNone != err && - KErrAlreadyExists != err ) - { - TRACES1("CStartupAppUi::ConstructL(): KStartupCleanBoot define err %d", err); - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION err = RProperty::Define( KPSUidStartup, KPSStartupUiPhase, RProperty::EInt, @@ -247,7 +147,7 @@ } UpdateStartupUiPhase( EStartupUiPhaseUninitialized ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + FeatureManager::InitializeLibL(); if ( FeatureManager::FeatureSupported( KFeatureIdOfflineMode ) ) @@ -258,60 +158,30 @@ { iSimSupported = EFalse; } - if ( FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) ) - { - iCoverUISupported = ETrue; - } + TRACES1("CStartupAppUi::ConstructL(): Offline mode supported: %d", iOfflineModeSupported ); TRACES1("CStartupAppUi::ConstructL(): SIM card supported: %d", iSimSupported ); - TRACES1("CStartupAppUi::ConstructL(): CoverUI supported: %d", iCoverUISupported ); - -#if defined (RD_SCALABLE_UI_V2) && !defined(RD_STARTUP_ANIMATION_CUSTOMIZATION) - if ( FeatureManager::FeatureSupported(KFeatureIdPenSupport) && - FeatureManager::FeatureSupported(KFeatureIdPenSupportCalibration) ) - { - iTouchScreenCalibSupport = ETrue; - } -#endif // RD_SCALABLE_UI_V2 && !RD_STARTUP_ANIMATION_CUSTOMIZATION - - if (iCoverUISupported) - { - iStartupMediatorObserver = CStartupMediatorObserver::NewL( this ); - } + iFirstBoot = FirstBoot(); TRACES1("CStartupAppUi::ConstructL(): First boot: %d", iFirstBoot ); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iWelcomeAnimation = CStartupWelcomeAnimation::NewL( this, ClientRect()); - AddToStackL( iWelcomeAnimation ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + + CEikonEnv* eikEnv = CEikonEnv::Static(); // Set Startup application to be system application - iEikonEnv->SetSystem( ETrue ); + eikEnv->SetSystem( ETrue ); - iEikonEnv->RootWin().SetOrdinalPosition(0,0); + eikEnv->RootWin().SetOrdinalPosition(0,0); // Disable priority changes of window server - iEikonEnv->WsSession().ComputeMode( + eikEnv->WsSession().ComputeMode( RWsSession::EPriorityControlDisabled ); + iNoteTimer = CPeriodic::NewL( EPriorityNormal ); - iNoteTimer = CPeriodic::NewL( EPriorityNormal ); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iAnimTimer = CPeriodic::NewL( EPriorityNormal ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION iExitTimer = CPeriodic::NewL( EPriorityNormal ); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - TRACES("CStartupAppUi::ConstructL(): StartupTone: Initialising"); - iStartupTone = CStartupTone::NewL( this, EStartupTone ); - TRACES("CStartupAppUi::ConstructL(): StartupTone: Initialised"); - - TRACES("CStartupAppUi::ConstructL(): Operator StartupTone: Initialising"); - iOpStartupTone = CStartupTone::NewL( this, EStartupOpTone ); - TRACES("CStartupAppUi::ConstructL(): Operator StartupTone: Initialised"); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION if ( iSwStateFatalStartupError ) { @@ -333,43 +203,6 @@ { TRACES("CStartupAppUi::~CStartupAppUi()"); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - if (iWelcomeAnimation) - { - RemoveFromStack( iWelcomeAnimation ); - delete iWelcomeAnimation; - } - - if (iOperatorAnimation) - { - RemoveFromStack( iOperatorAnimation); - delete iOperatorAnimation; - } - - if (iUserWelcomeNote) - { - RemoveFromStack( iUserWelcomeNote ); - delete iUserWelcomeNote; - iUserWelcomeNote = NULL; - } - - if (iStartupPubSubObserver) - { - delete iStartupPubSubObserver; - } - if (iStartupMediatorObserver) - { - delete iStartupMediatorObserver; - } - if (iStartupTone) - { - delete iStartupTone; - } - if (iOpStartupTone) - { - delete iOpStartupTone; - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION if( iExitTimer ) { @@ -377,13 +210,7 @@ delete iExitTimer; } -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - if( iAnimTimer ) - { - iAnimTimer->Cancel(); - delete iAnimTimer; - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + if( iNoteTimer ) { @@ -391,13 +218,13 @@ delete iNoteTimer; } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - delete iUserWelcomeNote; + + delete iAnimation; delete iStartupPubSubObserver; - delete iStartupMediatorObserver; + delete iMainView; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + FeatureManager::UnInitializeLib(); @@ -411,26 +238,11 @@ { TRACES("CStartupAppUi::PrepareToExit()"); -#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2 - // Start the custom exit effect at boot time. - // Note: Not allowed to call GfxTransEffect::EndFullScreen() as AVKON takes care of that when - // EApplicationExit context is used! + -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - if ( !( iAnimation->WasCancelled() ) ) -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - if( !iWelcomeAnimation->IsAnimationCancelled() ) -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - { - TRACES("CStartupAppUi::PrepareToExit(): Starting transition effect"); + + CEikAppUi::PrepareToExit(); - GfxTransEffect::BeginFullScreen( AknTransEffect::EApplicationExit, TRect(), - AknTransEffect::EParameterType, - AknTransEffect::GfxTransParam( KUidStartUp, AknTransEffect::TParameter::EAllowAtBoot ) ); - } -#endif - - CEikAppUi::PrepareToExit(); #ifndef RD_BOOT_CUSTOMIZABLE_AI if( !iChargingOrAlarmBoot ) { @@ -474,6 +286,7 @@ return KErrNone; } + // --------------------------------------------------------------------------- // CStartupAppUi::HandleKeyEventL // --------------------------------------------------------------------------- @@ -512,13 +325,7 @@ iOfflineModeQueryShown = EFalse; response = EKeyWasConsumed; } - else if ( iUserWelcomeNote ) - { - TRACES("CStartupAppUi::HandleKeyEventL(): This key event is used to stop UserWelcomeAnimation"); - //this is used to stop User Welcome note showing - StopTimingL(); - response = EKeyWasConsumed; - } + else if ( ( iInternalState == EStartupShowingWelcomeAnimation || iInternalState == EStartupShowingOperatorAnimation ) && !( iAnimation->WasCancelled() ) ) @@ -534,7 +341,8 @@ return response; } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION +/* + * Qt Support Not available.. // --------------------------------------------------------------------------- // CStartupAppUi::HandleResourceChangeL // @@ -544,17 +352,20 @@ { TRACES("CStartupAppUi::HandleResourceChangeL()"); TRACES1("CStartupAppUi::HandleResourceChangeL Type: %d", aType); - + + + * No equivalent in Qt. CAknAppUi::HandleResourceChangeL( aType ); if ( aType == KEikDynamicLayoutVariantSwitch ) { iMainView->SetRect( ApplicationRect() ); } - + TRACES("CStartupAppUi::HandleResourceChangeL(): End"); } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + +*/ // --------------------------------------------------------------------------- @@ -568,7 +379,8 @@ case EEikCmdExit: { TRACES("CStartupAppUi::HandleCommandL(): EEikCmdExit"); - Exit(); + + Exit(); } break; default: @@ -583,14 +395,13 @@ void CStartupAppUi::DoStartupStartPartL() { TRACES("CStartupAppUi::DoStartupStartPartL()"); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + TryPreLoadAnimation(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + DoNextStartupPhaseL( EStartupWaitingCriticalBlock ); TRACES("CStartupAppUi::DoStartupStartPartL(): End"); } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION // --------------------------------------------------------------------------- // CStartupAppUi::TryPreLoadAnimation() // --------------------------------------------------------------------------- @@ -621,7 +432,7 @@ { iAnimation->PreLoad( ClientRect(), - *iMainView, + *iMainView, KStartupAnimationParams, ETrue, SecondaryDisplay::EStartWelcomeAnimation ); @@ -629,7 +440,7 @@ TRACES("CStartupAppUi::TryPreLoadAnimation(): End"); } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + // --------------------------------------------------------------------------- @@ -644,44 +455,24 @@ //the same way like in the end of ShowUserWelcomeNoteL() TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): Skip the animation and UWN because it's hidden reset"); TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): and change internal state directly to EStartupFirstBootAndRTCCheck"); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iWelcomeAnimation->RemoveSplashScreen(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - return; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + else { TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): Show animation"); iAnimation->Play( ClientRect(), - *iMainView, + *iMainView, KStartupAnimationParams, ETrue, SecondaryDisplay::EStartWelcomeAnimation, TCallBack( AnimationFinishedFunc, this ) ); } -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): Play startup tone."); - - // Play startup tone - if (iStartupTone->Play() != KErrNone) - { - // Play startup beep. - TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): Play startup beep"); - static_cast(iEikonEnv-> - EikAppUi())-> - KeySounds()-> - PlaySound( EAvkonSIDPowerOnTone ); - } - iWelcomeAnimation->SetAnimationShowing(ETrue); - ShowWelcomeAnimationL(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): End"); } @@ -699,11 +490,9 @@ TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): Skip the animation and UWN because it's hidden reset"); TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): and change internal state directly to EStartupFirstBootAndRTCCheck"); DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - return; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + else { TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): Show animation"); @@ -717,61 +506,18 @@ params.iVolumeKey = KStartupOperatorToneVolume; iAnimation->Play( ClientRect(), + *iMainView, params, EFalse, SecondaryDisplay::EStartOperatorAnimation, TCallBack( AnimationFinishedFunc, this ) ); } -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - if ( iOperatorAnimation->ShowingTime() ) - { - TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): Operator animation time defined properly"); - iOperatorAnimation->SetAnimationShowing(ETrue); - iOpStartupTone->Play(); - ShowOperatorAnimationL(); - } - else - { - TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): Operator animation not defined. Skip it."); - iOperatorAnimation->SetAnimationShowing(EFalse); - DoNextStartupPhaseL( EStartupShowingUserWelcomeNote ); - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): End"); } -// --------------------------------------------------------------------------- -// CStartupAppUi::DoStartupShowUserWelcomeNoteL() -// --------------------------------------------------------------------------- -void CStartupAppUi::DoStartupShowUserWelcomeNoteL() - { - TRACES("CStartupAppUi::DoStartupShowUserWelcomeNoteL()"); - ShowUserWelcomeNoteL(); - TRACES("CStartupAppUi::DoStartupShowUserWelcomeNoteL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::StartupQueriesEnabled() -// --------------------------------------------------------------------------- -TBool CStartupAppUi::StartupQueriesEnabled() - { - TRACES("CStartupAppUi::StartupQueriesEnabled()"); - - TInt value( EStartupQueriesEnabled ); - CRepository* repository(NULL); - - TRAPD( err, repository = CRepository::NewL( KCRUidStartupConf ) ); - if ( err == KErrNone ) - { - err = repository->Get( KStartupQueries, value ); - } - delete repository; - - TRACES1("CStartupAppUi::StartupQueriesEnabled(): returns %d", value); - return value; - } // --------------------------------------------------------------------------- // CStartupAppUi::PredictiveTimeEnabled() @@ -801,69 +547,46 @@ { TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL()"); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + RProperty::Set( KPSUidStartup, KStartupCleanBoot, iCleanBoot ); RProperty::Set( KPSUidStartup, KPSSplashShutdown, ESplashShutdown ); - delete iUserWelcomeNote; - iUserWelcomeNote = NULL; iMainView->DrawDeferred(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + // When Predictive Time and Country Selection is enabled, no queries are // shown to user during first boot. Instead, Clock application gets the // time and location from the network and marks the first boot as done. if( !PredictiveTimeEnabled() ) { - if( iFirstBoot && !HiddenReset() && StartupQueriesEnabled() ) + if( iFirstBoot && !HiddenReset() ) //&& StartupQueriesEnabled() ) { TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): First boot. Show city, time and date queries."); - - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iWelcomeAnimation->UpdateDrawInfo( EStartupDICityTimeDateQueries ); - iWelcomeAnimation->DrawNow(); - - if (iOperatorAnimation) - { - RemoveFromStack( iOperatorAnimation ); - delete iOperatorAnimation; - iOperatorAnimation = NULL; - } - if (iUserWelcomeNote) - { - RemoveFromStack( iUserWelcomeNote ); - delete iUserWelcomeNote; - iUserWelcomeNote = NULL; - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - ShowStartupQueriesL(); - TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Mark first boot"); + TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Mark first boot"); MarkFirstBoot(); } - else if( !RTCStatus() && !HiddenReset() && StartupQueriesEnabled()) + else if( !RTCStatus() && !HiddenReset() ) // && StartupQueriesEnabled()) { TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): No first boot but RTCStatus is corrupted. Ask time and date"); - #ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iWelcomeAnimation->UpdateDrawInfo( EStartupDICityTimeDateQueries ); - if (iUserWelcomeNote) - { - RemoveFromStack( iUserWelcomeNote ); - delete iUserWelcomeNote; - iUserWelcomeNote = NULL; - } - #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - ShowStartupQueriesL(); // Not first boot, so skips Country/City query - } - if( iFirstBoot && !StartupQueriesEnabled() ) + } + if( iFirstBoot ) // && !StartupQueriesEnabled() ) { TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): First boot ongoing and queries are disabled."); MarkFirstBoot(); } } + else + { + // Temporary fix for the defect VEZI-7YDEAR , as clock is not yet supported. + TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): if PredictiveTimeEnabled is set"); + if( iFirstBoot && !HiddenReset() ) + { + TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Mark first boot"); + MarkFirstBoot(); + } + // End of temporary fix. + } TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Setting KPSStartupAppState = EStartupAppStateFinished"); TInt err = RProperty::Set( KPSUidStartupApp, KPSStartupAppState, EStartupAppStateFinished ); @@ -873,58 +596,11 @@ , err); } - DoNextStartupPhaseL( EStartupWaitingCUIStartupReady ); + DoNextStartupPhaseL( EStartupStartupOK ); } -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowStartupQueriesL() -// --------------------------------------------------------------------------- -void CStartupAppUi::ShowStartupQueriesL() - { - TRACES("CStartupAppUi::ShowStartupQueriesL()"); - - TBool citysaved(EFalse); - TBool timesaved(EFalse); - TBool datesaved(EFalse); - - // Get default time ( to be used only in date query ) - GetDefaultTimeAndDate( iTime ); - - // Show Country, Date and Time queries ( with possibility to go back ). - // Country query is shown only in the first boot. - while (!timesaved) - { - while (!datesaved) - { - while (!citysaved && iFirstBoot) - { - // 1. Select time zone - ShowCountryAndCityListsL(); - citysaved = ETrue; - TRACES1("CStartupAppUi::ShowStartupQueriesL(): citysaved = %d", citysaved ); - } - // 2. Set date - datesaved = ShowDateQueryL(); - TRACES1("CStartupAppUi::ShowStartupQueriesL(): datesaved = %d", datesaved ); - if (!datesaved) - { - citysaved = EFalse; - } - } - // 3. Set time - timesaved = ShowTimeQueryL(); - TRACES1("CStartupAppUi::ShowStartupQueriesL(): timesaved = %d", timesaved ); - if (!timesaved) - { - datesaved = EFalse; - } - } - // All the queries completed. - - TRACES("CStartupAppUi::ShowStartupQueriesL() - END"); - } // --------------------------------------------------------------------------- // CStartupAppUi::DoStartupEndPart() @@ -934,13 +610,11 @@ TRACES("CStartupAppUi::DoStartupEndPart()"); TRACES("CStartupAppUi::DoStartupEndPart(): STARTUP OK"); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - RProperty::Set( KPSUidStartup, KStartupCleanBoot, iCleanBoot ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + UpdateStartupUiPhase( EStartupUiPhaseAllDone ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + TRACES("CStartupAppUi::DoStartupEndPart(): Exit application."); iExitTimer->Start( 100000, 100000, TCallBack( DoExitApplication, this ) ); @@ -948,62 +622,6 @@ TRACES("CStartupAppUi::DoStartupEndPart(): End"); } -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupAppUi::ContinueStartupAfterToneL() -// --------------------------------------------------------------------------- -void CStartupAppUi::ContinueStartupAfterToneL(TToneType aToneType) - { - TRACES("CStartupAppUi::ContinueStartupAfterToneL()"); - - if (aToneType == EStartupTone) - { - TRACES("CStartupAppUi::ContinueStartupAfterToneL(): Tone type EStartupTone"); - DoNextStartupPhaseL( EStartupWaitingCUIOperatorAnim ); - } - else if (aToneType == EStartupOpTone) - { - TRACES("CStartupAppUi::ContinueStartupAfterToneL(): Tone type EStartupOpTone"); - DoNextStartupPhaseL( EStartupShowingUserWelcomeNote ); - } - else - { - TRACES("CStartupAppUi::ContinueStartupAfterToneL(): Tone interrupted"); - DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); - } - TRACES("CStartupAppUi::ContinueStartupAfterToneL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::BringToForeground() -// --------------------------------------------------------------------------- -void CStartupAppUi::BringToForeground() - { - TRACES("CStartupAppUi::BringToForeground()"); - if ((iInternalState != EStartupWaitingTouchScreenCalib) || - (iTouchScreenCalibrationDone)) - { - TRACES("CStartupAppUi::BringToForeground(): Bring to foreground"); - TApaTask self(iCoeEnv->WsSession()); - self.SetWgId(iCoeEnv->RootWin().Identifier()); - self.BringToForeground(); - } - TRACES("CStartupAppUi::BringToForeground(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::SendToBackground() -// --------------------------------------------------------------------------- -void CStartupAppUi::SendToBackground() - { - TRACES("CStartupAppUi::SendToBackground()"); - TApaTask self(iCoeEnv->WsSession()); - self.SetWgId(iCoeEnv->RootWin().Identifier()); - self.SendToBackground(); - TRACES("CStartupAppUi::SendToBackground(): End"); - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - // --------------------------------------------------------------------------- // CStartupAppUi::StopTimingL() // --------------------------------------------------------------------------- @@ -1019,87 +637,10 @@ TRACES("CStartupAppUi::StopTimingL(): Stopping UWN"); iStartupFirstBootAndRTCCheckAlreadyCalled = ETrue; iNoteTimer->Cancel(); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + UpdateStartupUiPhase( EStartupUiPhaseUserWelcomeDone ); DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - iUserWelcomeNote->CancelNoteCancelTimer(); - iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeNoteEnd ); - iWelcomeAnimation->DrawNow(); - iUserWelcomeNote->SetUserWelcomeNoteShowing(EFalse); - TRACES("CStartupAppUi::StopTimingL(): UWN stopped"); - if (iStartupTone->Playing()) - { - TRACES("CStartupAppUi::StopTimingL(): Startup tone playing. Cannot continue to next phase"); - iStartupTone->StartupWaiting(ETrue); - } - else - { - DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); - } - } - else if (iInternalState == EStartupShowingOperatorAnimation) // EStartupShowingOperatorAnimation - { - TRACES("CStartupAppUi::StopTimingL(): Stopping animation"); - iAnimTimer->Cancel(); - iWelcomeAnimation->CancelAnimCancelTimer(); - iOperatorAnimation->UpdateDrawInfo( EStartupDIOperatorAnimEnd ); - iOperatorAnimation->SetAnimationShowing(EFalse); - TRACES("CStartupAppUi::StopTimingL(): operator animation showing stopped"); - if ( iOperatorAnimation->IsAnimationCancelled()) - { - TRACES("CStartupAppUi::StopTimingL(): Animation is cancelled by user and therefore UWN is not shown"); - StopOperatorTone(); - iStartupFirstBootAndRTCCheckAlreadyCalled = ETrue; - DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); - } - else - { - // If tone is still playing wait until it completes. - if (iOpStartupTone->Playing()) - { - TRACES("CStartupAppUi::StopTimingL(): Operator startup tone is still playing. Wait until it completes."); - iOpStartupTone->StartupWaiting(ETrue); - } - else - { - TRACES("CStartupAppUi::StopTimingL(): Lets display UWN"); - DoNextStartupPhaseL( EStartupShowingUserWelcomeNote ); - } - } - TRACES("CStartupAppUi::StopTimingL(): Operator Animation stopped"); - } - else // EStartupShowingWelcomeAnimation - { - TRACES("CStartupAppUi::StopTimingL(): Stopping animation"); - iAnimTimer->Cancel(); - iWelcomeAnimation->CancelAnimCancelTimer(); - iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeAnimEnd ); - iWelcomeAnimation->SetAnimationShowing(EFalse); - TRACES("CStartupAppUi::StopTimingL(): Welcome animation showing stopped"); - - if ( iWelcomeAnimation->IsAnimationCancelled()) - { - TRACES("CStartupAppUi::StopTimingL(): Animation is cancelled by user and therefore operator animation and UWN is not shown"); - StopStartupTone(); - iStartupFirstBootAndRTCCheckAlreadyCalled = ETrue; - DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); - } - else - { - if (iStartupTone->Playing()) - { - // If tone is still playing wait until it completes. - iStartupTone->StartupWaiting(ETrue); - } - else - { - DoNextStartupPhaseL( EStartupWaitingCUIOperatorAnim ); - } - } - TRACES("CStartupAppUi::StopTimingL(): Animation stopped"); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION } } @@ -1117,331 +658,6 @@ TRACES("CStartupAppUi::ExitApplication(): End"); } -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowWelcomeAnimationL() -// --------------------------------------------------------------------------- -void CStartupAppUi::ShowWelcomeAnimationL() - { - TRACES("CStartupAppUi::ShowWelcomeAnimationL()"); - __ASSERT_DEBUG( iWelcomeAnimation , PANIC( EStartupPanicClassMemberVariableIsNull ) ); - TInt showtime = iWelcomeAnimation->ShowingTime(); - iAnimation = ETrue; - TRACES("CStartupAppUi::ShowWelcomeAnimationL(): Animation timer started"); - iAnimTimer->Start( - showtime*KOneMilliSecondInMicroSeconds, - showtime*KOneMilliSecondInMicroSeconds, - TCallBack( DoStopTimingL, this ) ); - iWelcomeAnimation->StartL(); - TRACES("CStartupAppUi::ShowWelcomeAnimationL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowOperatorAnimationL() -// --------------------------------------------------------------------------- -void CStartupAppUi::ShowOperatorAnimationL() - { - TRACES("CStartupAppUi::ShowOperatorAnimationL()"); - __ASSERT_DEBUG( iOperatorAnimation , PANIC( EStartupPanicClassMemberVariableIsNull ) ); - TInt showtime = iOperatorAnimation->ShowingTime(); - iAnimation = ETrue; - TRACES("CStartupAppUi::ShowWelcomeAnimationL(): Operator Animation timer started"); - iAnimTimer->Start( - showtime*KOneMilliSecondInMicroSeconds, - showtime*KOneMilliSecondInMicroSeconds, - TCallBack( DoStopTimingL, this ) ); - iOperatorAnimation->StartL(); - TRACES("CStartupAppUi::ShowOperatorAnimationL(): End"); - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowUserWelcomeNoteL() -// --------------------------------------------------------------------------- -void CStartupAppUi::ShowUserWelcomeNoteL() - { - TRACES("CStartupAppUi::ShowUserWelcomeNoteL()"); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - iUserWelcomeNote = CStartupUserWelcomeNote::NewL( *this, ClientRect(), *iMainView ); - TStartupNoteTypeInformation type = iUserWelcomeNote->NoteTypeInformation(); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - __ASSERT_DEBUG( iUserWelcomeNote , PANIC( EStartupPanicClassMemberVariableIsNull ) ); - TStartupNoteTypeInformation type; - type = iUserWelcomeNote->NoteTypeInformation(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - if( type == EStartupImage ) - { - // UserWelcomeNote type is EStartupImage - // This type of note is shown fixed (KUserWelcomeNoteShowPeriodTime) time - TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): UWNTimer started (graphic)"); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iAnimation = EFalse; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - iNoteTimer->Start( - KUserWelcomeNoteShowPeriodTime, - KUserWelcomeNoteShowPeriodTime, - TCallBack( DoStopTimingL, this ) ); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - iUserWelcomeNote->StartL(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - else if ( type == EStartupText ) - { - TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): Text UWN"); - - iUserWelcomeNote->StartL(); - - UpdateStartupUiPhase( EStartupUiPhaseUserWelcomeDone ); - - DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); - } - else - { - TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): No UWN"); - - DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck ); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - else - { - //if User Welcome Note type is ETextWelcomeNote nothing to do here, - //because it is implemented with Avkon globalnote - //or if type is EDefaultWelcomeNote no User Welcome Note is shown. - TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): No UWN to show or UWN is text"); - } - //invoke welcome note container to show note - iUserWelcomeNote->StartL(); - - if( type == EStartupText || type == EStartupNoNote) - { - //this is called already here because timer not activated in text uwn case - //and so DoStopTimingL() is never called and should be called here. - StopTimingL(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - } - - TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): End"); - } - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupAppUi::WaitingTouchScreenCalibL() -// --------------------------------------------------------------------------- -void CStartupAppUi::WaitingTouchScreenCalibL() - { - TRACES("CStartupAppUi::WaitingTouchScreenCalibL()"); -#ifdef RD_SCALABLE_UI_V2 - - if( iFirstBoot && iTouchScreenCalibSupport ) - { - if (iTouchScreenCalibrationDone) - { - TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): Calibration already done. Continue boot up"); - DoNextStartupPhaseL( EStartupOfflineModeQuery ); - } - else - { - SendToBackground(); - - iWelcomeAnimation->UpdateDrawInfo( EStartupDITouchScreenCalib ); - iWelcomeAnimation->DrawNow(); - TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): Startup sequence halted until Touch Screen Calibration is done"); - } - } - else - { - TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): Not first boot or calibration not supported. Continue boot up"); - DoNextStartupPhaseL( EStartupOfflineModeQuery ); - } - -#else // !RD_SCALABLE_UI_V2 - TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): Calibration not supported. Continue boot up"); - DoNextStartupPhaseL( EStartupOfflineModeQuery ); - -#endif // RD_SCALABLE_UI_V2 - TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): End"); - } - -#ifdef RD_SCALABLE_UI_V2 -// --------------------------------------------------------------------------- -// CStartupAppUi::TouchScreenCalibrationDoneL() -// --------------------------------------------------------------------------- -void CStartupAppUi::TouchScreenCalibrationDoneL() - { - TRACES("CStartupAppUi::TouchScreenCalibrationDoneL()"); - if (iInternalState == EStartupWaitingTouchScreenCalib) - { - iTouchScreenCalibrationDone = ETrue; - BringToForeground(); - DoNextStartupPhaseL( EStartupOfflineModeQuery ); - } - else - { - iTouchScreenCalibrationDone = ETrue; - } - TRACES("CStartupAppUi::TouchScreenCalibrationDoneL(): End"); - } -#endif // RD_SCALABLE_UI_V2 -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupAppUi::CoverUIWelcomeAnimationSyncOKL() -// --------------------------------------------------------------------------- -void CStartupAppUi::CoverUIWelcomeAnimationSyncOKL() - { - TRACES("CStartupAppUi::CoverUIWelcomeAnimationSyncOKL()"); - DoNextStartupPhaseL( EStartupWaitingStartupTone ); - TRACES("CStartupAppUi::CoverUIWelcomeAnimationSyncOKL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::WaitingCoverUIWelcomeAnimationSyncL() -// --------------------------------------------------------------------------- -void CStartupAppUi::WaitingCoverUIWelcomeAnimationSyncL() - { - TRACES("CStartupAppUi::WaitingCoverUIWelcomeAnimationSyncL()"); - if (iCoverUISupported) - { - iStartupMediatorObserver->IssueCommand(SecondaryDisplay::ECmdStartupSync, - SecondaryDisplay::EStartWelcomeAnimation); - } - else - { - DoNextStartupPhaseL( EStartupWaitingStartupTone ); - } - TRACES("CStartupAppUi::WaitingCoverUIWelcomeAnimationSyncL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::CoverUIOperatorAnimationSyncOKL() -// --------------------------------------------------------------------------- -void CStartupAppUi::CoverUIOperatorAnimationSyncOKL() - { - TRACES("CStartupAppUi::CoverUIOperatorAnimationSyncOKL()"); - DoNextStartupPhaseL( EStartupShowingOperatorAnimation ); - TRACES("CStartupAppUi::CoverUIOperatorAnimationSyncOKL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::WaitingCoverUIOperatorAnimationSyncL() -// --------------------------------------------------------------------------- -void CStartupAppUi::WaitingCoverUIOperatorAnimationSyncL() - { - TRACES("CStartupAppUi::WaitingCoverUIOperatorAnimationSyncL()"); - if (iCoverUISupported) - { - if (iOperatorAnimation->ShowingTime()) - { - iStartupMediatorObserver->IssueCommand(SecondaryDisplay::ECmdStartupSync, - SecondaryDisplay::EStartOperatorAnimation ); - } - else - { - DoNextStartupPhaseL( EStartupShowingOperatorAnimation ); - } - } - else - { - DoNextStartupPhaseL( EStartupShowingOperatorAnimation ); - } - TRACES("CStartupAppUi::WaitingCoverUIOperatorAnimationSyncL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::WaitingStartupToneL() -// --------------------------------------------------------------------------- -void CStartupAppUi::WaitingStartupToneL() - { - if( iStartupTone->ToneFound() && !iStartupTone->AudioReady() ) - { - TRACES("CStartupAppUi::WaitingStartupToneL(): Startup tone found but not ready. Waiting tone to init"); - iToneInitTimer = CPeriodic::NewL( EPriorityNormal ); - iToneInitTimer->Start( KOneMilliSecondInMicroSeconds, - KOneMilliSecondInMicroSeconds, - TCallBack( ToneInitTimerTimeoutL, this ) ); - } - else - { - TRACES("CStartupAppUi::WaitingStartupToneL(): Audio ready"); - DoNextStartupPhaseL( EStartupShowingWelcomeAnimation ); - } - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::ToneInitTimerTimeoutL() -// --------------------------------------------------------------------------- -TInt CStartupAppUi::ToneInitTimerTimeoutL(TAny* aObject) - { - STATIC_CAST( CStartupAppUi*, aObject )->StartupToneWaitStatusL(); // cast, and call non-static function - return KErrNone; - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::StartupToneWaitStatusL() -// --------------------------------------------------------------------------- -void CStartupAppUi::StartupToneWaitStatusL() - { - iToneInitWaitTime++; - TRACES1("CStartupAppUi::StartupToneWaitStatusL(): Total tone init wait time = %d ms", iToneInitWaitTime ); - TBool audioReady = iStartupTone->AudioReady(); - if ( audioReady || (iToneInitWaitTime>=KMaxToneInitWait) ) - { - iToneInitTimer->Cancel(); - delete iToneInitTimer; - iToneInitTimer = NULL; - - TRACES1("CStartupAppUi::StartupToneWaitStatusL(): AudioReady: %d, proceed", audioReady ); - DoNextStartupPhaseL( EStartupShowingWelcomeAnimation ); - } - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - -// --------------------------------------------------------------------------- -// CStartupAppUi::CoverUIStartupReadySyncOKL() -// --------------------------------------------------------------------------- -void CStartupAppUi::CoverUIStartupReadySyncOKL() - { - TRACES("CStartupAppUi::CoverUIStartupReadySyncOKL()"); - DoNextStartupPhaseL( EStartupStartupOK ); - TRACES("CStartupAppUi::CoverUIStartupReadySyncOKL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::WaitingCoverUIStartupReadySyncL() -// --------------------------------------------------------------------------- -void CStartupAppUi::WaitingCoverUIStartupReadySyncL() - { - TRACES("CStartupAppUi::WaitingCoverUIStartupReadySyncL()"); - if (iCoverUISupported) - { - iStartupMediatorObserver->IssueCommand(SecondaryDisplay::ECmdStartupSync, - SecondaryDisplay::EStartStartupReady); - } - else - { - DoNextStartupPhaseL( EStartupStartupOK ); - } - TRACES("CStartupAppUi::WaitingCoverUIStartupReadySyncL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::RaiseCoverUIEvent() -// --------------------------------------------------------------------------- -void CStartupAppUi::RaiseCoverUIEvent( TUid aCategory, - TInt aEventId, - const TDesC8& aData ) - { - TRACES("CStartupAppUi::RaiseCoverUIEvent()"); - if (iCoverUISupported) - { - iStartupMediatorObserver->RaiseEvent( aCategory, - aEventId, - aData ); - } - TRACES("CStartupAppUi::RaiseCoverUIEvent(): End"); - } - // --------------------------------------------------------------------------- // CStartupAppUi::SetCriticalBlockEndedL() // --------------------------------------------------------------------------- @@ -1466,11 +682,8 @@ if( iCriticalBlockEnded ) { TRACES("CStartupAppUi::WaitingCriticalBlockEndingL(): CriticalBlock has ended. Continue."); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + DoNextStartupPhaseL( EStartupOfflineModeQuery ); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - DoNextStartupPhaseL( EStartupWaitingTouchScreenCalib ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION } TRACES("CStartupAppUi::WaitingCriticalBlockEndingL(): End"); } @@ -1515,7 +728,7 @@ { TRACES("CStartupAppUi::SetEmergencyCallsOnlyL(): Entered emergency calls only state."); - DoNextStartupPhaseL( EStartupWaitingCUIStartupReady ); + DoNextStartupPhaseL( EStartupStartupOK ); } TRACES("CStartupAppUi::SetEmergencyCallsOnlyL(): End"); } @@ -1537,28 +750,6 @@ TRACES("CStartupAppUi::SwStateFatalStartupErrorL(): End"); } - - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupAppUi::GetOfflineModeQueryShown() -// --------------------------------------------------------------------------- -TBool CStartupAppUi::GetOfflineModeQueryShown() - { - TRACES1("CStartupAppUi::GetOfflineModeQueryShown(): iOfflineModeQueryShown == %d ", iOfflineModeQueryShown ); - return iOfflineModeQueryShown; - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::SetOfflineModeQueryShown() -// --------------------------------------------------------------------------- -void CStartupAppUi::SetOfflineModeQueryShown(TBool aValue) - { - TRACES1("CStartupAppUi::SetOfflineModeQueryShown(): iOfflineModeQueryShown == %d ", iOfflineModeQueryShown ); - iOfflineModeQueryShown = aValue; - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - // ---------------------------------------------------------------------------- // CStartAppUi::DosInOfflineModeL() // ---------------------------------------------------------------------------- @@ -1641,20 +832,23 @@ else if ( iOfflineModeSupported && DosInOfflineModeL() ) { TRACES("CStartupAppUi::ShowOfflineModeQueryL(): Offline mode query needed"); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION RProperty::Set( KPSUidStartup, KPSSplashShutdown, ESplashShutdown ); iAnimation->BringToForeground(); iMainView->DrawDeferred(); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - iWelcomeAnimation->UpdateDrawInfo( EStartupDIQueriesOn ); - iWelcomeAnimation->DrawNow(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION iOfflineModeQueryShown = ETrue; - CAknQueryDialog* dlg = new (ELeave) CAknQueryDialog( CAknQueryDialog::ENoTone ); - TRACES("CStartupAppUi::ShowOfflineModeQueryL(): Publish dialog for Secondary UI"); - dlg->PublishDialogL(SecondaryDisplay::ECmdShowOfflineQuery, - SecondaryDisplay::KCatStartup); - if ( dlg->ExecuteLD( R_STARTUP_OFFLINE_MODE_QUERY ) ) + CHbDeviceMessageBoxSymbian *aMessageBox = NULL; + aMessageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EQuestion); + _LIT(KText, "Continue using phone in Offline mode?"); + aMessageBox->SetTextL(KText); + _LIT(KAcceptText, "Yes"); + aMessageBox->SetButtonTextL(CHbDeviceMessageBoxSymbian::EAcceptButton, KAcceptText); + _LIT(KRejectText, "No"); + aMessageBox->SetButtonTextL(CHbDeviceMessageBoxSymbian::ERejectButton, KRejectText); + //aMessageBox->SetDismissPolicy(HbPopup::NoDismiss); + //define the selection button to hold user's option choice + CHbDeviceMessageBoxSymbian::TButtonId selection; + selection = aMessageBox->ExecL(); + if ( selection == CHbDeviceMessageBoxSymbian::EAcceptButton ) { TRACES("CStartupAppUi::ShowOfflineModeQueryL(): Offline Mode query: YES -> Boot to Offline"); reply = 1; @@ -1688,7 +882,7 @@ { TRACES1("CStartupAppUi::ShowOfflineModeQueryL(): KStartupBootIntoOffline set err %d", err); } - + TRACES("CStartupAppUi::ShowOfflineModeQueryL(): End"); } @@ -1698,395 +892,13 @@ void CStartupAppUi::CancelAnimation() { TRACES("CStartupAppUi::CancelAnimation()"); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + iAnimation->Cancel(); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - iWelcomeAnimation->CancelAnimation(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + TRACES("CStartupAppUi::CancelAnimation(): End"); } -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowCountryAndCityListsL() -// --------------------------------------------------------------------------- -void CStartupAppUi::ShowCountryAndCityListsL() - { - TRACES("CStartupAppUi::ShowCountryAndCityListsL()"); - TInt cityselected( EFalse ); - while ( !cityselected ) - { - TRACES1("CStartupAppUi::ShowCountryAndCityListsL(): City item to focus: %d", iCounryListIndex); - TInt cityGroupId = ShowCountryListL(); - TRACES1("CStartupAppUi::ShowCountryAndCityListsL(): City group id: %d", cityGroupId); - if ( cityGroupId != KErrCancel ) - { - cityselected = ShowCityListL(cityGroupId); - } - else - { - cityselected = ETrue; - } - } - TRACES("CStartupAppUi::ShowCountryAndCityListsL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowCountryListL() -// --------------------------------------------------------------------------- -TInt CStartupAppUi::ShowCountryListL() - { - TRACES("CStartupAppUi::ShowCountryListL()"); - - CAknSinglePopupMenuStyleListBox* listBox = - new(ELeave) CAknSinglePopupMenuStyleListBox; - CleanupStack::PushL(listBox); - - CStartupPopupList* popupList = CStartupPopupList::NewL(listBox, R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT, - AknPopupLayouts::EMenuGraphicHeadingWindow ); - - CleanupStack::PushL(popupList); - - listBox->ConstructL(popupList, EAknListBoxSelectionList | EAknListBoxScrollBarSizeExcluded); - listBox->CreateScrollBarFrameL( ETrue ); - listBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff, - CEikScrollBarFrame::EAuto ); - - listBox->ItemDrawer()->FormattedCellData()->EnableMarqueeL( ETrue ); - - CDesCArrayFlat *items = new(ELeave)CDesCArrayFlat(1); - - CleanupStack::PushL(items); - - CTzLocalizer* tzLocalizer = CTzLocalizer::NewL(); - CleanupStack::PushL(tzLocalizer); - - CTzLocalizedCityGroupArray* countryList; - countryList = tzLocalizer->GetAllCityGroupsL(CTzLocalizer::ETzAlphaNameAscending); - CleanupStack::PushL(countryList); - - TRACES("CStartupAppUi::ShowCountryListL(): Create list of cities"); - for(TInt i = 0; i Count(); i++) - { - CTzLocalizedCityGroup& cityGroup = countryList->At(i); - - // Check if the country name is blank. - // If it is blank, ignore it. Empty name shouldn't be shown in the list. - if(cityGroup.Name().Compare(KEmpty) != 0) - { - TBuf countryitem; - countryitem.Insert(0,cityGroup.Name()); - TRACES1("CStartupAppUi::ShowCountryListL(): Create country to list: %S", &countryitem); - items->AppendL(countryitem); - } - } - - CleanupStack::PopAndDestroy( countryList ); - - CTextListBoxModel* model=listBox->Model(); - model->SetItemTextArray(items); - model->SetOwnershipType(ELbmOwnsItemArray); - - TRACES("CStartupAppUi::ShowCountryListL(): Set title"); - // Set title - HBufC* title = StringLoader::LoadLC( R_QTN_SU_SELECT_COUNTRY ); - popupList->SetTitleL(title->Des()); - CleanupStack::PopAndDestroy( title ); - - popupList->EnableAdaptiveFind(); - listBox->SetCurrentItemIndex(iCounryListIndex); - - TInt cityGroupId; - - if (iCoverUISupported) - { - TRACES("CStartupAppUi::ShowCountryListL(): Publish country list for Secondary UI"); - TPckgBuf data( SecondaryDisplay::EShowCountryQuery ); - iStartupMediatorObserver->RaiseEvent( SecondaryDisplay::KCatStartup, - SecondaryDisplay::EMsgStartupEvent, - data ); - } - - TRACES("CStartupAppUi::ShowCountryListL(): Show the list"); - if (popupList->ExecuteLD()) - { - iCounryListIndex = listBox->CurrentItemIndex(); - TRACES1("CStartupAppUi::ShowCountryListL(): CurrentItemIndex: %d", iCounryListIndex); - TPtrC countryName = listBox->Model()->ItemText(iCounryListIndex); - - CTzLocalizedCityGroup* tzLocalizedCityGroup = tzLocalizer->FindCityGroupByNameL(countryName); - CleanupStack::PushL(tzLocalizedCityGroup); - - cityGroupId = tzLocalizedCityGroup->Id(); - CleanupStack::PopAndDestroy( tzLocalizedCityGroup ); - - TRACES1("CStartupAppUi::ShowCountryListL(): Selected country %S", &countryName); - } - else - { - TRACES("CStartupAppUi::ShowCountryListL(): Country list cancelled"); - cityGroupId = KErrCancel; - } - - CleanupStack::PopAndDestroy( tzLocalizer ); - CleanupStack::Pop( items ); - CleanupStack::Pop( popupList ); - CleanupStack::PopAndDestroy( listBox ); - - TRACES1("CStartupAppUi::ShowCountryListL(): End. Return city group id: %d", cityGroupId); - return cityGroupId; - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowCityListL() -// --------------------------------------------------------------------------- -TBool CStartupAppUi::ShowCityListL(TUint8 cityGroupId) - { - TRACES("CStartupAppUi::ShowCityListL()"); - - TBool retval( ETrue ); - - CTzLocalizer* tzLocalizer = CTzLocalizer::NewL(); - CleanupStack::PushL(tzLocalizer); - - CTzLocalizedCityArray* cityList; - - TRACES1("CStartupAppUi::ShowCityListL(): Create list of cities in group %d", cityGroupId); - - cityList = tzLocalizer->GetCitiesInGroupL(cityGroupId,//cityGroup.Id(), - CTzLocalizer::ETzAlphaNameAscending ); - CleanupStack::PushL(cityList); - - if ( cityList->Count() == 1 ) - { - TRACES("CStartupAppUi::ShowCityListL(): Only one city in citygroup. This can be selected automatically."); - - CTzLocalizedCity& city = cityList->At(0); - - CTzLocalizedCity* tzLocalizedCity = tzLocalizer->FindCityByNameL(city.Name()); - CleanupStack::PushL(tzLocalizedCity); - - TInt timeZoneId = tzLocalizedCity->TimeZoneId(); - - tzLocalizer->SetTimeZoneL(timeZoneId); - tzLocalizer->SetFrequentlyUsedZoneL(*tzLocalizedCity, CTzLocalizedTimeZone::ECurrentZone); - - CleanupStack::PopAndDestroy( tzLocalizedCity ); - CleanupStack::PopAndDestroy( cityList ); - CleanupStack::PopAndDestroy( tzLocalizer ); - - TRACES1("CStartupAppUi::ShowCityListL(): End, returns %d", retval); - return retval; - } - - CAknSinglePopupMenuStyleListBox* listBox = - new(ELeave) CAknSinglePopupMenuStyleListBox; - CleanupStack::PushL(listBox); - - CStartupPopupList* popupList = CStartupPopupList::NewL(listBox, R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT, - AknPopupLayouts::EMenuGraphicHeadingWindow ); - - CleanupStack::PushL(popupList); - - CDesCArrayFlat *items = new(ELeave)CDesCArrayFlat(1); - - CleanupStack::PushL(items); - - for(TInt j = 0; j < cityList->Count(); j++) - { - CTzLocalizedCity& city = cityList->At(j); - - // Check if the city name is blank. - // If it is blank, ignore it. Empty name shouldn't be shown in the list. - if(city.Name().Compare(KEmpty) != 0) - { - TBuf homecityitem; - homecityitem.Insert(0,city.Name()); - TRACES1("CStartupAppUi::ShowCityListL(): Create to list: %S", &homecityitem); - items->AppendL(homecityitem); - } - } - - listBox->ConstructL(popupList, EAknListBoxSelectionList | EAknListBoxScrollBarSizeExcluded); - listBox->CreateScrollBarFrameL( ETrue ); - listBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff, - CEikScrollBarFrame::EAuto ); - - listBox->ItemDrawer()->FormattedCellData()->EnableMarqueeL( ETrue ); - - CTextListBoxModel* model=listBox->Model(); - model->SetItemTextArray(items); - model->SetOwnershipType(ELbmOwnsItemArray); - - TRACES("CStartupAppUi::ShowCityListL(): Set title"); - // Set title - HBufC* title = StringLoader::LoadLC( R_QTN_SU_SELECT_CITY ); - popupList->SetTitleL(title->Des()); - CleanupStack::PopAndDestroy(title); - - popupList->EnableAdaptiveFind(); - - if (iCoverUISupported) - { - TRACES("CStartupAppUi::ShowCountryListL(): Publish city list for Secondary UI"); - TPckgBuf data( SecondaryDisplay::EShowCityQuery ); - iStartupMediatorObserver->RaiseEvent( SecondaryDisplay::KCatStartup, - SecondaryDisplay::EMsgStartupEvent, - data ); - } - - TRACES("CStartupAppUi::ShowCityListL(): Show the list"); - if (popupList->ExecuteLD()) - { - TInt index(listBox->CurrentItemIndex()); - TRACES1("CStartupAppUi::ShowCityListL(): CurrentItemIndex: %d", index); - TPtrC cityName = listBox->Model()->ItemText(index); - - CTzLocalizedCity* tzLocalizedCity = tzLocalizer->FindCityByNameL(cityName); - CleanupStack::PushL(tzLocalizedCity); - - TInt timeZoneId = tzLocalizedCity->TimeZoneId(); - - tzLocalizer->SetTimeZoneL(timeZoneId); - tzLocalizer->SetFrequentlyUsedZoneL(*tzLocalizedCity, CTzLocalizedTimeZone::ECurrentZone); - - CleanupStack::PopAndDestroy(tzLocalizedCity); - - TRACES1("CStartupAppUi::ShowCityListL(): Selected city %S", &cityName); - } - else - { - TRACES("CStartupAppUi::ShowCityListL(): City list cancelled"); - retval = EFalse; - } - - CleanupStack::Pop(items); - CleanupStack::Pop(popupList); - CleanupStack::PopAndDestroy(listBox); - CleanupStack::PopAndDestroy(cityList); - CleanupStack::PopAndDestroy(tzLocalizer); - - - TRACES("CStartupAppUi::ShowCityListL(): Home city selected"); - TRACES1("CStartupAppUi::ShowCityListL(): End, return %d", retval); - return retval; - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowTimeQueryL() -// --------------------------------------------------------------------------- -TBool CStartupAppUi::ShowTimeQueryL() - { - TRACES("CStartupAppUi::ShowTimeQueryL()"); - - TTime time; - GetDefaultTimeAndDate( time ); - - CStartupQueryDialog* dlg = new (ELeave) CStartupQueryDialog(time, CAknQueryDialog::ENoTone); - TRACES("CStartupAppUi::ShowTimeQueryL(): Publish dialog for Secondary UI"); - dlg->PublishDialogL(SecondaryDisplay::ECmdShowTimeQuery, SecondaryDisplay::KCatStartup); - if( dlg->ExecuteLD( R_STARTUP_TIME_SETTING_QUERY ) ) - { - TTime current; - current.HomeTime(); - TDateTime cTime = current.DateTime(); - TDateTime atime = time.DateTime(); - atime.SetYear(cTime.Year()); - atime.SetMonth(cTime.Month()); - atime.SetDay(cTime.Day()); - time = atime; - - RTz rtz; - User::LeaveIfError(rtz.Connect()); - User::LeaveIfError(rtz.SetHomeTime(time)); - rtz.Close(); - - TRACES("CStartupAppUi::ShowTimeQueryL(): End, return ETrue"); - return ETrue; - } - else - { - //in case of poweroff key was pressed and shutdown is occuring - TRACES("CStartupAppUi::ShowTimeQueryL(): End, return EFalse"); - return EFalse; - } - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::ShowDateQueryL() -// --------------------------------------------------------------------------- -TBool CStartupAppUi::ShowDateQueryL() - { - TRACES("CStartupAppUi::ShowDateQueryL()"); - - - CStartupQueryDialog* dlg = new (ELeave) CStartupQueryDialog(iTime, CAknQueryDialog::ENoTone); - TRACES("CStartupAppUi::ShowDateQueryL(): Publish dialog for Secondary UI"); - dlg->PublishDialogL(SecondaryDisplay::ECmdShowDateQuery, SecondaryDisplay::KCatStartup); - - TInt query( R_STARTUP_DATE_SETTING_QUERY_NOBACK ); - if ( iFirstBoot ) - { - query = R_STARTUP_DATE_SETTING_QUERY; - } - - if( dlg->ExecuteLD( query ) ) - { - TTime current; - current.HomeTime(); - TDateTime cTime = current.DateTime(); - TDateTime atime = iTime.DateTime(); - atime.SetHour(cTime.Hour()); - atime.SetMinute(cTime.Minute()); - atime.SetSecond(cTime.Second()); - atime.SetMicroSecond(cTime.MicroSecond()); - iTime = atime; - - RTz rtz; - User::LeaveIfError(rtz.Connect()); - User::LeaveIfError(rtz.SetHomeTime(iTime)); - rtz.Close(); - - TRACES("CStartupAppUi::ShowDateQueryL(): End, return ETrue"); - return ETrue; - } - else - { - // Back key pressed. ( Or poweroff key was pressed and shutdown is occuring ) - TRACES("CStartupAppUi::ShowDateQueryL(): End, return EFalse"); - return EFalse; - } - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::GetDefaultTimeAndDate() -// --------------------------------------------------------------------------- -void CStartupAppUi::GetDefaultTimeAndDate( TTime& aTime ) - { - TRACES("CStartupAppUi::GetDefaultTimeAndDate(): Get Time and Date from CenRep"); - - CRepository* repository(NULL); - - TRAPD( err, repository = CRepository::NewL( KCRUidStartupConf ) ); - if ( !err ) - { - TBuf buf; - err = repository->Get( KStartupDefaultTime, buf ); - if( !err ) - { - err = aTime.Set(buf); // returns error if cenrep time format not valid - } - } - - if ( err ) - { - TRACES("CStartupAppUi::GetDefaultTimeAndDate(): Failed to get valid data from CenRep. Using default"); - aTime.Set(KDefaultDateTimeValue); - } - - delete repository; - TRACES("CStartupAppUi::GetDefaultTimeAndDate(): End"); - } // --------------------------------------------------------------------------- // CStartupAppUi::FirstBoot() @@ -2188,7 +1000,7 @@ } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + // --------------------------------------------------------------------------- // CStartupAppUi::AnimationFinished() // --------------------------------------------------------------------------- @@ -2230,7 +1042,7 @@ } else if ( iInternalState == EStartupShowingOperatorAnimation ) { - TRAP(err, DoNextStartupPhaseL( EStartupShowingUserWelcomeNote )); + TRAP(err, DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck)); } if ( err != KErrNone ) @@ -2240,51 +1052,6 @@ TRACES("CStartupAppUi::AnimationFinished(): End"); } -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupAppUi::StopStartupTone() -// --------------------------------------------------------------------------- -void CStartupAppUi::StopStartupTone() - { - TRACES("CStartupAppUi::StopStartupTone()"); - if ((iStartupTone) && (iStartupTone->Playing())) - { - iStartupTone->Stop(); - } - TRACES("CStartupAppUi::StopStartupTone(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::StopOperatorTone() -// --------------------------------------------------------------------------- -void CStartupAppUi::StopOperatorTone() - { - TRACES("CStartupAppUi::StopOperatorTone()"); - if ((iOpStartupTone) && (iOpStartupTone->Playing())) - { - iOpStartupTone->Stop(); - } - TRACES("CStartupAppUi::StopOperatorTone(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::StartupTonePlaying() -// --------------------------------------------------------------------------- -TBool CStartupAppUi::StartupTonePlaying() - { - TRACES("CStartupAppUi::StartupTonePlaying()"); - return iStartupTone->Playing(); - } - -// --------------------------------------------------------------------------- -// CStartupAppUi::OperatorTonePlaying() -// --------------------------------------------------------------------------- -TBool CStartupAppUi::OperatorTonePlaying() - { - TRACES("CStartupAppUi::OperatorTonePlaying()"); - return iOpStartupTone->Playing(); - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION // --------------------------------------------------------------------------- // CStartupAppUi::SetCleanBoot() @@ -2305,14 +1072,7 @@ return iSimSupported; } -// ---------------------------------------------------------------------------- -// CStartupAppUi::CoverUISupported() -// ---------------------------------------------------------------------------- -TBool CStartupAppUi::CoverUISupported() - { - TRACES("CStartupAppUi::CoverUISupported()"); - return iCoverUISupported; - } + // --------------------------------------------------------------------------- // CStartupAppUi::DoNextStartupPhaseL( TStartupInternalState toState ) @@ -2324,14 +1084,14 @@ // 5 EStartupWaitingTouchScreenCalib // 6 EStartupWaitingPhoneLightIdle 8, 18 // 8 EStartupOfflineModeQuery 9, 18 -// 9 EStartupWaitingCUIWelcomeAnim 10, 18 +// 9 EStartupWaitingCUIWelcomeAnim 10, 18 Removed // 10 EStartupWaitingStartupTone 11, 18 // 11 EStartupShowingWelcomeAnimation 12, 14, 18 // 12 EStartupWaitingCUIOperatorAnim 13, 18 // 13 EStartupShowingOperatorAnimation 14, 14, 18 -// 14 EStartupShowingUserWelcomeNote 15, 18 +// 14 EStartupShowingUserWelcomeNote 15, 18 Removed // 15 EStartupFirstBootAndRTCCheck 16, 18 -// 16 EStartupWaitingCUIStartupReady 17, 18 +// 16 EStartupWaitingCUIStartupReady 17, 18 Removed // 17 EStartupStartupOK - // 18 EStartupSystemFatalError - @@ -2367,42 +1127,18 @@ { switch( toState ) { - case EStartupWaitingCUIStartupReady: - iInternalState = EStartupWaitingCUIStartupReady; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingCUIStartupReady"); - WaitingCoverUIStartupReadySyncL(); - break; -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - case EStartupWaitingTouchScreenCalib: - iInternalState = EStartupWaitingTouchScreenCalib; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingTouchScreenCalib"); - WaitingTouchScreenCalibL(); - break; - case EStartupSystemFatalError: - SystemFatalErrorL(); + case EStartupStartupOK: + iInternalState = EStartupStartupOK; + TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupStartupOK"); + DoStartupEndPart(); break; - default: - __ASSERT_DEBUG( - EFalse, - PANIC( EStartupInvalidInternalStateChange ) ); - break; - } - } - break; - case EStartupWaitingTouchScreenCalib: - { - switch( toState ) - { -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + case EStartupOfflineModeQuery: iInternalState = EStartupOfflineModeQuery; TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupOfflineModeQuery"); ShowOfflineModeQueryL(); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + DoNextStartupPhaseL( EStartupWaitingShowStartupAnimation ); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - DoNextStartupPhaseL( EStartupWaitingCUIWelcomeAnim ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION break; case EStartupSystemFatalError: SystemFatalErrorL(); @@ -2419,20 +1155,13 @@ { switch( toState ) { -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + case EStartupWaitingShowStartupAnimation: iInternalState = EStartupWaitingShowStartupAnimation; TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingShowStartupAnimation"); WaitingStartupAnimationStartL(); break; -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - case EStartupWaitingCUIWelcomeAnim: - iInternalState = EStartupWaitingCUIWelcomeAnim; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingCUIWelcomeAnim"); - WaitingCoverUIWelcomeAnimationSyncL(); - break; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - case EStartupSystemFatalError: + case EStartupSystemFatalError: SystemFatalErrorL(); break; default: @@ -2443,50 +1172,6 @@ } } break; -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - case EStartupWaitingCUIWelcomeAnim: - { - switch( toState ) - { - case EStartupWaitingStartupTone: - iInternalState = EStartupWaitingStartupTone; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingStartupTone"); - WaitingStartupToneL(); - break; - case EStartupSystemFatalError: - SystemFatalErrorL(); - break; - default: - __ASSERT_DEBUG( EFalse, - PANIC( EStartupInvalidInternalStateChange ) ); - break; - } - } - break; - case EStartupWaitingStartupTone: - { - switch( toState ) - { - case EStartupShowingWelcomeAnimation: - iInternalState = EStartupShowingWelcomeAnimation; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupShowingWelcomeAnimation"); - iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeAnimStart ); - iWelcomeAnimation->DrawNow(); - DoStartupShowWelcomeAnimationL(); - iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeAnimEnd ); - iWelcomeAnimation->DrawNow(); - break; - case EStartupSystemFatalError: - SystemFatalErrorL(); - break; - default: - __ASSERT_DEBUG( EFalse, - PANIC( EStartupInvalidInternalStateChange ) ); - break; - } - } - break; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION case EStartupWaitingShowStartupAnimation: { switch( toState ) @@ -2511,19 +1196,11 @@ { switch( toState ) { -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + case EStartupShowingOperatorAnimation: iInternalState = EStartupShowingOperatorAnimation; TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState: EStartupShowingOperatorAnimation"); DoStartupShowOperatorAnimationL(); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - case EStartupWaitingCUIOperatorAnim: - iOperatorAnimation = CStartupOperatorAnimation::NewL( this, ClientRect()); - AddToStackL( iOperatorAnimation); - iInternalState = EStartupWaitingCUIOperatorAnim; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState: EStartupWaitingCUIOperatorAnim"); - WaitingCoverUIOperatorAnimationSyncL(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION break; case EStartupFirstBootAndRTCCheck: iInternalState = EStartupFirstBootAndRTCCheck; @@ -2540,45 +1217,12 @@ } } break; -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - case EStartupWaitingCUIOperatorAnim: - { - switch( toState ) - { - case EStartupShowingOperatorAnimation: - iInternalState = EStartupShowingOperatorAnimation; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState: EStartupShowingOperatorAnimation"); - iOperatorAnimation->UpdateDrawInfo( EStartupDIOperatorAnimStart ); - DoStartupShowOperatorAnimationL(); - break; - case EStartupSystemFatalError: - SystemFatalErrorL(); - break; - default: - __ASSERT_DEBUG( EFalse, - PANIC( EStartupInvalidInternalStateChange ) ); - break; - } - } - break; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION case EStartupShowingOperatorAnimation: { switch( toState ) { - case EStartupShowingUserWelcomeNote: -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iUserWelcomeNote = CStartupUserWelcomeNote::NewL( *this, ClientRect()); - AddToStackL( iUserWelcomeNote ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - iInternalState = EStartupShowingUserWelcomeNote; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState: EStartupShowingUserWelcomeNote"); -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeNoteStart ); - iUserWelcomeNote->SetUserWelcomeNoteShowing(ETrue); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - DoStartupShowUserWelcomeNoteL(); - break; + + case EStartupFirstBootAndRTCCheck: iInternalState = EStartupFirstBootAndRTCCheck; TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupFirstBootAndRTCCheck"); @@ -2594,48 +1238,11 @@ } } break; - case EStartupShowingUserWelcomeNote: - { - switch( toState ) - { - case EStartupFirstBootAndRTCCheck: - iInternalState = EStartupFirstBootAndRTCCheck; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupFirstBootAndRTCCheck"); - DoStartupFirstBootAndRTCCheckL(); - break; - case EStartupSystemFatalError: - SystemFatalErrorL(); - break; - default: - __ASSERT_DEBUG( EFalse, - PANIC( EStartupInvalidInternalStateChange ) ); - break; - } - } - break; + case EStartupFirstBootAndRTCCheck: { switch( toState ) { - case EStartupWaitingCUIStartupReady: - iInternalState = EStartupWaitingCUIStartupReady; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingCUIStartupReady"); - WaitingCoverUIStartupReadySyncL(); - break; - case EStartupSystemFatalError: - SystemFatalErrorL(); - break; - default: - __ASSERT_DEBUG( EFalse, - PANIC( EStartupInvalidInternalStateChange ) ); - break; - } - } - break; - case EStartupWaitingCUIStartupReady: - { - switch( toState ) - { case EStartupStartupOK: iInternalState = EStartupStartupOK; TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupStartupOK"); @@ -2659,7 +1266,6 @@ case EStartupOfflineModeQuery: case EStartupShowingWelcomeAnimation: case EStartupShowingOperatorAnimation: - case EStartupShowingUserWelcomeNote: case EStartupFirstBootAndRTCCheck: case EStartupWaitingCUIStartupReady: case EStartupStartupOK: @@ -2715,7 +1321,7 @@ return ret_val; } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + // --------------------------------------------------------------------------- // CStartupAppUi::UpdateStartupUiPhase() // --------------------------------------------------------------------------- @@ -2730,5 +1336,5 @@ TRACES1("CStartupAppUi::UpdateStartupUiPhase(): KPSStartupUiPhase set err %d", err); } } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + // End of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupApplication.cpp --- a/startupservices/Startup/src/StartupApplication.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/src/StartupApplication.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -21,6 +21,12 @@ // INCLUDE FILES #include "StartupApplication.h" #include "StartupDocument.h" +#include "startupappprivatepskeys.h" +#include + +//Security policies +_LIT_SECURITY_POLICY_C1(KReadDeviceDataPolicy, ECapabilityReadDeviceData); +_LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData); // ========================= MEMBER FUNCTIONS ================================ @@ -53,6 +59,12 @@ GLDEF_C TInt E32Main() { + //Make sure startup app is only started once + TInt ret = RProperty::Define(KPSUidStartupApp, KPSStartupAppStarted, RProperty::EInt, KReadDeviceDataPolicy, KWriteDeviceDataPolicy); + if(ret!=KErrNone) + { + return KErrNone; + } return EikStart::RunApplication(NewApplication); } diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupMediatorObserver.cpp --- a/startupservices/Startup/src/StartupMediatorObserver.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,182 +0,0 @@ -/* -* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Implementation of CStartupMediatorObserver class -* -*/ - - -#include - -#include "StartupMediatorObserver.h" -#include "StartupAppUi.h" -#include "startupdomainpskeys.h" - -// ================= MEMBER FUNCTIONS ======================= - -// ---------------------------------------------------- -// CStartupMediatorObserver::ConstructL() -// ---------------------------------------------------- -void CStartupMediatorObserver::ConstructL() - { - TRACES("CStartupMediatorObserver::ConstructL()"); - - TRACES("CStartupMediatorObserver::ConstructL(): iCommandInitiator"); - iCommandInitiator = CMediatorCommandInitiator::NewL(this); - - TRACES("CStartupMediatorObserver::ConstructL(): iEventProvider"); - iEventProvider = CMediatorEventProvider::NewL(); - - TRACES("CStartupMediatorObserver::ConstructL(): Register event: EMsgWelcomeImageEvent "); - iEventProvider->RegisterEvent( KMediatorSecondaryDisplayDomain, - SecondaryDisplay::KCatStartup, - SecondaryDisplay::EMsgWelcomeImageEvent, - TVersion(0,0,0), - ECapabilitySwEvent ); - - TRACES("CStartupMediatorObserver::ConstructL(): Register event: EMsgStartupEvent "); - iEventProvider->RegisterEvent( KMediatorSecondaryDisplayDomain, - SecondaryDisplay::KCatStartup, - SecondaryDisplay::EMsgStartupEvent, - TVersion(0,0,0), - ECapabilitySwEvent ); - - TRACES("CStartupMediatorObserver::ConstructL(): End"); - } - -// ---------------------------------------------------- -// CStartupMediatorObserver::NewL( CStartupAppUi* aStartupAppUi ) -// ---------------------------------------------------- -CStartupMediatorObserver* CStartupMediatorObserver::NewL( CStartupAppUi* aStartupAppUi ) - { - TRACES("CStartupMediatorObserver::NewL()"); - CStartupMediatorObserver* self = new (ELeave) CStartupMediatorObserver( aStartupAppUi ); - - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop(); // self - - TRACES("CStartupMediatorObserver::NewL(): End"); - return self; - } - -// ---------------------------------------------------- -// CStartupMediatorObserver::CStartupMediatorObserver( CStartupAppUi* aStartupAppUi ) -// C++ default constructor can NOT contain any code, that -// might leave. -// ---------------------------------------------------- -CStartupMediatorObserver::CStartupMediatorObserver( CStartupAppUi* aStartupAppUi ) : - iStartupAppUi( aStartupAppUi ), - iSyncData( NULL ) - { - TRACES("CStartupMediatorObserver::CStartupMediatorObserver()"); - } - -// ---------------------------------------------------- -// CStartupMediatorObserver::~CStartupMediatorObserver() -// ---------------------------------------------------- -CStartupMediatorObserver::~CStartupMediatorObserver() - { - TRACES("CStartupMediatorObserver::~CStartupMediatorObserver()"); - delete iCommandInitiator; - delete iEventProvider; - TRACES("CStartupMediatorObserver::~CStartupMediatorObserver(): End"); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -void CStartupMediatorObserver::IssueCommand(TInt aCommandId, TInt aData) - { - TRACES("CStartupMediatorObserver::IssueCommand()"); - TRACES1("CStartupMediatorObserver::IssueCommand(): aCommandId %d", aCommandId); - TRACES1("CStartupMediatorObserver::IssueCommand(): aData: %d", aData); - if (aCommandId == SecondaryDisplay::ECmdStartupSync) - { - iSyncData = aData; - } - - TPckgBuf data( aData ); - iCommandInitiator->IssueCommand( KMediatorSecondaryDisplayDomain, - SecondaryDisplay::KCatStartup, - aCommandId, - TVersion(0,0,0), - data); - - TRACES("CStartupMediatorObserver::IssueCommand(): End"); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -void CStartupMediatorObserver::CommandResponseL( TUid /*aDomain*/, - TUid /*aCategory*/, - TInt aCommandId, - TInt /*aStatus*/, - const TDesC8& /*aData*/ ) - { - TRACES("CStartupMediatorObserver::CommandResponseL()"); - if (aCommandId == SecondaryDisplay::ECmdStartupSync) - { -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - if ( iSyncData == SecondaryDisplay::EStartWelcomeAnimation ) - { - TRACES("CStartupMediatorObserver::CommandResponseL(): EStartWelcomeAnimation"); - iStartupAppUi->CoverUIWelcomeAnimationSyncOKL(); - } - else if ( iSyncData == SecondaryDisplay::EStartOperatorAnimation ) - { - TRACES("CStartupMediatorObserver::CommandResponseL(): EStartOperatorAnimation"); - iStartupAppUi->CoverUIOperatorAnimationSyncOKL(); - } - else -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - if ( iSyncData == SecondaryDisplay::EStartStartupReady ) - { - TRACES("CStartupMediatorObserver::CommandResponseL(): EStartStartupReady"); - iStartupAppUi->CoverUIStartupReadySyncOKL(); - } - else - { - TRACES("CStartupMediatorObserver::CommandResponseL(): Unsupported command"); - } - } - - TRACES("CStartupMediatorObserver::CommandResponseL(): End"); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -void CStartupMediatorObserver::RaiseEvent( TUid aCategory, - TInt aEventId, - const TDesC8& aData ) - { - TRACES("CStartupMediatorObserver::RaiseEvent()"); - TRACES1("CStartupMediatorObserver::RaiseEvent(): domain :%d", KMediatorSecondaryDisplayDomain); - TRACES1("CStartupMediatorObserver::RaiseEvent(): category:%d", aCategory); - TRACES1("CStartupMediatorObserver::RaiseEvent(): event id:%d", aEventId); - TRACES1("CStartupMediatorObserver::RaiseEvent(): data :%S", &aData); - TInt err = iEventProvider->RaiseEvent( KMediatorSecondaryDisplayDomain, - aCategory, - aEventId, - TVersion(0,0,0), - aData ); - if ( err != KErrNone ) - { - TRACES1("CStartupMediatorObserver::RaiseEvent(): Error raising event: err = d", err); - } - TRACES("CStartupMediatorObserver::RaiseEvent(): End"); - } - -// End of File diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupOperatorAnimation.cpp --- a/startupservices/Startup/src/StartupOperatorAnimation.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,206 +0,0 @@ -/* -* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class is the container class of the CStartupOperatorAnimation. -* Is used to show operator animation. -* -*/ - - -// INCLUDE FILES -#include -#include -#include //use of TResourceReader -#include -#include "StartupOperatorAnimation.h" -#include -#include "StartupDefines.h" -#include "Startup.hrh" -#include "StartupAppUi.h" -#include -#include - -// CONSTANTS - -// Path to operator variated animation -_LIT( KOperatorAnimationResource, "z:operatoranimation.rsc" ); - -//Constants used in OfferKeyEventL -const TInt KTimerDelay( 10000); -const TInt KTimerInterval( 10000); - -// ================= MEMBER FUNCTIONS ======================= - -// --------------------------------------------------------------------------- -// CStartupOperatorAnimation::ConstructL(const TRect& aRect) -// Symbian 2nd phase constructor can leave. -// Need different ConstructL from base class CStartupWelcomeAnimation -// because different animation file and time are loaded. -// --------------------------------------------------------------------------- -void CStartupOperatorAnimation::ConstructL(const TRect& /*aRect*/) - { - TRACES("CStartupOperatorAnimation::ConstructL()"); - UpdateDrawInfo( EStartupDIStart ); - CreateWindowL(); - iAnimCancelTimer = CPeriodic::NewL( EPriorityNormal ); - - TRACES("CStartupOperatorAnimation::ConstructL(): Animation loading started"); - iAnim = CAknBitmapAnimation::NewL(); - iAnim->ExcludeAnimationFramesFromCache(); - iAnim->SetContainerWindowL( *this ); - iAnim->SetScaleModeForAnimationFrames(EAspectRatioPreservedAndUnusedSpaceRemoved); - TResourceReader rr; - RConeResourceLoader loader( *CEikonEnv::Static() ); - - TParse* fp = new(ELeave) TParse(); - fp->Set(KOperatorAnimationResource, &KDC_APP_RESOURCE_DIR, NULL); - TRACES1("CStartupOperatorAnimation::ConstructL(): Operator animation resource path: '%S'", &fp->FullName()); - TFileName name( fp->FullName() ); - delete fp; - - TInt fileError = loader.Open( name ); - if ( fileError == KErrNone ) - { - CleanupClosePushL( loader ); - iCoeEnv->CreateResourceReaderLC(rr, R_OPERATOR_IMAGE); - TRAPD(err, iAnim->ConstructFromResourceL( rr )); - TRACES1("CStartupOperatorAnimation::ConstructL(): Operator animation: err = %d", err); - if( err == KErrNone ) - { - TResourceReader timeReader; - iCoeEnv->CreateResourceReaderLC(timeReader, R_ANIM_DURATION); - iShowingTime = timeReader.ReadInt16(); - TRACES1("CStartupOperatorAnimation::ConstructL(): Operator animation showing time: %d", iShowingTime ); - CleanupStack::PopAndDestroy(); // pop timeReader - } - else - { - iShowingTime = 0; - TRACES("CStartupOperatorAnimation::ConstructL(): Animation loading failed"); - } - CleanupStack::PopAndDestroy(); //pop rr - TRACES("CStartupOperatorAnimation::ConstructL(): Animation loading ended"); - CleanupStack::PopAndDestroy(); //pop loader - } - else - { - TRACES("CStartupOperatorAnimation::ConstructL(): Resource file loading failed"); - } - - - SetRect(iAvkonAppUi->ApplicationRect()); - iAnim->SetPosition( TPoint( (iAvkonAppUi->ApplicationRect().Width()/2) - (iAnim->BitmapAnimData()->Size().iWidth/2), - (iAvkonAppUi->ApplicationRect().Height()/2) - (iAnim->BitmapAnimData()->Size().iHeight/2) ) ); - ActivateL(); - - TRACES("CStartupOperatorAnimation::ConstructL(): End"); - } - -// ----------------------------------------------------------------------------- -// CStartupOperatorAnimation::NewL -// Two-phased constructor. -// ----------------------------------------------------------------------------- -// -CStartupOperatorAnimation* CStartupOperatorAnimation::NewL( CStartupAppUi* aStartupAppUi, - const TRect& aRect) - { - TRACES("CStartupOperatorAnimation::NewL()"); - CStartupOperatorAnimation* self = new (ELeave) CStartupOperatorAnimation( aStartupAppUi ); - CleanupStack::PushL(self); - self->ConstructL(aRect); - CleanupStack::Pop(); - return self; - } - -// --------------------------------------------------------- -// CStartupOperatorAnimation::CStartupOperatorAnimation() -// --------------------------------------------------------- -CStartupOperatorAnimation::CStartupOperatorAnimation( CStartupAppUi* aStartupAppUi ) : - CStartupWelcomeAnimation(aStartupAppUi) - { - TRACES("CStartupOperatorAnimation::CStartupOperatorAnimation()"); - iShowingTime = 0; - } - -// --------------------------------------------------------------------------- -// CStartupOperatorAnimation::OfferKeyEventL(...) -// --------------------------------------------------------------------------- -TKeyResponse CStartupOperatorAnimation::OfferKeyEventL(const TKeyEvent& /*aKeyEvent*/, TEventCode /*aType*/) - { - TRACES("CStartupWelcomeAnimation::OfferKeyEventL()"); - if( iAnimationShowing && !iStartupAppUi->HiddenReset() && !iAnimationCancelled ) - { - // Cancel animation - UpdateDrawInfo( EStartupDIOperatorAnimCancelled ); - EndAnimation(); - TRACES("CStartupWelcomeAnimation::OfferKeyEventL(): Timer activated - before"); - iAnimCancelTimer->Start( KTimerDelay, KTimerInterval, - TCallBack( iStartupAppUi->DoStopTimingL, iStartupAppUi ) ); - TRACES("CStartupOperatorAnimation::OfferKeyEventL(): Timer activated - after"); - iAnimationCancelled = ETrue; - } - else if( !iAnimationShowing && iStartupAppUi->OperatorTonePlaying()) - { - TRACES("CStartupOperatorAnimation::OfferKeyEventL() Animation has completed but tone is still playing. Stop it."); - iStartupAppUi->StopOperatorTone(); - } - - TRACES("CStartupOperatorAnimation::OfferKeyEventL(): End"); - return EKeyWasConsumed; - } - -// --------------------------------------------------------------------------- -// CStartupOperatorAnimation::DoDrawing() -// --------------------------------------------------------------------------- -void CStartupOperatorAnimation::DoDrawing() const - { -// These are the cases handled in this function -// EStartupDIOperatorAnimStart, -// EStartupDIOperatorAnimCancelled, -// EStartupDIOperatorAnimEnd -// EStartupDISystemFatalError - TRACES("CStartupOperatorAnimation::DoDrawing()"); - TRACES1("CStartupOperatorAnimation::DoDrawing(): %d ", iDrawUpdateInfo ); - switch ( iDrawUpdateInfo ) - { - - case EStartupDIOperatorAnimStart: - { - TRACES("CStartupOperatorAnimation::DoDrawing(): EStartupDIOperatorAnimStart"); - } - break; - case EStartupDIOperatorAnimCancelled: - { - TRACES("CStartupOperatorAnimation::DoDrawing(): EStartupDIOperatorAnimCancelled"); - EndAnimation(); - TRAPD(err,iStartupAppUi->StopTimingL()); - if (err != KErrNone) - { - TRACES1("CStartupOperatorAnimation::DoDrawing(): StopTimingL() leaves, err = %d", err ); - } - } - break; - case EStartupDIOperatorAnimEnd: - { - TRACES("CStartupOperatorAnimation::DoDrawing(): EStartupDIOperatorAnimEnd"); - } - break; - case EStartupDISystemFatalError: - { - } - break; - default: - break; - } - } diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupPopupList.cpp --- a/startupservices/Startup/src/StartupPopupList.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This class implements a customized pop-up -* which disables LSK if no city/country match is there -* -*/ - - -// INCLUDE FILES - -#include "StartupPopupList.h" -#include -#include "StartupDefines.h" - -// --------------------------------------------------------------------------- -// CStartupPopupList::CStartupPopupList() -// -// --------------------------------------------------------------------------- -CStartupPopupList::CStartupPopupList() - { - } - -// --------------------------------------------------------------------------- -// CStartupPopupList::~CStartupPopupList() -// --------------------------------------------------------------------------- -// -CStartupPopupList::~CStartupPopupList() - { - } - -// --------------------------------------------------------------------------- -// CStartupPopupList::NewL() -// --------------------------------------------------------------------------- -// -CStartupPopupList* CStartupPopupList::NewL( - CAknSinglePopupMenuStyleListBox* aListBox, - TInt aCbaResource, - AknPopupLayouts::TAknPopupLayouts aType) - { - TRACES("CStartupPopupList::NewL()"); - CStartupPopupList* self = new(ELeave)CStartupPopupList(); - CleanupStack::PushL(self); - self->ConstructL(aListBox, aCbaResource, aType); - CleanupStack::Pop(); // self - TRACES("CStartupPopupList::NewL(): End"); - return self; - } - -// --------------------------------------------------------------------------- -// CStartupPopupList::ConstructL() -// Symbian OS second phase constructor -// --------------------------------------------------------------------------- -// - void CStartupPopupList::ConstructL(CAknSinglePopupMenuStyleListBox* aListBox, - TInt aCbaResource, - AknPopupLayouts::TAknPopupLayouts aType) - { - TRACES("CStartupPopupList::ConstructL()"); - CAknPopupList::ConstructL(aListBox, aCbaResource,aType); - TRACES("CStartupPopupList::ConstructL(): End"); - } - - -// --------------------------------------------------------------------------- -// CStartupPopupList::ListBoxItemsChanged() -// Handle the ListBox Change Event and Disable "Select" & "MSK" CBA Buttons -// --------------------------------------------------------------------------- -// -void CStartupPopupList::ListBoxItemsChanged(CEikListBox* aListBox) - { - TRACES("CStartupPopupList::ListBoxItemsChanged()"); - // get the CBA button group container - CEikButtonGroupContainer* cbaContainer = ButtonGroupContainer(); - // check if there's no match of items - if( !aListBox->Model()->NumberOfItems() ) - { - // Disable the 'Select' button - cbaContainer->MakeCommandVisible(EAknSoftkeySelect,EFalse); - // Disable the 'Middle softkey' button - cbaContainer->MakeCommandVisibleByPosition( - CEikButtonGroupContainer::EMiddleSoftkeyPosition,EFalse); - } - // check if 'Select' is disabled - else if(!cbaContainer->IsCommandVisible(EAknSoftkeySelect)) - { - // Enable the 'Select' button if disabled - cbaContainer->MakeCommandVisible(EAknSoftkeySelect,ETrue); - // Enable the 'Middle softkey' button if disabled - cbaContainer->MakeCommandVisibleByPosition( - CEikButtonGroupContainer::EMiddleSoftkeyPosition,ETrue); - } - TRACES("CStartupPopupList::ListBoxItemsChanged(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupPopupList::ActivateL() -// Activate the View and add the ListBox Observer -// --------------------------------------------------------------------------- -// -void CStartupPopupList::ActivateL() - { - TRACES("CStartupPopupList::ActivateL()"); - // call Base class ActivateL() - CAknPopupList::ActivateL(); - // add the listbox item change observer - ListBox()->AddItemChangeObserverL(this); - TRACES("CStartupPopupList::ActivateL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupPopupList::HandlePointerEventL() -// --------------------------------------------------------------------------- -// -void CStartupPopupList::HandlePointerEventL(const TPointerEvent& aPointerEvent) - { - TRACES("CStartupPopupList::HandlePointerEventL()"); - TRACES1("CStartupPopupList::HandlePointerEventL: aPointerEvent.iType == %d",aPointerEvent.iType ); - - /* Handle all taps except when EButton1Down outside of country/city query - -> query is not cancelled and scroll bar does not remain pressed down */ - if ( Rect().Contains( aPointerEvent.iPosition ) || ( !Rect().Contains( aPointerEvent.iPosition ) && - aPointerEvent.iType != TPointerEvent::EButton1Down ) ) - { - CAknPopupList::HandlePointerEventL( aPointerEvent ); - } - - TRACES("CStartupPopupList::HandlePointerEventL(): End"); - } - -// End of File diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupQueryDialog.cpp --- a/startupservices/Startup/src/StartupQueryDialog.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class adds send-key to acknowledge the time/date query. -* Feature is implemented to needs of the PET-chamber in production tests. -* More information can be found in Change Request-database. -* -*/ - - - -// INCLUDE FILES -#include "StartupQueryDialog.h" - -// ========================= MEMBER FUNCTIONS ================================ - -// ----------------------------------------------------------------------------- -// CStartupQueryDialog::CStartupQueryDialog -// C++ default constructor can NOT contain any code, that -// might leave. -// ----------------------------------------------------------------------------- -// -CStartupQueryDialog::CStartupQueryDialog( TTime& aTime, const TTone aTone ) : - CAknTimeQueryDialog( aTime, aTone ) - { - } - -// Destructor -CStartupQueryDialog::~CStartupQueryDialog() - { - } - -// ----------------------------------------------------------------------------- -// CStartupQueryDialog::OfferKeyEventL -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TKeyResponse CStartupQueryDialog::OfferKeyEventL(const TKeyEvent& aKeyEvent, - TEventCode aType) - { - if( aType != EEventKey ) - return EKeyWasNotConsumed; - - if( NeedToDismissQueryL( aKeyEvent ) ) - return EKeyWasConsumed; - return CAknDialog::OfferKeyEventL(aKeyEvent,aType); - } - -// ----------------------------------------------------------------------------- -// CStartupQueryDialog::NeedToDismissQueryL -// Allows user to acknowledge time and date queries with the send key. -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TBool CStartupQueryDialog::NeedToDismissQueryL(const TKeyEvent& aKeyEvent) - { - if (aKeyEvent.iCode == EKeyPhoneSend) - { - DismissQueryL(); - return ETrue; - } - return EFalse; - } - -// ----------------------------------------------------------------------------- -// CStartupQueryDialog::DismissQueryL -// Query is accepted if the left softkey is displayed -// (left softkey is displayed only if there is valid data in the query). -// Query is discarded if the left softkey is not displayed. -// Clients can override this and implement something different. -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -void CStartupQueryDialog::DismissQueryL() - { - if (IsLeftSoftkeyVisible()) - { - TryExitL(EEikBidOk); - } - } - -// ----------------------------------------------------------------------------- -// CStartupQueryDialog::IsLeftSoftkeyVisible -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TBool CStartupQueryDialog::IsLeftSoftkeyVisible() - { - return ButtonGroupContainer().ButtonGroup()->IsCommandVisible( - ButtonGroupContainer().ButtonGroup()->CommandId(0)); - } - -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupTone.cpp --- a/startupservices/Startup/src/StartupTone.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,324 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class is the container class of the CStartupTone. -* Is used to play startup tone. -* -*/ - - -// INCLUDE FILES -#include -#include -#include -#include -#include "StartupTone.h" -#include "StartupAppUi.h" -#include "AudioPreference.h" - -#define MIN_VOLUME 0 -#define MAX_VOLUME 10 - -//=============================== MEMBER FUNCTIONS ============================ -// --------------------------------------------------------- -// Constructor & destructor -// EPOC two phased constructor -// --------------------------------------------------------- -// -CStartupTone::CStartupTone( CStartupAppUi* aStartupAppUi ) : - iTone( NULL ), - iAudioReady( EFalse ), - iPlaying( EFalse ), - iStartupAppUi( aStartupAppUi ), - iHiddenReset (EFalse ), - iStartupWaitingForTone ( EFalse ) - { - } - -CStartupTone::~CStartupTone() - { - TRACES("CStartupTone::~CStartupTone()"); - - if (iTone) - { - if (iPlaying) - { - TRACES("CStartupTone::~CStartupTone(): Still playing. Stop it!"); - iTone->Stop(); - } - delete iTone; - iTone = NULL; - TRACES("CStartupTone::~CStartupTone(): iTone deleted"); - } - TRACES("CStartupTone::~CStartupTone(): End"); - } - -// ---------------------------------------------------- -// CStartupTone::NewL( CStartupAppUi* aStartupAppUi ) -// ---------------------------------------------------- -CStartupTone* CStartupTone::NewL( CStartupAppUi* aStartupAppUi, TToneType aToneType ) - { - TRACES("CStartupTone::NewL()"); - CStartupTone* self = new (ELeave) CStartupTone( aStartupAppUi ); - - CleanupStack::PushL( self ); - self->ConstructL(aToneType); - CleanupStack::Pop(); // self - - TRACES("CStartupTone::NewL(): End"); - return self; - } - -void CStartupTone::ConstructL(TToneType aToneType) - { - TRACES("CStartupTone::ConstructL()"); - // Check tone volume - iVolume = GetRingingToneVolumeL(); - // Check if hidden reset - iHiddenReset = iStartupAppUi->HiddenReset(); - - iToneType = aToneType; - - if ((!iHiddenReset) && (iVolume)) - { - TPath tonePath; - TRACES("CStartupTone::ConstructL(): Get tone path from CenRep"); - - CRepository* repository(NULL); - - TRAPD( err, repository = CRepository::NewL( KCRUidStartupConf ) ); - if ( err != KErrNone ) - { - TRACES("CStartupTone::ConstructL(): End, ERROR: Failed to get startup tone path"); - return; - } - if (iToneType == EStartupTone) - { - TRACES("CStartupTone::ConstructL(): Tone type EStartupTone"); - err = repository->Get( KStartupTonePath, tonePath ); - } - else - { - TRACES("CStartupTone::ConstructL(): Tone type EStartupOpTone"); - err = repository->Get( KStartupOperatorTonePath, tonePath ); - } - delete repository; - - TRACES2("CStartupTone::ConstructL(): Get tone to play. err = %d, Path = '%S'", err, &tonePath ); - - RFs fs; - err = fs.Connect(); - TFindFile findExe(fs); - err = findExe.FindByPath( tonePath, NULL ); - fs.Close(); - if (err != KErrNone) - { - TRACES1("CStartupTone::ConstructL(): Tone to play: Cannot find tone. err = %d", err); - } - else - { - TRACES("CStartupTone::ConstructL(): Tone found"); - iTone = CMdaAudioPlayerUtility::NewFilePlayerL( - tonePath, - *this, KAudioPriorityPhonePower, - TMdaPriorityPreference( KAudioPrefDefaultTone)); - } - } - } -// --------------------------------------------------------- -// void CStartupTone::Play() -// --------------------------------------------------------- -// - -TInt CStartupTone::Play() - { - TRACES("CStartupTone::Play()"); - TRACES1("CStartupTone::Play(): Tone type: %d", iToneType); - if (iAudioReady && !iHiddenReset && iVolume && iTone) - { - TRACES("CStartupTone::Play(): Audio ready. Play tone"); - iVolume = Max( MIN_VOLUME, Min( iVolume, MAX_VOLUME ) ); - iTone->SetVolume(iVolume); - iTone->Play(); - iPlaying = ETrue; - TRACES("CStartupTone::Play(): End, return KErrNone"); - return KErrNone; - } - else - { - TRACES("CStartupTone::Play(): Audio not ready, hidden reset, volume null or tone is not initialized. Unable to play tone."); - TRACES1("CStartupTone::Play(): Audio ready: %d",iAudioReady); - TRACES1("CStartupTone::Play(): Hidden reset: %d",iHiddenReset); - TRACES1("CStartupTone::Play(): Volume: %d",iVolume); - TRACES1("CStartupTone::Play(): Tone: %d",iTone); - TRACES("CStartupTone::Play(): End, return KErrNotReady"); - return KErrNotReady; - } - } - -// --------------------------------------------------------- -// void CStartupTone::Stop() -// --------------------------------------------------------- -// - -void CStartupTone::Stop() - { - TRACES("CStartupTone::Stop()"); - if (iTone) - { - TRACES("CStartupTone::Stop(): Stop the tone"); - iPlaying=EFalse; - iTone->Stop(); - iToneType = EStartupNoTone; - MapcPlayComplete(KErrNone); - } - TRACES("CStartupTone::Stop(): End"); - } - -// --------------------------------------------------------- -// CStartupTone::ToneFound() -// --------------------------------------------------------- -// -TBool CStartupTone::ToneFound() - { - TBool status(EFalse); - if(iTone) - status = ETrue; - return status; - } - -// --------------------------------------------------------- -// CStartupTone::AudioReady() -// --------------------------------------------------------- -// -TBool CStartupTone::AudioReady() - { - return iAudioReady; - } - -// --------------------------------------------------------- -// void CStartupTone::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& /*aDuration*/) -// --------------------------------------------------------- -// -void CStartupTone::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& /*aDuration*/) - { - TRACES("CStartupTone::MapcInitComplete()"); - if (aError == KErrNone) - { - TRACES("CStartupTone::MapcInitComplete(): Ready to play startup tone"); - iAudioReady = ETrue; - } - else - { - TRACES("CStartupTone::MapcInitComplete(): Unable to play startup tone"); - } - TRACES("CStartupTone::MapcInitComplete(): End"); - } - -// --------------------------------------------------------- -// void CStartupTone::MapcPlayComplete(TInt /*aError*/) -// --------------------------------------------------------- -// -void CStartupTone::MapcPlayComplete(TInt /*aError*/) - { - TRACES("StartupTone::MapcPlayComplete()"); - iPlaying=EFalse; - if (iStartupWaitingForTone) - { - TRACES("StartupTone::MapcPlayComplete(): Startup waiting "); - TRAPD(err, iStartupAppUi->ContinueStartupAfterToneL(iToneType)); - if (err != KErrNone) - { - TRACES1("CStartupTone::MapcPlayComplete(): ContinueStartupAfterToneL() leaves, err = %d", err ); - } - } - TRACES("StartupTone::MapcPlayComplete(): End"); - } - -// --------------------------------------------------------- -// TBool CStartupTone::Playing() -// --------------------------------------------------------- -// -TBool CStartupTone::Playing() - { - TRACES1("StartupTone::Playing(): Return %d", iPlaying ); - return iPlaying; - } - -// --------------------------------------------------------- -// void CStartupTone::StartupWaiting() -// --------------------------------------------------------- -// -void CStartupTone::StartupWaiting(TBool aValue) - { - TRACES1("StartupTone::StartupWaiting(): aValue == %d", aValue); - iStartupWaitingForTone = aValue; - } - -// ---------------------------------------------------------- -// CStartupTone::GetRingingToneVolumeL -// Startup tone volume is always 4 but when ringing type is -// silent or ringing volume is 0 or 1 startup tone is silent. -// ---------------------------------------------------------- -// -TInt CStartupTone::GetRingingToneVolumeL() - { - TRACES("StartupTone::GetRingingToneVolumeL()"); - - TInt retval(0); - TInt ringingType(EProfileRingingTypeSilent); - TInt ringingVol(0); - - CRepository* repository(NULL); - - TRAPD( err, repository = CRepository::NewL( KCRUidProfileEngine ) ); - if ( err != KErrNone ) - { - TRACES("StartupTone::GetRingingToneVolumeL(): End, ERROR, Cannot connect to CenRep"); - return 0; - } - - User::LeaveIfError( repository->Get( KProEngActiveRingingVolume, ringingVol )); - User::LeaveIfError( repository->Get( KProEngActiveRingingType, ringingType )); - delete repository; - - TRACES1("StartupTone::GetRingingToneVolumeL(): Ringing tone volume = %d", ringingVol); - TRACES1("StartupTone::GetRingingToneVolumeL(): Ringing type = %d", ringingType); - - if ((ringingType != EProfileRingingTypeSilent) && - (ringingVol != 0) && - (ringingVol != EProfileRingingVolumeLevel1)) - { - TRACES("StartupTone::GetRingingToneVolumeL(): Get startup tone volume"); - TInt defaultRingingVol; - CRepository* repository(NULL); - - TRAPD( err, repository = CRepository::NewL( KCRUidStartupConf ) ); - if ( err != KErrNone ) - { - return 0; - } - - User::LeaveIfError( repository->Get( KStartupToneVolume, defaultRingingVol )); - delete repository; - - ringingVol = defaultRingingVol; - retval = ringingVol; - } - - TRACES1("StartupTone::GetRingingToneVolumeL(): End, return %d", retval); - return retval; - } - -// End of File diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupUserWelcomeNote.cpp --- a/startupservices/Startup/src/StartupUserWelcomeNote.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,587 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class is the container class of the CStartupUerWelcomeNote. -* Is user for showing user selected picture, text or predefined animation. -* -*/ - - - -// INCLUDE FILES -#include -#include -#include -#include -#include //use of TResourceReader -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION -#include "startupview.h" -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION -#include //used for RemoveSplashScreen -#include -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -#include -#include "StartupUserWelcomeNote.h" -#include -#include -#include -#include "StartupDefines.h" -#include "startup.hrh" -#include "StartupAppUi.h" -#include "aknSDData.h" - -// ================= MEMBER FUNCTIONS ======================= - -// --------------------------------------------------------------------------- -// CStartupUseWelcomeNote::ConstructL -// -// --------------------------------------------------------------------------- -void CStartupUserWelcomeNote::ConstructL( const TRect& /*aRect*/ ) - { - TRACES("CStartupUserWelcomeNote::ConstructL()"); - - iAvkonAppUi->StatusPane()->MakeVisible( EFalse ); - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - - SetContainerWindowL( iView ); - iView.SetComponent( *this ); - -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - - CreateWindowL(); - iNoteCancelTimer = CPeriodic::NewL( EPriorityNormal ); - -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - iBitmap = new(ELeave) CFbsBitmap(); - - //get user selected userwelcomenotetype from Central Repository - TInt err = GetUserWelcomeNoteTypeInfo(); - - if( err != KErrNone ) - { - TRACES("CStartupUserWelcomeNote::ConstructL(): Show default note"); - //in error case default uwn (no note) is shown - iNoteType = EDefaultWelcomeNote; - iNoteDefaultVariationType = EStartupUWNDefaultNoNote; - } - //Do some preparations for showing user welcome note later - //This makes the starting to show much more quicker - switch ( iNoteType ) - { - case ETextWelcomeNote: - { - TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteType == ETextWelcomeNote"); - } - break; - case EImageWelcomeNote: - { - TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteType == EImageWelcomeNote"); - TInt errorCode = iBitmap->Load( TPtrC(iNotePath.Ptr()) ); - TRACES1("CStartupUserWelcomeNote::ConstructL(): Load returned %d", errorCode); - if(iStartupAppUi.CoverUISupported()) - { - SecondaryDisplay::TWelcomeImage data(TPtrC(iNotePath.Ptr())); - SecondaryDisplay::TWelcomeImagePckg Pckg( data ); - iStartupAppUi.RaiseCoverUIEvent( SecondaryDisplay::KCatStartup, - SecondaryDisplay::EMsgWelcomeImageEvent, - Pckg); - } - } - break; - default: - { - TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteType == EDefaultWelcomeNote"); - switch ( iNoteDefaultVariationType ) - { - case EStartupUWNDefaultOperatorGraphic: - { - TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteDefaultVariationType == EStartupUWNDefaultOperatorGraphic"); - iBitmap->Load( TPtrC(iNoteOperPath.Ptr()) ); - if(iStartupAppUi.CoverUISupported()) - { - SecondaryDisplay::TWelcomeImage data(TPtrC(iNoteOperPath.Ptr())); - SecondaryDisplay::TWelcomeImagePckg Pckg( data ); - iStartupAppUi.RaiseCoverUIEvent( SecondaryDisplay::KCatStartup, - SecondaryDisplay::EMsgWelcomeImageEvent, - Pckg); - } - } - break; - case EStartupUWNDefaultOperatorText: - case EStartupUWNDefaultNoNote: - default: - { - //nothing preparation - TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteDefaultVariationType == EStartupUWNDefaultOperatorText or EStartupUWNDefaultNoNote"); - } - break; - } - } - break; - } -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - //get information for draw-function - iWelcomeNoteType = NoteTypeInformation(); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - SetRect(iAvkonAppUi->ApplicationRect()); - ActivateL(); - TRACES("CStartupUserWelcomeNote::ConstructL(): End"); - } - -// ----------------------------------------------------------------------------- -// CStartupUserWelcomeNote::NewL -// Two-phased constructor. -// ----------------------------------------------------------------------------- -// -CStartupUserWelcomeNote* CStartupUserWelcomeNote::NewL( - CStartupAppUi& aStartupAppUi, - const TRect& aRect -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - , CStartupView& aView -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - ) - { - TRACES("CStartupUserWelcomeNote::NewL()"); -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - CStartupUserWelcomeNote* self = new (ELeave) CStartupUserWelcomeNote( aStartupAppUi, aView ); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - CStartupUserWelcomeNote* self = new (ELeave) CStartupUserWelcomeNote( aStartupAppUi ); -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - CleanupStack::PushL(self); - self->ConstructL(aRect); - CleanupStack::Pop(); - TRACES("CStartupUserWelcomeNote::NewL(): End"); - return self; - } - -// --------------------------------------------------------- -// CStartupUserWelcomeNote::CStartupUserWelcomeNote() -// --------------------------------------------------------- -CStartupUserWelcomeNote::CStartupUserWelcomeNote( CStartupAppUi& aStartupAppUi -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - , CStartupView& aView -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - ) : -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - iView( aView ), -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - iSplashScreenRemoved( EFalse ), -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - iStartupAppUi( aStartupAppUi ) -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - , iUserWelcomeNoteShowing( EFalse ), - iUserWelcomeNoteCancelled( EFalse) -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - { - TRACES("CStartupUserWelcomeNote::CStartupUserWelcomeNote()"); - } - -// --------------------------------------------------------------------------- -// CStartupUseWelcomeNote::StartL() -// --------------------------------------------------------------------------- -void CStartupUserWelcomeNote::StartL() - { - TRACES("CStartupUserWelcomeNote::StartL()"); - switch ( iNoteType ) - { - case ETextWelcomeNote: - { - TRACES("CStartupUserWelcomeNote::StartL(): ETextWelcomeNote"); - ShowInformationNoteWrapperL(); - } - break; - case EImageWelcomeNote: - { - TRACES("CStartupUserWelcomeNote::StartL(): EImageWelcomeNote"); - DrawImageWelcomeNote(); - } - break; - default: - { - TRACES("CStartupUserWelcomeNote::StartL(): default"); - switch ( iNoteDefaultVariationType ) - { - case EStartupUWNDefaultOperatorGraphic: - { - TRACES("CStartupUserWelcomeNote::StartL(): EStartupUWNDefaultOperatorGraphic"); - DrawImageWelcomeNote(); - } - break; - case EStartupUWNDefaultOperatorText: - { - TRACES("CStartupUserWelcomeNote::StartL(): EStartupUWNDefaultOperatorText"); - ShowInformationNoteWrapperL(); - } - break; - case EStartupUWNDefaultNoNote: - default: - TRACES("CStartupUserWelcomeNote::StartL(): EStartupUWNDefaultNoNote"); - break; - } - } - break; - } - ControlEnv()->WsSession().Flush(); // force draw of the context - TRACES("CStartupUserWelcomeNote::StartL(): End"); - } - -// --------------------------------------------------------- -// CStartupUserWelcomeNote::NoteTypeInformation() -// --------------------------------------------------------- -TStartupNoteTypeInformation CStartupUserWelcomeNote::NoteTypeInformation() - { - TRACES("CStartupUserWelcomeNote::NoteTypeInformation()"); - if( iNoteType == EDefaultWelcomeNote && iNoteDefaultVariationType == EStartupUWNDefaultNoNote ) - { - TRACES("CStartupUserWelcomeNote::NoteTypeInformation(): End, return EStartupNoNote"); - return EStartupNoNote; - } - else if( ( iNoteType == ETextWelcomeNote ) || - ( iNoteType == EDefaultWelcomeNote && - iNoteDefaultVariationType == EStartupUWNDefaultOperatorText ) ) - { - TRACES("CStartupUserWelcomeNote::NoteTypeInformation(): End, return EStartupText"); - return EStartupText; - } - else if( ( iNoteType == EImageWelcomeNote ) || - ( iNoteType == EDefaultWelcomeNote && - iNoteDefaultVariationType == EStartupUWNDefaultOperatorGraphic ) ) - { - TRACES("CStartupUserWelcomeNote::NoteTypeInformation(): End, return EStartupImage"); - return EStartupImage; - } - else - { - __ASSERT_DEBUG( EFalse, PANIC( EStartupNeverShouldBeHere ) ); - return EStartupNoNote; - } - } - -// --------------------------------------------------------------------------- -// CStartupUseWelcomeNote::DrawImageWelcomeNote -// --------------------------------------------------------------------------- -void CStartupUserWelcomeNote::DrawImageWelcomeNote() - { - TRACES("CStartupUserWelcomeNote::DrawImageWelcomeNote()"); - - CWindowGc& gc = SystemGc(); - TInt xDelta=0; // for x coordinates - TInt yDelta=0; // for y coordinates - TSize bmpSizeInPixels = iBitmap->SizeInPixels(); - //center image to the center of the screen - TRect rect = Rect(); - xDelta=( rect.Width() - bmpSizeInPixels.iWidth ) / 2; - yDelta=( rect.Height() - bmpSizeInPixels.iHeight ) / 2; - TPoint pos = TPoint( xDelta , yDelta ); // displacement vector - ActivateGc(); - Window().Invalidate( rect ); - Window().BeginRedraw( rect ); - gc.BitBlt( pos, iBitmap ); // CWindowGc member function - DrawUtils::ClearBetweenRects(gc, Rect(), TRect(pos,bmpSizeInPixels)); - Window().EndRedraw(); - DeactivateGc(); - TRACES("CStartupUserWelcomeNote::DrawImageWelcomeNote(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupUseWelcomeNote::~CStartupUserWelcomeNote() -// --------------------------------------------------------------------------- -CStartupUserWelcomeNote::~CStartupUserWelcomeNote() - { - TRACES("CStartupUserWelcomeNote::~CStartupUserWelcomeNote()"); - - delete iBitmap; - -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION - iView.RemoveComponent(); -#else // RD_STARTUP_ANIMATION_CUSTOMIZATION - if( iNoteCancelTimer ) - { - iNoteCancelTimer->Cancel(); - } - delete iNoteCancelTimer; -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - - TRACES("CStartupUserWelcomeNote::~CStartupUserWelcomeNote(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::ComponentControl(TInt aIndex) -// --------------------------------------------------------------------------- -CCoeControl* CStartupUserWelcomeNote::ComponentControl(TInt /*aIndex*/) const - { - return NULL; - } - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::DrawBlankScreen() const -// --------------------------------------------------------------------------- -void CStartupUserWelcomeNote::DrawBlankScreen() const - { - TRACES("CStartupUserWelcomeNote::DrawBlankScreen()"); - CWindowGc& gc = SystemGc(); - TRect rect = Rect(); - gc.SetPenStyle(CGraphicsContext::ENullPen); - gc.SetBrushColor(KRgbWhite); - gc.SetBrushStyle(CGraphicsContext::ESolidBrush); - gc.DrawRect(rect); - ControlEnv()->WsSession().Flush(); // force draw of the context - TRACES("CStartupUserWelcomeNote::DrawBlankScreen(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::HandleControlEventL(...) -// --------------------------------------------------------------------------- -void CStartupUserWelcomeNote::HandleControlEventL( - CCoeControl* /*aControl*/, - TCoeEvent /*aEventType*/) - { - //pure virtual from MCoeControlObserver - TRACES("CStartupUserWelcomeNote::HandleControlEventL()"); - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::UserWelcomeNoteType() -// --------------------------------------------------------------------------- -TStartupWelcomeNoteType CStartupUserWelcomeNote::UserWelcomeNoteType() - { - return ( iNoteType ); - } - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::OfferKeyEventL(...) -// --------------------------------------------------------------------------- -TKeyResponse CStartupUserWelcomeNote::OfferKeyEventL(const TKeyEvent& /*aKeyEvent*/, TEventCode /*aType*/) - { - TRACES("CStartupUserWelcomeNote::OfferKeyEventL()"); - if( iUserWelcomeNoteShowing && !iStartupAppUi.HiddenReset() && !iUserWelcomeNoteCancelled ) - { - // Cancel UWN - TRACES("CStartupUserWelcomeNote::OfferKeyEventL(): Timer activated - before"); - iNoteCancelTimer->Start( 10000, 10000, - TCallBack( iStartupAppUi.DoStopTimingL, &iStartupAppUi ) ); - iUserWelcomeNoteCancelled = ETrue; - TRACES("CStartupUserWelcomeNote::OfferKeyEventL(): Timer activated - after"); - } - TRACES("CStartupUserWelcomeNote::OfferKeyEventL(): End"); - return EKeyWasConsumed; - } - -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::CancelNoteCancelTimer() -// --------------------------------------------------------------------------- -void CStartupUserWelcomeNote::CancelNoteCancelTimer() - { - TRACES("CStartupUserWelcomeNote::CancelNoteCancelTimer()"); - iNoteCancelTimer->Cancel(); - TRACES("CStartupUserWelcomeNote::CancelNoteCancelTimer(): End"); - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo() -// --------------------------------------------------------------------------- -TInt CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo() - { - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo()"); - TInt err( KErrGeneral ); - - CRepository* repository(NULL); - - TRAP( err, repository = CRepository::NewL( KCRUidStartupConf ) ); - if ( err == KErrNone ) - { - TInt type; - TBuf atext; - TBuf apath; - TBuf aoperatortext; - TBuf aoperatorpath; - - err = repository->Get( KStartupWelcomeNoteType, type ); - TRACES2("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Welcome note type = %d, err = %d", type, err ); - - err = repository->Get( KStartupWelcomeNoteText, atext ); - TRACES2("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Welcome note text = '%S', err = %d", &atext, err ); - - err = repository->Get( KStartupWelcomeNoteImage, apath ); - TRACES2("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Welcome note image path = '%S', err = %d", &apath, err); - - switch (type) - { - case EDefaultWelcomeNote: - { - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): EDefaultWelcomeNote"); - iNoteType = EDefaultWelcomeNote; - - repository->Get( KStartupOperatorNoteImage, aoperatorpath ); - TRACES1("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Operator image path: '%S'", &aoperatorpath); - TInt opImageStatus = CheckImage(aoperatorpath); - TRACES1("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Operator image status: %d", opImageStatus); - - repository->Get( KStartupOperatorNoteText, aoperatortext ); - TRACES1("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Operator text: '%S'", &aoperatortext); - - if ( opImageStatus == KErrNone ) - { - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Default note type is EStartupUWNDefaultOperatorGraphic"); - iNoteDefaultVariationType = EStartupUWNDefaultOperatorGraphic; - } - else if ( aoperatortext.Length() > 0 ) - { - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Default note type is EStartupUWNDefaultOperatorText"); - iNoteDefaultVariationType = EStartupUWNDefaultOperatorText; - } - else - { - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Default note type is EStartupUWNDefaultNoNote"); - iNoteDefaultVariationType = EStartupUWNDefaultNoNote; - } - } - break; - case ETextWelcomeNote: - { - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): ETextWelcomeNote"); - iNoteType = ETextWelcomeNote; - } - break; - case EImageWelcomeNote: - { - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): EImageWelcomeNote"); - if (CheckImage(apath) != KErrNone) - { - //in error case default uwn (no note) is shown - iNoteType = EDefaultWelcomeNote; - iNoteDefaultVariationType = EStartupUWNDefaultNoNote; - } - else - { - iNoteType = EImageWelcomeNote; - } - } - break; - default: - { - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): default"); - delete repository; - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): End, return KErrNotFound"); - return KErrNotFound; - } - } - iNoteText = atext; - iNotePath = apath; - iNoteOperText = aoperatortext; - iNoteOperPath = aoperatorpath; - } - - delete repository; - TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): End, return KErrNone"); - return KErrNone; - } - -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::ShowInformationNoteWrapperL() -// --------------------------------------------------------------------------- -void CStartupUserWelcomeNote::ShowInformationNoteWrapperL() - { - TRACES("CStartupUserWelcomeNote::ShowInformationNoteWrapperL()"); - TRACES1("CStartupUserWelcomeNote::ShowInformationNoteWrapperL(): Note type = %d", iNoteDefaultVariationType); - - TRequestStatus status; - CAknGlobalNote* note = CAknGlobalNote::NewLC(); - if ( iNoteDefaultVariationType == EStartupUWNDefaultOperatorText) - { - // Set secondary display data if necessary - if ( iStartupAppUi.CoverUISupported() ) - { - SecondaryDisplay::TWelcomeNotePckg pckg(TPtrC(iNoteOperText.Ptr())); - CAknSDData* sd = CAknSDData::NewL(SecondaryDisplay::KCatStartup, SecondaryDisplay::ECmdShowWelcomeNote, pckg); - note->SetSecondaryDisplayData(sd); // ownership to notifier client - } - TRACES1("CStartupUserWelcomeNote::ShowInformationNoteWrapperL(): Operator text is '%S'", &iNoteOperText); - note->ShowNoteL( status, EAknGlobalTextNote, TPtrC(iNoteOperText.Ptr()) ); - } - else - { - // Set secondary display data if necessary - if ( iStartupAppUi.CoverUISupported() ) - { - SecondaryDisplay::TWelcomeNotePckg pckg(TPtrC(iNoteText.Ptr())); - CAknSDData* sd = CAknSDData::NewL(SecondaryDisplay::KCatStartup, SecondaryDisplay::ECmdShowWelcomeNote, pckg); - note->SetSecondaryDisplayData(sd); // ownership to notifier client - } - TRACES1("CStartupUserWelcomeNote::ShowInformationNoteWrapperL(): Welcome text is '%S'", &iNoteText); - note->ShowNoteL( status, EAknGlobalTextNote, TPtrC(iNoteText.Ptr()) ); - } - User::WaitForRequest( status ); - CleanupStack::PopAndDestroy(); // note - TRACES("CStartupUserWelcomeNote::ShowInformationNoteWrapperL(): End"); - } - -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::SetUserWelcomeNoteShowing(...) -// --------------------------------------------------------------------------- -void CStartupUserWelcomeNote::SetUserWelcomeNoteShowing(TBool aValue) - { - TRACES1("CStartupUserWelcomeNote::SetUserWelcomeNoteShowing(): aValue = %d", aValue); - iUserWelcomeNoteShowing = aValue; - } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION - -// --------------------------------------------------------------------------- -// CStartupUserWelcomeNote::SetUserWelcomeNoteShowing(...) -// --------------------------------------------------------------------------- -TInt CStartupUserWelcomeNote::CheckImage( const TDesC& aPath) - { - TRACES("CStartupUserWelcomeNote::CheckImage()"); - // Check if given welcome image is available - RFile welcomeimage; - TInt err( KErrNone ); - RFs fs; - - // Connect to file server - err = fs.Connect(); - if (err != KErrNone) - { - TRACES("CStartupUserWelcomeNote::CheckImage(): Unable to connect to file server. Do not show welcome image."); - fs.Close(); - TRACES1("CStartupUserWelcomeNote::CheckImage(): End, return %d", err); - return err; - } - - // Open welcome image - err = welcomeimage.Open(fs, aPath, EFileRead); - if (err != KErrNone) - { - TRACES("CStartupUserWelcomeNote::CheckImage(): Welcome image does not exists. Do not try to show it."); - welcomeimage.Close(); - fs.Close(); - TRACES1("CStartupUserWelcomeNote::CheckImage(): End, return %d", err); - return err; - } - - welcomeimage.Close(); - fs.Close(); - TRACES1("CStartupUserWelcomeNote::CheckImage(): End, return %d", err); - return err; - } - -// End of File - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/StartupWelcomeAnimation.cpp --- a/startupservices/Startup/src/StartupWelcomeAnimation.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,520 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This class is the container class of the CStartupWelcomeAnimation. -* Is used to show welcome animation. -* -*/ - - -// INCLUDE FILES -#include -#include -#include //use of TResourceReader -#include //used for RemoveSplashScreen -#include -#include -#include "StartupWelcomeAnimation.h" -#include -#include "StartupDefines.h" -#include "Startup.hrh" -#include "StartupAppUi.h" -#include - -// CONSTANTS -const TInt KStartupAnimationShowingDuration( 4200 );//4.2 sec - -// ================= MEMBER FUNCTIONS ======================= - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::ConstructL(const TRect& aRect) -// Symbian 2nd phase constructor can leave. -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::ConstructL(const TRect& /*aRect*/) - { - TRACES("CStartupWelcomeAnimation::ConstructL()"); - iShowingTime = KStartupAnimationShowingDuration; - UpdateDrawInfo( EStartupDIStart ); - - iAvkonAppUi->StatusPane()->MakeVisible(EFalse); - CreateWindowL(); - iAnimCancelTimer = CPeriodic::NewL( EPriorityNormal ); - - TRACES("CStartupWelcomeAnimation::ConstructL(): animation loading started"); - iAnim = CAknBitmapAnimation::NewL(); - iAnim->ExcludeAnimationFramesFromCache(); - iAnim->SetContainerWindowL( *this ); - iAnim->SetScaleModeForAnimationFrames(EAspectRatioPreservedAndUnusedSpaceRemoved); - TResourceReader rr; - iCoeEnv->CreateResourceReaderLC(rr, R_ANIM_IMAGE); - TRAPD(err, iAnim->ConstructFromResourceL( rr )) - if (err != KErrNone) - { - TRACES1("CStartupWelcomeAnimation::ConstructL(): ConstructFromResourceL() leaves, err = %d", err ); - } - CleanupStack::PopAndDestroy(); - - SetRect(iAvkonAppUi->ApplicationRect()); // Results in a call to SizeChanged() - ActivateL(); - - TRACES("CStartupWelcomeAnimation::ConstructL(): animation loading ended"); - TRACES("CStartupWelcomeAnimation::ConstructL(): End"); - } - -// ----------------------------------------------------------------------------- -// CStartupWelcomeAnimation::NewL -// Two-phased constructor. -// ----------------------------------------------------------------------------- -// -CStartupWelcomeAnimation* CStartupWelcomeAnimation::NewL( CStartupAppUi* aStartupAppUi, - const TRect& aRect) - { - TRACES("CStartupWelcomeAnimation::NewL()"); - CStartupWelcomeAnimation* self = new (ELeave) CStartupWelcomeAnimation( aStartupAppUi ); - CleanupStack::PushL(self); - self->ConstructL(aRect); - CleanupStack::Pop(); - TRACES("CStartupWelcomeAnimation::NewL(): End"); - return self; - } - -// --------------------------------------------------------- -// CStartupWelcomeAnimation::CStartupWelcomeAnimation() -// --------------------------------------------------------- -CStartupWelcomeAnimation::CStartupWelcomeAnimation( CStartupAppUi* aStartupAppUi ) : - iBackgroundBitmap( NULL ), - iSplashScreenRemoved( EFalse ), - iStartupAppUi( aStartupAppUi ), - iAnimationShowing( EFalse ), - iAnimationCancelled ( EFalse ) - { - TRACES("CStartupWelcomeAnimation::CStartupWelcomeAnimation()"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::StartL() -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::StartL() - { - TRACES("CStartupWelcomeAnimation::StartL()"); - iAnim->StartAnimationL(); - ControlEnv()->WsSession().Flush(); // force draw of the context - TRACES("CStartupWelcomeAnimation::StartL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::UpdateDrawInfo( TStartupDrawInfo aValue ) -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::UpdateDrawInfo( TStartupDrawInfo aValue ) - { - TRACES("CStartupWelcomeAnimation::UpdateDrawInfo()"); - TRACES1("CStartupWelcomeAnimation::UpdateDrawInfo(): Value %d", aValue); - //Prevent state change if already EStartupDISystemFatalError - if( iDrawUpdateInfo == EStartupDISystemFatalError ) - { - TRACES("CStartupWelcomeAnimation::UpdateDrawInfo(): End, preventing state change - EStartupDISystemFatalError"); - return; - } - - iDrawUpdateInfo = aValue; - TRACES("CStartupWelcomeAnimation::UpdateDrawInfo(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::DoDrawingL() -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::DoDrawingL() const - { - TRACES("CStartupWelcomeAnimation::DoDrawingL()"); - switch ( iDrawUpdateInfo ) - { - case EStartupDIStart: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIStart"); - DrawBlankScreen(); // clears screen after code query emergency call - } - break; - case EStartupDITouchScreenCalib: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDITouchScreenCalib"); - RemoveSplashScreen(); - DrawBlankScreen(); - } - break; - case EStartupDICharging: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDICharging"); - RemoveSplashScreen(); - DrawBlankScreen(); - } - break; - case EStartupDIAlarm: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIAlarm"); - RemoveSplashScreen(); - DrawBlankScreen(); - } - break; - case EStartupDIHiddenReset: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIHiddenReset"); - RemoveSplashScreen(); - DrawBlankScreen(); - } - break; - case EStartupDIQueriesOn: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIQueriesOn"); - RemoveSplashScreen(); - DrawBlankScreen(); - } - break; - case EStartupDIQueriesOff: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIQueriesOff"); - } - break; - case EStartupDIWelcomeAnimStart: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIWelcomeAnimStart"); - RemoveSplashScreen(); - DrawBlankScreen(); - } - break; - case EStartupDIWelcomeAnimCancelled: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIWelcomeAnimCancelled"); - } - break; - case EStartupDIWelcomeAnimEnd: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIWelcomeAnimEnd"); - DrawBlankScreen(); - } - break; - case EStartupDIOperatorAnimEnd: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIOperatorAnimEnd"); - DrawBlankScreen(); - } - break; - case EStartupDICityTimeDateQueries: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDICityTimeDateQueries"); - DrawBlankScreen(); - } - break; - case EStartupDIEnd: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIEnd"); - } - break; - case EStartupDISystemFatalError: - { - TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDISystemFatalError"); - } - break; - default: - TRACES("CStartupWelcomeAnimation::DoDrawingL(): default"); - break; - } - TRACES("CStartupWelcomeAnimation::DoDrawingL(): End"); - } - -// --------------------------------------------------------- -// CStartupWelcomeAnimation::RemoveSplashScreen() -// --------------------------------------------------------- -void CStartupWelcomeAnimation::RemoveSplashScreen() const - { - TRACES("CStartupWelcomeAnimation::RemoveSplashScreen()"); - //Remove SplashScreen - if( !iSplashScreenRemoved ) - { - TRACES("CStartupWelcomeAnimation::RemoveSplashScreen(): Connect to Starter"); - RStarterSession startersession; - if( startersession.Connect() == KErrNone ) - { - TRACES("CStartupWelcomeAnimation::RemoveSplashScreen(): Connected to Starter"); - startersession.EndSplashScreen(); - TRACES("CStartupWelcomeAnimation::RemoveSplashScreen(): Splash screen removed"); - startersession.Close(); - } - } - TRACES("CStartupWelcomeAnimation::RemoveSplashScreen(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::~CStartupWelcomeAnimation() -// --------------------------------------------------------------------------- -CStartupWelcomeAnimation::~CStartupWelcomeAnimation() - { - TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation()"); - - if( iAnim ) - { - if( iAnimationShowing ) - { - iAnim->CancelAnimation(); - TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): Animation cancelled"); - } - } - delete iAnim; - TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): iAnim deleted"); - - if (iBackgroundBitmap) - { - delete iBackgroundBitmap; - TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): iBackgroundBitmap deleted"); - } - - if( iAnimCancelTimer ) - { - iAnimCancelTimer->Cancel(); - TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): Timer cancelled"); - } - delete iAnimCancelTimer; - TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): iAnimCancelTimer deleted"); - - TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::ComponentControl(TInt aIndex) -// --------------------------------------------------------------------------- -CCoeControl* CStartupWelcomeAnimation::ComponentControl(TInt aIndex) const - { - switch ( aIndex ) - { - case 0: - { - return iAnim; - } - default: - { - return NULL; - } - } - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::CountComponentControls() -// --------------------------------------------------------------------------- -TInt CStartupWelcomeAnimation::CountComponentControls() const - { - return iAnim ? 1 : 0; // return nbr of controls inside this container - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::Draw(const TRect& aRect) const -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::Draw(const TRect& /*aRect*/ ) const - { - TRACES("CStartupWelcomeAnimation::Draw()"); - TRAPD(err, DoDrawingL()); - if (err != KErrNone) - { - TRACES1("CStartupWelcomeAnimation::Draw(): DoDrawingL() leaves, err = %d", err ); - } - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::DrawBlankScreen() const -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::DrawBlankScreen() const - { - TRACES("CStartupWelcomeAnimation::DrawBlankScreen()"); - CWindowGc& gc = SystemGc(); - TRect rect = Rect(); - gc.SetPenStyle(CGraphicsContext::ENullPen); - gc.SetBrushColor(KRgbWhite); - gc.SetBrushStyle(CGraphicsContext::ESolidBrush); - gc.DrawRect(rect); - ControlEnv()->WsSession().Flush(); // force draw of the context - TRACES("CStartupWelcomeAnimation::DrawBlankScreen(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::ShowingTime() -// --------------------------------------------------------------------------- -TInt CStartupWelcomeAnimation::ShowingTime() - { - TRACES1("CStartupWelcomeAnimation::ShowingTime(): time = %d", iShowingTime); - return iShowingTime; - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::SizeChanged() -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::SizeChanged() - { - if( iAnim ) - { - iAnim->SetRect(Rect()); - iAnim->SetPosition( TPoint( - (iAvkonAppUi->ApplicationRect().Width()/2) - (iAnim->BitmapAnimData()->Size().iWidth/2), - (iAvkonAppUi->ApplicationRect().Height()/2) - (iAnim->BitmapAnimData()->Size().iHeight/2) - ) ); - } - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::EndAnimation() -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::EndAnimation() const - { - TRACES("CStartupWelcomeAnimation::EndAnimation()"); - if( iAnim ) - { - TRACES("CStartupWelcomeAnimation::EndAnimation(): Cancel animation"); - iAnim->CancelAnimation(); - } - TRACES("CStartupWelcomeAnimation::EndAnimation(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::HandleControlEventL(...) -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::HandleControlEventL( - CCoeControl* /*aControl*/, - TCoeEvent /*aEventType*/) - { - //pure virtual from MCoeControlObserver - TRACES("CStartupWelcomeAnimation::HandleControlEventL()"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::HandlePointerEventL(...) -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::HandlePointerEventL(const TPointerEvent& aPointerEvent) - { - TRACES("CStartupWelcomeAnimation::HandlePointerEventL()"); - if (AknLayoutUtils::PenEnabled()) - { - TRACES1("CStartupWelcomeAnimation::HandlePointerEventL: aPointerEvent.iType == %d",aPointerEvent.iType ); - switch (aPointerEvent.iType) - { - case TPointerEvent::EButton1Down: - CancelAnimation(); - break; - - default: - break; - } - } - TRACES("CStartupWelcomeAnimation::HandlePointerEventL(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::OfferKeyEventL(...) -// --------------------------------------------------------------------------- -TKeyResponse CStartupWelcomeAnimation::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode /*aType*/ ) - { - TRACES("CStartupWelcomeAnimation::OfferKeyEventL()"); - TRACES1("CStartupWelcomeAnimation::OfferKeyEventL(): aKeyEvent.iCode == %d",aKeyEvent.iCode); - TRACES1("CStartupWelcomeAnimation::OfferKeyEventL(): aKeyEvent.iScanCode == %d",aKeyEvent.iScanCode); - TRACES1("CStartupWelcomeAnimation::OfferKeyEventL(): iAnimationShowing == %d",iAnimationShowing); - TRACES1("CStartupWelcomeAnimation::OfferKeyEventL(): iAnimationCancelled == %d",iAnimationCancelled); - - if ( iStartupAppUi->GetOfflineModeQueryShown() ) - { - TRACES("CStartupWelcomeAnimation::OfferKeyEventL(): Key event from offline mode query"); - // first key event comes from Offline Mode Query - iStartupAppUi->SetOfflineModeQueryShown( EFalse ); - } - else - { - if( iAnimationShowing && !iStartupAppUi->HiddenReset() && !iAnimationCancelled ) - { - if (aKeyEvent.iScanCode == EStdKeyNkpAsterisk || aKeyEvent.iScanCode == 0x2a) - { - TRACES("CStartupWelcomeAnimation::OfferKeyEventL(): Set clean boot"); - iStartupAppUi->SetCleanBoot(); - } - // Cancel animation - CancelAnimation(); - } - else if( !iAnimationShowing && iStartupAppUi->StartupTonePlaying()) - { - TRACES("CStartupWelcomeAnimation::OfferKeyEventL() Animation has completed but tone is still playing. Stop it."); - iStartupAppUi->StopStartupTone(); - } - } - - TRACES("CStartupWelcomeAnimation::OfferKeyEventL(): End"); - return EKeyWasConsumed; - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::CancelAnimCancelTimer() -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::CancelAnimCancelTimer() - { - TRACES("CStartupWelcomeAnimation::CancelAnimCancelTimer()"); - iAnimCancelTimer->Cancel(); - TRACES("CStartupWelcomeAnimation::CancelAnimCancelTimer(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::CancelAnimation(...) -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::CancelAnimation() - { - TRACES("CStartupWelcomeAnimation::CancelAnimation()"); - if( iAnimationShowing && !iStartupAppUi->HiddenReset() && !iAnimationCancelled ) - { - UpdateDrawInfo( EStartupDIWelcomeAnimCancelled ); - EndAnimation(); - TRACES("CStartupWelcomeAnimation::CancelAnimation(): Timer activated - before"); - iAnimCancelTimer->Start( 10000, 10000, - TCallBack( iStartupAppUi->DoStopTimingL, iStartupAppUi ) ); - TRACES("CStartupWelcomeAnimation::CancelAnimation(): Timer activated - after"); - iAnimationCancelled = ETrue; - } - TRACES("CStartupWelcomeAnimation::CancelAnimation(): End"); - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::IsAnimationCancelled(...) -// --------------------------------------------------------------------------- -TBool CStartupWelcomeAnimation::IsAnimationCancelled() - { - TRACES1("CStartupWelcomeAnimation::IsAnimationCancelled(): iAnimationCancelled: %d", iAnimationCancelled); - return iAnimationCancelled; - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::SetAnimationShowing(...) -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::SetAnimationShowing(TBool aValue) - { - TRACES("CStartupWelcomeAnimation::SetAnimationShowing()"); - TRACES2("CStartupWelcomeAnimation::SetAnimationShowing(): iAnimationShowing changed from %d to %d",iAnimationShowing, aValue ); - iAnimationShowing = aValue; - } - -// --------------------------------------------------------------------------- -// CStartupWelcomeAnimation::HandleResourceChange(...) -// --------------------------------------------------------------------------- -void CStartupWelcomeAnimation::HandleResourceChange(TInt aType) - { - CCoeControl::HandleResourceChange(aType); - if(aType==KEikDynamicLayoutVariantSwitch) - { - SetRect(iAvkonAppUi->ApplicationRect()); // update rect - } - } - - - -// End of File diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/src/startupview.cpp --- a/startupservices/Startup/src/startupview.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/src/startupview.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007,2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -16,9 +16,7 @@ */ -#include -#include // Skin support -#include // Skin support + #include "startupview.h" #include "StartupDefines.h" @@ -52,7 +50,7 @@ CStartupView::~CStartupView() { TRACES("CStartupView::~CStartupView()"); - delete iBgContext; + TRACES("CStartupView::~CStartupView(): End"); } @@ -94,12 +92,6 @@ void CStartupView::SizeChanged() { TRACES("CStartupView::SizeChanged()"); - - if (iBgContext) - { - iBgContext->SetRect( Rect() ); - } - if ( iComponent ) { iComponent->SetRect( Rect() ); @@ -144,23 +136,15 @@ TRACES("CStartupView::Draw()"); CWindowGc& gc = SystemGc(); - MAknsSkinInstance* skin = AknsUtils::SkinInstance(); + gc.SetPenStyle( CGraphicsContext::ENullPen ); gc.SetBrushStyle( CGraphicsContext::ESolidBrush ); - - // Draw skin background - if ( !AknsDrawUtils::Background( skin, iBgContext, gc, aRect ) ) - { - // If Skin is missing, clear with default color - gc.SetClippingRect( aRect ); - gc.SetBrushColor( KRgbWhite ); - gc.Clear(); - } - + gc.SetClippingRect( aRect ); + gc.SetBrushColor( KRgbWhite ); + gc.Clear(); TRACES("CStartupView::Draw(): End"); } - // --------------------------------------------------------------------------- // CStartupView::CStartupView // @@ -172,7 +156,6 @@ TRACES("CStartupView::CStartupView(): End"); } - // --------------------------------------------------------------------------- // CStartupView::ConstructL // @@ -181,18 +164,11 @@ void CStartupView::ConstructL( const TRect& aRect ) { TRACES("CStartupView::ConstructL()"); - - iAvkonAppUi->StatusPane()->MakeVisible( EFalse ); CreateWindowL(); SetRect( aRect ); // Create background drawing context TRect bgrect(aRect.Size()); - iBgContext = CAknsBasicBackgroundControlContext::NewL( - KAknsIIDQsnBgScreen, - bgrect, EFalse ); - ActivateL(); - TRACES("CStartupView::ConstructL(): End"); } diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/bwins/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/eabi/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/group/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/group/syserrcmd.mmp --- a/startupservices/Startup/syserrcmd/group/syserrcmd.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/syserrcmd/group/syserrcmd.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -34,11 +34,11 @@ MW_LAYER_SYSTEMINCLUDE -LIBRARY aknnotify.lib LIBRARY efsrv.lib LIBRARY euser.lib LIBRARY featmgr.lib LIBRARY commonengine.lib +LIBRARY hbwidgets.lib // >>> uncomment to enable function-level tracing @@ -49,3 +49,5 @@ // MACRO __SSM_TRACE_INTO_FILE__ // LIBRARY flogger.lib // <<< uncomment to direct trace output to file + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/inc/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/inc/syserrcmd.h --- a/startupservices/Startup/syserrcmd/inc/syserrcmd.h Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/syserrcmd/inc/syserrcmd.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -22,7 +22,7 @@ #include #include -class CAknGlobalNote; + /** * A custom command for displaying a note about unrecoverable @@ -79,11 +79,6 @@ // Custom command environment. Not owned. Set in Initialize. CSsmCustomCommandEnv* iEnv; - /** Global note object used to show the notification on UI. Own */ - CAknGlobalNote* iNote; - - /** Global note id for cancelling the note. */ - TInt iNoteId; }; #endif // SYSERRCMD_H diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/src/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/src/syserrcmd.cpp --- a/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -19,73 +19,15 @@ #include "syserrcmd.h" #include "trace.h" -#include -#include + #include #include #include #include #include #include - - -_LIT( KResourceFileName, "Z:startup.rsc" ); - -// ======== LOCAL FUNCTIONS ======== - -// --------------------------------------------------------------------------- -// CSysErrorPlugin::GetResourceFileNameLC -// -// --------------------------------------------------------------------------- -// -static TFileName* GetResourceFileNameLC() - { - FUNC_LOG; - - // TParse uses a lot of stack space, so allocate it from heap. - TParse* parse = new ( ELeave ) TParse; - CleanupDeletePushL( parse ); - TInt errorCode = parse->Set( KResourceFileName, - &KDC_APP_RESOURCE_DIR, - NULL ); - ERROR( errorCode, "parse::Set() failed with error code %d" ); - User::LeaveIfError( errorCode ); - - TFileName* filename = new ( ELeave ) TFileName( parse->FullName() ); - - CleanupStack::PopAndDestroy( parse ); - CleanupDeletePushL( filename ); +#include - INFO_1( "Resource file name: %S", filename ); - - return filename; - } - -// --------------------------------------------------------------------------- -// CSysErrorPlugin::GetFatalErrorStringLC -// -// --------------------------------------------------------------------------- -// -static TBool IsCoverUiSupported() - { - FUNC_LOG; - - // If this fails, default to false. - TRAPD( errorCode, FeatureManager::InitializeLibL() ); - ERROR( errorCode, "Failed to initialize FeatureManager" ); - - TBool retVal = EFalse; - if ( errorCode == KErrNone && - FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) ) - { - retVal = ETrue; - } - - FeatureManager::UnInitializeLib(); - - INFO_1( "CoverUiSupported = %d", retVal ); - return retVal; - } // ======== MEMBER FUNCTIONS ======== @@ -107,8 +49,6 @@ CSysErrCmd::~CSysErrCmd() { FUNC_LOG; - - delete iNote; } @@ -148,15 +88,6 @@ { FUNC_LOG; - if ( iNote ) - { - TInt errorCode( KErrNone ); - TRAP( errorCode, iNote->CancelNoteL( iNoteId ) ); - ERROR( errorCode, "Failed to cancel global note" ); - } - - delete iNote; // Note must be deleted here! Otherwise it doesn't complete - iNote = NULL; // request with KErrCancel and Cancel() gets stuck. } @@ -187,34 +118,14 @@ // void CSysErrCmd::DoExecuteL( TRequestStatus& aRequest ) { - delete iNote; - iNote = NULL; - iNote = CAknGlobalNote::NewL(); - - if ( IsCoverUiSupported() ) - { - CAknSDData* sdData = CAknSDData::NewL( - SecondaryDisplay::KCatStartup, - SecondaryDisplay::ECmdShowErrorNote, - TPckgBuf( SecondaryDisplay::EContactService ) ); - - // ownership to notifier client - iNote->SetSecondaryDisplayData( sdData ); - } - - TFileName* filename = GetResourceFileNameLC(); - - RFs& fs = const_cast( iEnv->Rfs() ); - - CStringResourceReader* resReader = CStringResourceReader::NewLC( *filename, - fs ); - - TPtrC errorStr( resReader->ReadResourceString( - R_SU_SELFTEST_FAILED_NOTE_TEXT ) ); - - iNoteId = iNote->ShowNoteL( aRequest, EAknGlobalPermanentNote, errorStr ); - - CleanupStack::PopAndDestroy( resReader ); - CleanupStack::PopAndDestroy( filename ); - + aRequest = NULL; + //Hb device message box implementation for global permanent note goes here + CHbDeviceMessageBoxSymbian *aMessageBox = NULL; + aMessageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning); + _LIT(KText, "Self-test failed. Contact retailer."); + aMessageBox->SetTextL(KText); + aMessageBox -> SetDismissPolicy(0); + aMessageBox -> SetTimeout(0); + aMessageBox->ExecL(); + delete aMessageBox; } diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/group/bld.inf --- a/startupservices/Startup/syserrcmd/tsrc/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Build information file for sf/mw/appsupport/startupservices/Startup/syserrcmd/tsrc tests. -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_TESTEXPORTS - -PRJ_TESTMMPFILES -#include "../syserrcmdtest/group/bld.inf" -#include "../syserrcmdtestsstub/group/bld.inf" - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/group/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/inc/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/syserrcmdtestu.def --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/syserrcmdtestu.def Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - ?LibEntryL@@YAPAVCSysErrCmdTest@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CSysErrCmdTest * LibEntryL(class CTestModuleIf &) - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/syserrcmdtest.cfg --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/syserrcmdtest.cfg Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -[Define] -// Add general definitions here -[Enddefine] - -[StifSettings] -// Add stif settings here -CheckHeapBalance= on -[EndStifSettings] - -// --------------------------------------------------------------------------- -// Test cases for Create and destroy -// --------------------------------------------------------------------------- - -[Test] -title Test Create and destroy -create syserrcmdtest testClass -testClass CreateAndDestroy -pause 1000 -delete testClass -[Endtest] - -// --------------------------------------------------------------------------- -// Test cases for init and close -// --------------------------------------------------------------------------- - -[Test] -title Test Init and close -create syserrcmdtest testClass -testClass InitAndClose -pause 1000 -delete testClass -[Endtest] -// --------------------------------------------------------------------------- -// Test cases for execute -// --------------------------------------------------------------------------- - -[Test] -title Test Execute -create syserrcmdtest testClass -testClass Execute -pause 1000 -delete testClass -[Endtest] - -// --------------------------------------------------------------------------- -// Test cases for execute and cancel -// --------------------------------------------------------------------------- - -[Test] -title Test Execute and cancel -create syserrcmdtest testClass -testClass ExecuteCancel -pause 1000 -delete testClass -[Endtest] - -// --------------------------------------------------------------------------- -// Test cases for execute after global note -// --------------------------------------------------------------------------- - -[Test] -title Test Execute after global note -create syserrcmdtest testClass -testClass ExecuteAfterGlobalNote -pause 1000 -delete testClass -[Endtest] - -// --------------------------------------------------------------------------- -// Test cases for execute after Ui service global note -// --------------------------------------------------------------------------- - -[Test] -title Test Execute after Ui service global note -create syserrcmdtest testClass -testClass ExecuteAfterUiServiceGlobalNote -pause 1000 -delete testClass -[Endtest] \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/data/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/syserrcmdtestu.def --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/syserrcmdtestu.def Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - _Z9LibEntryLR13CTestModuleIf @ 1 NONAME - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/bld.inf --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Build information file for syserrcmdtest tests. -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_TESTEXPORTS -//../init/syserrcmdtest.ini /epoc32/winscw/c/testframework/syserrcmdtest.ini -//../conf/syserrcmdtest.cfg /epoc32/winscw/c/testframework/syserrcmdtest.cfg - -PRJ_TESTMMPFILES -syserrcmdtest.mmp - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envrecall.cmd --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envrecall.cmd Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -@echo off -REM Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -REM All rights reserved. -REM This component and the accompanying materials are made available -REM under the terms of "Eclipse Public License v1.0" -REM which accompanies this distribution, and is available -REM at the URL "http://www.eclipse.org/legal/epl-v10.html". -REM -REM Initial Contributors: -REM Nokia Corporation - initial contribution. -REM -REM Contributors: -REM -REM Description: Environment setup for ssmlangselcmd tests. -REM -REM -@echo on - - -@echo Recall environment for syserrcmdtest... -@echo Cleaning up stub... -pushd ..\..\ssmlangselcmdteststub\group -call bldmake bldfiles -call abld test reallyclean -k -popd - -@echo Recall environment for syserrcmdtest... Finished. - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envsetup.cmd --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envsetup.cmd Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -@echo off -REM Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -REM All rights reserved. -REM This component and the accompanying materials are made available -REM under the terms of "Eclipse Public License v1.0" -REM which accompanies this distribution, and is available -REM at the URL "http://www.eclipse.org/legal/epl-v10.html". -REM -REM Initial Contributors: -REM Nokia Corporation - initial contribution. -REM -REM Contributors: -REM -REM Description: Environment setup for ssmlangselcmd tests. -REM -REM -@echo on - - -@echo Setup environment for syserrcmdtest... -@echo Setting up stub... -pushd ..\..\syserrcmdtestsstub\group -call bldmake bldfiles -call abld test reallyclean -call abld test build -popd -@echo Setup environment for syserrcmdtest... Finished. - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.mmp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.mmp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Project definition file for syserrcmdtest. -* -*/ - -#include - -TARGET syserrcmdtest.dll -TARGETTYPE dll - -UID 0x1000008D 0x101FB3E7 -VENDORID VID_DEFAULT -CAPABILITY ALL -TCB - -SOURCEPATH ../src -SOURCE syserrcmdtest.cpp - -USERINCLUDE ../inc -USERINCLUDE ../../inc -USERINCLUDE ../../../inc - -MW_LAYER_SYSTEMINCLUDE - -OS_LAYER_SYSTEMINCLUDE - -LIBRARY syserrcmd.lib -LIBRARY syserrcmdtestsstub.lib -LIBRARY euser.lib -LIBRARY stiftestinterface.lib -LIBRARY efsrv.lib -LIBRARY aknnotify.lib -LIBRARY akncapserverclient.lib -LIBRARY apparc.lib -LIBRARY eikcore.lib -//LIBRARY component_under_test.lib - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.pkg --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.pkg Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: -; -;Languages -&EN - -#{"syserrcmdtest"},(0x101FB3E7),1,0,0,TYPE=SA - -;Localised Vendor name -%{"syserrcmdtest EN"} - -; Vendor name -: "syserrcmdtest" - -"\epoc32\release\armv5\urel\syserrcmdtest.dll"-"c:\sys\bin\syserrcmdtest.dll" -"..\init\syserrcmdtest.ini"-"c:\testframework\syserrcmdtest.ini" -"..\conf\syserrcmdtest.cfg"-"c:\testframework\syserrcmdtest.cfg" - -; Stub for tests -"\epoc32\release\armv5\urel\syserrcmdtestsstub.dll"-"c:\sys\bin\syserrcmdtestsstub.dll" - - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/asyncrequesthandler.h --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/asyncrequesthandler.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,220 +0,0 @@ -/* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * This component and the accompanying materials are made available - * under the terms of "Eclipse Public License v1.0" - * which accompanies this distribution, and is available - * at the URL "http://www.eclipse.org/legal/epl-v10.html". - * - * Initial Contributors: - * Nokia Corporation - initial contribution. - * - * Contributors: - * - * Description: - * - */ - -#ifndef ASYNCREQUESTHANDLER_H -#define ASYNCREQUESTHANDLER_H - -// SYSTEM INCLUDE FILES -#include - -// DATA TYPES -_LIT( KPanicCat, "ASYNCREQUESTHANDLER" ); - -/** Panic codes */ -enum TArhPanicCodes - { - EArhNone, - EArhRequestPending - }; - -// CLASS DECLARATION - -/** - * A template class for handling asynchronous requests. - * - * @lib None. - * @since S60 TB9.2 - */ -template -NONSHARABLE_CLASS( CAsyncRequestHandler ): public CActive - { -public: - - // TYPE DEFINTIONS - - /** HandleIssueRequest callback */ - typedef void ( T::*HandleIssueRequest )( TRequestStatus& ); - - /** HandleRunL callback */ - typedef void ( T::*HandleRunL )( TInt ); - - /** HandleRunError callback */ - typedef TInt ( T::*HandleRunError )( TInt ); - - /** HandleDoCancel callback */ - typedef void ( T::*HandleDoCancel )(); - - // DATA TYPES - - /** Request type */ - enum TAsyncRequestType - { - ERequestOneShot, - ERequestContinuous - }; - -public: - - /** - * Symbian two phased constructor. - * - * @since S60 TB9.2 - * @param None. - * @return CAsyncRequestHandler* - */ - static CAsyncRequestHandler* NewL( T& aPtr, - HandleIssueRequest aHandleIssueRequest, - HandleRunL aHandleRunL, - HandleRunError aHandleRunError, - HandleDoCancel aHandleDoCancel, - TAsyncRequestType aType = ERequestContinuous ) - { - CAsyncRequestHandler* self = CAsyncRequestHandler::NewLC( aPtr, - aHandleIssueRequest, - aHandleRunL, - aHandleRunError, - aHandleDoCancel, - aType ); - CleanupStack::Pop( self ); - return self; - } - - /** - * Symbian two phased constructor. - * Instance is left in the cleanup stack. - * - * @since S60 TB9.2 - * @param None. - * @return CAsyncRequestHandler* - */ - static CAsyncRequestHandler* NewLC( T& aPtr, - HandleIssueRequest aHandleIssueRequest, - HandleRunL aHandleRunL, - HandleRunError aHandleRunError, - HandleDoCancel aHandleDoCancel, - TAsyncRequestType aType = ERequestContinuous ) - { - CAsyncRequestHandler* self = new CAsyncRequestHandler( aPtr, - aHandleIssueRequest, - aHandleRunL, - aHandleRunError, - aHandleDoCancel, - aType ); - CleanupStack::PushL( self ); - return self; - } - - /** - * C++ destructor. - */ - virtual ~CAsyncRequestHandler() - { - Cancel(); - } - -public: // New methods - - /** - * Issues a new request. - * Panic will occur if there already is a request pending. - * - * @since TB9.2 - * @param None. - * @return None. - */ - void IssueRequest() - { - __ASSERT_DEBUG( !IsActive(), - User::Panic( KPanicCat, EArhRequestPending ) ); - - // Call the HandleIssueRequest from the template class and set active - ( iPtr.*iHandleIssueRequest )( iStatus ); - SetActive(); - } - -protected: // From base classes - - // @see CActive - void RunL() - { - // Check result and issue request again - TInt status = iStatus.Int(); - if( iType == ERequestContinuous ) - { - IssueRequest(); - } - - // Call the HandleRunL from the template class - ( iPtr.*iHandleRunL )( status ); - } - - // @see CActive - TInt RunError( TInt aError ) - { - // Call the HandleRunError from the template class - TInt err = ( iPtr.*iHandleRunError )( aError ); - return err; - } - - // @see CActive - void DoCancel() - { - // Call the HandleDoCancel from the template class - ( iPtr.*iHandleDoCancel )(); - } - -private: - - CAsyncRequestHandler( T& aPtr, - HandleIssueRequest aHandleIssueRequest, - HandleRunL aHandleRunL, - HandleRunError aHandleRunError, - HandleDoCancel aHandleDoCancel, - TAsyncRequestType aType = ERequestContinuous ): - CActive( CActive::EPriorityStandard ), - iPtr( aPtr ), - iHandleIssueRequest( aHandleIssueRequest ), - iHandleRunL( aHandleRunL ), - iHandleRunError( aHandleRunError ), - iHandleDoCancel( aHandleDoCancel ), - iType( aType ) - { - CActiveScheduler::Add( this ); - } - -private: // Data - - /** Pointer to the template class */ - T& iPtr; - - /** HandleIssueRequest function pointer */ - HandleIssueRequest iHandleIssueRequest; - - /** HandleRunL function pointer */ - HandleRunL iHandleRunL; - - /** HandleRunError function pointer */ - HandleRunError iHandleRunError; - - /** HandleDoCancel function pointer */ - HandleDoCancel iHandleDoCancel; - - /** Request type */ - TAsyncRequestType iType; - }; - -#endif // ASYNCREQUESTHANDLER_H diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/syserrcmdtest.h --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/syserrcmdtest.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,147 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Csyserrcmdtest class declaration. -* -*/ - - -#ifndef SYSERRCMDTEST_H -#define SYSERRCMDTEST_H - -#if defined (_MSC_VER) && (_MSC_VER >= 1000) -#pragma once -#endif - -// SYSTEM INCLUDES -#include - -#include "asyncrequesthandler.h" - -// FORWARD DECLARATIONS -class TCaseInfo; -class CSysErrCmdTest; -class MSsmCustomCommand; -class CSsmCustomCommandEnv; - -// DESCRIPTION -// This a Test Module interface template -// that does not really do anything. -typedef TInt ( CSysErrCmdTest::*TestFunction )( TTestResult& ); - -NONSHARABLE_CLASS( CSysErrCmdTest ) : public CScriptBase - { -public: // Constructors and destructor - - /** - * Two-phased constructor. - */ - static CSysErrCmdTest* NewL( CTestModuleIf& aTestModuleIf ); - - /** - * Destructor. - */ - virtual ~CSysErrCmdTest(); - -public: // Functions from base classes - - TInt RunMethodL( CStifItemParser& aItem ); - -protected: // New functions - - TInt CreateAndDestroyL( CStifItemParser& aItem ); - TInt InitAndCloseL( CStifItemParser& aItem ); - TInt ExecuteL( CStifItemParser& aItem ); - TInt ExecuteCancelL( CStifItemParser& aItem ); - TInt ShowAfterAknGlobalNoteL( CStifItemParser& aItem ); - TInt ShowAfterUiServerGlobalNoteL( CStifItemParser& aItem ); - - /** HandleIssueRequest callback */ - void HandleIssueRequest( TRequestStatus& ); - - /** HandleRunL callback */ - void HandleRunL( TInt ); - - /** HandleRunError callback */ - TInt HandleRunError( TInt ); - - /** HandleDoCancel callback */ - void HandleDoCancel(); - -private: - - /** - * C++ default constructor. - */ - CSysErrCmdTest( CTestModuleIf& aTestModuleIf ); - - /** - * By default Symbian OS constructor is private. - */ - void ConstructL(); - - /** - * Function returning test case name and pointer to test case function - */ - const TCaseInfo Case( const TInt aCaseNumber ) const; - -private: // Data - - TestFunction iMethod; - - CAsyncRequestHandler* iExecuteHandler; - - RFs iFs; - - MSsmCustomCommand* iSysErrCmd; - - CSsmCustomCommandEnv* iCustCmdEnvStub; - - TInt iExecutionResult; - }; - -// Function pointer related internal definitions - -// Hack around known GCC bug. -#ifndef __GCC32__ - #define GETPTR -#else - #define GETPTR & -#endif - - -// An internal structure containing a test case name and -// the pointer to function doing the test -class TCaseInfoInternal - { - public: - const TText* iCaseName; - TestFunction iMethod; - }; - -// An internal structure containing a test case name and -// the pointer to function doing the test -class TCaseInfo - { - public: - TPtrC iCaseName; - TestFunction iMethod; - - TCaseInfo( const TText* a ) : iCaseName( ( TText* ) a ) - { - }; - }; - -#endif // SYSERRCMDTEST_H - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/trace.h --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/trace.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,596 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Trace macro definitions. -* -*/ - -#ifndef TRACE_H -#define TRACE_H - -#include // TCleanupItem -#include "traceconfiguration.hrh" - -#ifdef TRACE_INTO_FILE -#include // RFileLogger -#else -#include // RDebug -#endif - -//----------------------------------------------------------------------------- -// Constants -//----------------------------------------------------------------------------- -// - -// NOTE! -// Replace all COMPONENT_NAME occurnaces with your own component / module name. - -/** -* Prefix trace macro to complete tracing with component name. -* Returns TDesC which can be used directly with RDebug or RFileLogger. -*/ -#define _PREFIX_TRACE( aMsg ) TPtrC( (const TText*)L"[syserrcmdtest]: " L##aMsg ) - -/** -* Prefix error trace -*/ -#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg ) - -/** -* Prefix info trace. -*/ -#define _PREFIX_INFO( aMsg ) _PREFIX_TRACE( "[INFO]: " L##aMsg ) - -/** -* Prefix macro for strings -*/ -#define _PREFIX_CHAR( aMsg ) (const char*)"[syserrcmdtest]: " ##aMsg - -/** -* Define needed directories if TRACE_INTO_FILE macro in use -*/ -#ifdef TRACE_INTO_FILE - - _LIT( KDir, "syserrcmdtest" ); - _LIT( KFile, "syserrcmdtest_log.txt" ); - _LIT( KFullPath, "c:\\logs\\syserrcmdtest\\" ); - -#endif - -//----------------------------------------------------------------------------- -// Error trace macros -//----------------------------------------------------------------------------- -// -#ifdef ERROR_TRACE - - /** - * Error trace definitions. - */ - #ifdef TRACE_INTO_FILE - - #define ERROR( aErr, aMsg )\ - {\ - if( aErr < KErrNone )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr );\ - }\ - } - #define ERROR_1( aErr, aMsg, aP1 )\ - {\ - if( aErr < KErrNone )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1 );\ - }\ - } - #define ERROR_2( aErr, aMsg, aP1, aP2 )\ - {\ - if( aErr < KErrNone )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\ - }\ - } - #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\ - {\ - if( aErr < KErrNone )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\ - }\ - } - #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )\ - {\ - if( aErr < KErrNone )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4 );\ - }\ - } - #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )\ - {\ - if( aErr < KErrNone )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\ - }\ - } - #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\ - {\ - if( aErr < KErrNone )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\ - }\ - } - - #else//TRACE_INTO_FILE not defined - - #define ERROR( aErr, aMsg )\ - {\ - if( aErr < KErrNone )\ - {\ - RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\ - }\ - } - #define ERROR_1( aErr, aMsg, aP1 )\ - {\ - if( aErr < KErrNone )\ - {\ - RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\ - }\ - } - #define ERROR_2( aErr, aMsg, aP1, aP2 )\ - {\ - if( aErr < KErrNone )\ - {\ - RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\ - }\ - } - #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\ - {\ - if( aErr < KErrNone )\ - {\ - RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\ - }\ - } - #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )\ - {\ - if( aErr < KErrNone )\ - {\ - RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4 );\ - }\ - } - #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )\ - {\ - if( aErr < KErrNone )\ - {\ - RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\ - }\ - } - #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\ - {\ - if( aErr < KErrNone )\ - {\ - RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5, aP6 );\ - }\ - } - - #endif//TRACE_INTO_FILE - - #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg ) - #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 ) - #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 ) - #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 ) - #define ERROR_GEN_4( aMsg, aP1, aP2, aP3, aP4 ) ERROR_4( KErrGeneral, aMsg, aP1, aP3, aP4 ) - #define ERROR_GEN_5( aMsg, aP1, aP2, aP3, aP4, aP5 ) ERROR_5( KErrGeneral, aMsg, aP1, aP3, aP4, aP5 ) - #define ERROR_GEN_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 ) ERROR_6( KErrGeneral, aMsg, aP1, aP3, aP4, aP5, aP6 ) - -#else//ERROR_TRACE not defined - - #define ERROR( aErr, aMsg ) - #define ERROR_1( aErr, aMsg, aP1 ) - #define ERROR_2( aErr, aMsg, aP1, aP2 ) - #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 ) - #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 ) - #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 ) - #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 ) - - #define ERROR_GEN( aMsg ) - #define ERROR_GEN_1( aMsg, aP1 ) - #define ERROR_GEN_2( aMsg, aP1, aP2 ) - #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) - #define ERROR_GEN_4( aMsg, aP1, aP2, aP3, aP4 ) - #define ERROR_GEN_5( aMsg, aP1, aP2, aP3, aP4, aP5 ) - #define ERROR_GEN_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 ) - -#endif//ERROR_TRACE - -//----------------------------------------------------------------------------- -// TRAP and trace with error macro -//----------------------------------------------------------------------------- -// -#define TRAP_ERROR( aErr, aFunction )\ - {\ - TRAP( aErr, aFunction );\ - TPtrC8 file( ( TText8* )__FILE__ );\ - ERROR_2( aErr, "Trapped leave in '%S' line %d", &file, __LINE__);\ - } - -//----------------------------------------------------------------------------- -// Info trace macros -//----------------------------------------------------------------------------- -// -#ifdef INFO_TRACE - - /** - * Info log message definitions. - */ - #ifdef TRACE_INTO_FILE - - #define INFO( aMsg )\ - {\ - RFileLogger::Write( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ) );\ - } - #define INFO_1( aMsg, aP1 )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1 );\ - } - #define INFO_2( aMsg, aP1, aP2 )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2 );\ - } - #define INFO_3( aMsg, aP1, aP2, aP3 )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\ - } - #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\ - } - #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\ - } - #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\ - {\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5, aP6 );\ - } - - #else//TRACE_INTO_FILE not defined - - #define INFO( aMsg )\ - {\ - RDebug::Print( _PREFIX_INFO( aMsg ) );\ - } - #define INFO_1( aMsg, aP1 )\ - {\ - RDebug::Print( _PREFIX_INFO( aMsg ), aP1 );\ - } - #define INFO_2( aMsg, aP1, aP2 )\ - {\ - RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2 );\ - } - #define INFO_3( aMsg, aP1, aP2, aP3 )\ - {\ - RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\ - } - #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\ - {\ - RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\ - } - #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\ - {\ - RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\ - } - #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\ - {\ - RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5, aP6 );\ - } - - #endif//TRACE_INTO_FILE - -#else//INFO_TRACE not defined - - #define INFO( aMsg ) - #define INFO_1( aMsg, aP1 ) - #define INFO_2( aMsg, aP1, aP2 ) - #define INFO_3( aMsg, aP1, aP2, aP3 ) - #define INFO_4( aMsg, aP1, aP2, aP3, aP4 ) - #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 ) - #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 ) - -#endif//INFO_TRACE - -//----------------------------------------------------------------------------- -// Trace current client thread name and process id -//----------------------------------------------------------------------------- -// -#ifdef CLIENT_TRACE - - #define CLIENT_PROCESS\ - {\ - CLIENT_PROCESS_PREFIX( "" );\ - } - - #define CLIENT_PROCESS_PREFIX( aPrefix )\ - {\ - RProcess process;\ - TPtrC name( process.Name() );\ - TSecureId sid( process.SecureId() );\ - TPtrC prefix( _S( aPrefix ) );\ - if( prefix.Length() )\ - {\ - INFO_3( "%S: CLIENT - Name: [%S], Sid: [0x%x]", &prefix, &name, sid.iId );\ - }\ - else\ - {\ - INFO_2( "CLIENT - Name: [%S], Sid: [0x%x]", &name, sid.iId );\ - }\ - process.Close();\ - } - - #define CLIENT_MESSAGE( aMsg )\ - {\ - CLIENT_MESSAGE_PREFIX( "", aMsg );\ - } - - #define CLIENT_MESSAGE_PREFIX( aPrefix, aMsg )\ - {\ - RThread thread;\ - TInt err = aMsg.Client( thread );\ - if( err == KErrNone )\ - {\ - RProcess process;\ - err = thread.Process( process );\ - if( err == KErrNone )\ - {\ - TPtrC threadName( thread.Name() );\ - TUid processUid( process.SecureId() );\ - TPtrC prefix( _S( aPrefix ) );\ - if( prefix.Length() )\ - {\ - INFO_4( "%S: MSG - Name: [%S], Sid: [0x%x], Message ID: [%d]",\ - &prefix,\ - &threadName,\ - processUid,\ - aMsg.Function() );\ - }\ - else\ - {\ - INFO_3( "MSG - Name: [%S], Sid: [0x%x], Message ID: [%d]",\ - &threadName,\ - processUid,\ - aMsg.Function() );\ - }\ - }\ - process.Close();\ - }\ - thread.Close();\ - } - -#else - - #define CLIENT_PROCESS - #define CLIENT_PROCESS_PREFIX( aPrefix ) - #define CLIENT_MESSAGE( aMsg ) - #define CLIENT_MESSAGE_PREFIX( aPrefix, aMsg ) - -#endif - -//----------------------------------------------------------------------------- -// Function trace macros -//----------------------------------------------------------------------------- -// -#ifdef FUNC_TRACE - - /** - * Function logging definitions. - */ - #ifdef TRACE_INTO_FILE - - #define FUNC( aMsg, aP1 )\ - {\ - TPtrC8 trace( _S8( aMsg ) );\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, trace, aP1 );\ - }\ - - #else//TRACE_INTO_FILE not defined - - #define FUNC( aMsg, aP1 )\ - {\ - RDebug::Printf( aMsg, aP1 );\ - }\ - - #endif//TRACE_INTO_FILE - - /** - * Function trace helper class. - * - * NOTE: - * LC -methods cannot be trapped. Therefore if LC -method leaves - * END trace is used instead of LEAVE trace. - * If you have an idea how to round this problem please tell. - */ - _LIT8( KFuncNameTerminator, "(" ); - _LIT8( KFuncLeavePatternL, "L" ); - class TFuncLog - { - public: - static void Cleanup( TAny* aPtr ) - { - TFuncLog* self = static_cast< TFuncLog* >( aPtr ); - self->iLeft = ETrue; - FUNC( _PREFIX_CHAR("%S-LEAVE"), &self->iFunc ); // Leave detected - } - inline TFuncLog( const char* aFunc ) : - iFunc( aFunc ? _S8( aFunc ) : _S8("") ), - iLeft( EFalse ), - iCleanupItem( Cleanup, this ), - iCanLeave( EFalse ) - { - TInt pos( iFunc.Find( KFuncNameTerminator ) ); - if( pos != KErrNotFound ) - { - iFunc.Set( iFunc.Left( pos ) ); - iCanLeave = !iFunc.Right( KFuncLeavePatternL().Length() ).Compare( KFuncLeavePatternL ); - if ( iCanLeave ) - { - CleanupStack::PushL( iCleanupItem ); // Ignore warnings - } - } - FUNC( _PREFIX_CHAR("%S-START"), &iFunc ); - } - - inline ~TFuncLog() - { - if ( !iLeft ) - { - if ( iCanLeave ) - { - CleanupStack::Pop( this ); // Pop the cleanup item - } - FUNC( _PREFIX_CHAR("%S-END"), &iFunc ); // Normally finished - } - } - - private: // Data - TPtrC8 iFunc; - TBool iLeft; - TCleanupItem iCleanupItem; - TBool iCanLeave; - }; - #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__ ); - -#else//FUNC_TRACE not defined - - #define FUNC_LOG - -#endif//FUNC_TRACE - -//----------------------------------------------------------------------------- -// Timestamp trace macros -//----------------------------------------------------------------------------- -// -#ifdef TIMESTAMP_TRACE - - #ifdef TRACE_INTO_FILE - - #define TIMESTAMP( aCaption )\ - {\ - TTime t;\ - t.HomeTime();\ - TDateTime dt = t.DateTime();\ - _LIT( KCaption, aCaption );\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\ - _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\ - &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\ - } - - #else//TRACE_INTO_FILE not defined - - #define TIMESTAMP( aCaption )\ - {\ - TTime t;\ - t.HomeTime();\ - TDateTime dt = t.DateTime();\ - _LIT( KCaption, aCaption );\ - RDebug::Print( _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\ - &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\ - } - - #endif//TRACE_INTO_FILE - -#else//TIMESTAMP_TRACE not defined - - #define TIMESTAMP( aCaption ) - -#endif//TIMESTAMP_TRACE - -#ifdef HEAP_TRACE - - #ifdef TRACE_INTO_FILE - - #define HEAP( aMsg )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace );\ - } - #define HEAP_1( aMsg, aP1 )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\ - } - #define HEAP_2( aMsg, aP1, aP2 )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\ - } - #define HEAP_3( aMsg, aP1, aP2, aP3 )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\ - } - #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\ - } - - #else//TRACE_INTO_FILE not defined - - #define HEAP( aMsg )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace );\ - } - #define HEAP_1( aMsg, aP1 )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\ - } - #define HEAP_2( aMsg, aP1, aP2 )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\ - } - #define HEAP_3( aMsg, aP1, aP2, aP3 )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\ - } - #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\ - {\ - TInt totalAllocSpace = 0;\ - User::AllocSize( totalAllocSpace );\ - RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\ - } - - #endif//TRACE_INTO_FILE - -#else//HEAP_TRACE not defined - - #define HEAP( aMsg ) - #define HEAP_1( aMsg, aP1 ) - #define HEAP_2( aMsg, aP1, aP2 ) - #define HEAP_3( aMsg, aP1, aP2, aP3 ) - #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 ) - -#endif//HEAP_TRACE - -#endif - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/traceconfiguration.hrh --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/traceconfiguration.hrh Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Trace Macro Configurations. -* -*/ - - -#ifndef TRACECONFIGURATION_HRH -#define TRACECONFIGURATION_HRH - -//----------------------------------------------------------------------------- -// Trace definitions -//----------------------------------------------------------------------------- -// - -/** -* Error trace enabled -*/ -#ifdef _DEBUG - #define ERROR_TRACE -#else - #undef ERROR_TRACE -#endif - -/** -* Info trace enabled -*/ -#ifdef _DEBUG - #define INFO_TRACE -#else - #undef INFO_TRACE -#endif - -/** -* Timestamp tracing on -*/ -#ifdef _DEBUG - #define TIMESTAMP_TRACE -#else - #undef TIMESTAMP_TRACE -#endif - -/** -* Tracing current client process and thread -*/ -#ifdef _DEBUG - #define CLIENT_TRACE -#else - #undef CLIENT_TRACE -#endif - -/** -* Function trace enabled -*/ -#ifdef _DEBUG - #define FUNC_TRACE -#else - #undef FUNC_TRACE -#endif - -/** -* Tracing into file enabled, default RDebug -*/ -#undef TRACE_INTO_FILE - -#endif - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/syserrcmdtest.ini --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/syserrcmdtest.ini Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +0,0 @@ -# -# This is STIFTestFramework initialization file -# Comment lines start with '#'-character. -# See STIF TestFramework users guide.doc for instructions - -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -# Set following test engine settings: -# - Set Test Reporting mode. TestReportMode's possible values are: -# + 'Summary': Summary of the tested test cases. -# + 'Environment': Hardware and software info. -# + 'TestCases': Test case report. -# + 'FullReport': Set of all above ones. -# + Example 'TestReportMode= Summary TestCases' -# -# - CreateTestReport setting controls report creation mode -# + YES, Test report will created. -# + NO, No Test report. -# -# - File path indicates the base path of the test report. -# - File name indicates the name of the test report. -# -# - File format indicates the type of the test report. -# + TXT, Test report file will be txt type, for example 'TestReport.txt'. -# + HTML, Test report will be html type, for example 'TestReport.html'. -# -# - File output indicates output source of the test report. -# + FILE, Test report logging to file. -# + RDEBUG, Test report logging to using rdebug. -# -# - File Creation Mode indicates test report overwriting if file exist. -# + OVERWRITE, Overwrites if the Test report file exist. -# + APPEND, Continue logging after the old Test report information if -# report exist. -# - Sets a device reset module's dll name(Reboot). -# + If Nokia specific reset module is not available or it is not correct one -# StifHWResetStub module may use as a template for user specific reset -# module. -# - Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation -# DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02 -# - -[Engine_Defaults] - -TestReportMode= FullReport # Possible values are: 'Empty', 'Summary', 'Environment', 'TestCases' or 'FullReport' - -CreateTestReport= YES # Possible values: YES or NO - -TestReportFilePath= c:\LOGS\TestFramework\ -TestReportFileName= TestReport - -TestReportFormat= TXT # Possible values: TXT or HTML -TestReportOutput= FILE # Possible values: FILE or RDEBUG -TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND - -DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting - -DisableMeasurement= stifmeasurementdisablenone # Possible values are: - # 'stifmeasurementdisablenone', 'stifmeasurementdisableall' - # 'stifmeasurementplugin01', 'stifmeasurementplugin02', - # 'stifmeasurementplugin03', 'stifmeasurementplugin04', - # 'stifmeasurementplugin05' or 'stifbappeaprofiler' - -[End_Defaults] -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -# Module configurations start -# Modules are added between module tags -# tags. Module name is specified after ModuleName= tag, like -# ModuleName= XXXXXXXXX -# Modules might have initialisation file, specified as -# IniFile= c:\testframework\YYYYYY -# Modules might have several configuration files, like -# TestCaseFile= c:\testframework\NormalCases.txt -# TestCaseFile= c:\testframework\SmokeCases.txt -# TestCaseFile= c:\testframework\ManualCases.txt - -# (TestCaseFile is synonym for old term ConfigFile) - -# Following case specifies demo module settings. Demo module -# does not read any settings from file, so tags -# IniFile and TestCaseFile are not used. -# In the simplest case it is enough to specify only the -# name of the test module when adding new test module -[New_Module] -ModuleName= TestScripter -TestCaseFile= c:\testframework\syserrcmdtest.cfg -[End_Module] - -# Load testmoduleXXX, optionally with initialization file and/or test case files -#[New_Module] -#ModuleName= testmodulexxx - -#TestModuleXXX used initialization file -#IniFile= c:\testframework\init.txt - -#TestModuleXXX used configuration file(s) -#TestCaseFile= c:\testframework\testcases1.cfg -#TestCaseFile= c:\testframework\testcases2.cfg -#TestCaseFile= c:\testframework\manualtestcases.cfg - -#[End_Module] -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -# Set STIFTestFramework logging overwrite parameters for Logger. -# Hardware and emulator environment logging path and styles can -# be configured from here to overwrite the Logger's implemented values. -# -# Settings description: -# - Indicates option for creation log directory/directories. If log directory/directories -# is/are not created by user they will make by software. -# + YES, Create log directory/directories if not allready exist. -# + NO, Log directory/directories not created. Only created one is used. -# -# - Overwrite emulator path setting. -# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined -# Logger's path 'D:\LOGS\Module\' with those definition the path -# will be 'C:\LOGS\TestFramework\LOGS\Module\' -# -# - Overwrite emulator's logging format. -# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'. -# + HTML, Log file(s) will be html type(s), for example 'Module.html'. -# -# - Overwrited emulator logging output source. -# + FILE, Logging to file(s). -# + RDEBUG, Logging to using rdebug(s). -# -# - Overwrite hardware path setting (Same description as above in emulator path). -# - Overwrite hardware's logging format(Same description as above in emulator format). -# - Overwrite hardware's logging output source(Same description as above in emulator output). -# -# - File Creation Mode indicates file overwriting if file exist. -# + OVERWRITE, Overwrites if file(s) exist. -# + APPEND, Continue logging after the old logging information if file(s) exist. -# -# - Will thread id include to the log filename. -# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'. -# + NO, No thread id to log file(s), Example filename 'Module.txt'. -# -# - Will time stamps include the to log file. -# + YES, Time stamp added to each line in log file(s). Time stamp is -# for example'12.Nov.2003 115958 LOGGING INFO' -# + NO, No time stamp(s). -# -# - Will line breaks include to the log file. -# + YES, Each logging event includes line break and next log event is in own line. -# + NO, No line break(s). -# -# - Will event ranking include to the log file. -# + YES, Event ranking number added to each line in log file(s). Ranking number -# depends on environment's tics, for example(includes time stamp also) -# '012 12.Nov.2003 115958 LOGGING INFO' -# + NO, No event ranking. -# - -[Logger_Defaults] - -#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' -#NOTE: TestEngine and TestServer logging settings cannot change here - -#CreateLogDirectories= YES # Possible values: YES or NO - -#EmulatorBasePath= C:\LOGS\TestFramework\ -#EmulatorFormat= HTML # Possible values: TXT or HTML -#EmulatorOutput= FILE # Possible values: FILE or RDEBUG - -#HardwareBasePath= D:\LOGS\TestFramework\ -#HardwareFormat= HTML # Possible values: TXT or HTML -#HardwareOutput= FILE # Possible values: FILE or RDEBUG - -#FileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND - -#ThreadIdToLogFile= YES # Possible values: YES or NO -#WithTimeStamp= YES # Possible values: YES or NO -#WithLineBreak= YES # Possible values: YES or NO -#WithEventRanking= YES # Possible values: YES or NO - -[End_Logger_Defaults] -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -# End of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/syserrcmdtest.cpp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/syserrcmdtest.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,343 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* CSysErrCmdTest class implementation. -* -*/ - -#include -#include -#include - -#include -#include -#include - -#include "syserrcmdtest.h" -#include "syserrcmdfactory.h" -#include "syserrcmdtestsstub.h" -#include "trace.h" - -// INTERNAL INCLUDES -NONSHARABLE_CLASS( TWaitInfo ) - { - public: - - CPeriodic* iPeriodic; - CActiveSchedulerWait* iWait; - }; - - -/** -* Call back method when we need to stop active scheduler wait. -*/ -LOCAL_C TInt WaitCallBack( TAny* aSelf ) - { - if( aSelf ) - { - TWaitInfo* info = static_cast( aSelf ); - if( info->iPeriodic ) - { - info->iPeriodic->Cancel(); - } - if( info->iWait ) - { - if( info->iWait->IsStarted() ) - { - info->iWait->AsyncStop(); - } - } - } - - return KErrNone; - } - -/** -* Helper method to wait current scheduler before teardown is completed. -*/ -LOCAL_C void WaitL( TInt aIntervalInMicorseconds ) - { - TWaitInfo info; - - // Construct periodic - CPeriodic* periodic = CPeriodic::NewL( CActive::EPriorityStandard ); - CleanupStack::PushL( periodic ); - info.iPeriodic = periodic; - - // Construct active scheduler wait - CActiveSchedulerWait* wait = new( ELeave ) CActiveSchedulerWait; - CleanupStack::PushL( wait ); - info.iWait = wait; - - // Start timer and wait - TCallBack cb( WaitCallBack, &info ); - periodic->Start( aIntervalInMicorseconds, aIntervalInMicorseconds, cb ); - wait->Start(); - - // Cleanup - CleanupStack::PopAndDestroy( wait ); - CleanupStack::PopAndDestroy( periodic ); - } - -// --------------------------------------------------------- -// CSysErrCmdTest::LibEntryL -// Returns: Poiter to CSysErrCmdTest class -// --------------------------------------------------------- -EXPORT_C CSysErrCmdTest* LibEntryL( CTestModuleIf& aTestModuleIf ) - { - FUNC_LOG; - - CSysErrCmdTest* libEntry( CSysErrCmdTest::NewL( aTestModuleIf ) ); - return libEntry; - } - -// --------------------------------------------------------- -// CSysErrCmdTest::CSysErrCmdTest -// --------------------------------------------------------- -CSysErrCmdTest::CSysErrCmdTest( CTestModuleIf& aTestModuleIf ) : - CScriptBase( aTestModuleIf ) - { - FUNC_LOG; - } - -// --------------------------------------------------------- -// CSysErrCmdTest::ConstructL -// --------------------------------------------------------- -void CSysErrCmdTest::ConstructL() - { - FUNC_LOG; - - iExecuteHandler = CAsyncRequestHandler::NewL( - *this, - HandleIssueRequest, - HandleRunL, - HandleRunError, - HandleDoCancel, - CAsyncRequestHandler::ERequestOneShot ); - - User::LeaveIfError( iFs.Connect() ); - - iCustCmdEnvStub = SysErrCmdTestsStub::CustomCommandEnvStubL( iFs ); - } - -// --------------------------------------------------------- -// CSysErrCmdTest::NewL -// --------------------------------------------------------- -CSysErrCmdTest* CSysErrCmdTest::NewL( CTestModuleIf& aTestModuleIf ) - { - FUNC_LOG; - - CSysErrCmdTest* self = new (ELeave) CSysErrCmdTest( aTestModuleIf ); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -// --------------------------------------------------------- -// CSysErrCmdTest::~CSysErrCmdTest -// --------------------------------------------------------- -CSysErrCmdTest::~CSysErrCmdTest() - { - iFs.Close(); - delete iExecuteHandler; - delete iCustCmdEnvStub; - FUNC_LOG; - } - -// --------------------------------------------------------- -// CSysErrCmdTest::RunMethodL -// --------------------------------------------------------- -TInt CSysErrCmdTest::RunMethodL( CStifItemParser& aItem ) - { - FUNC_LOG; - - const TStifFunctionInfo KFunctions[] = - { - // Copy this line for every implemented function. - // First string is the function name used in TestScripter script file. - // Second is the actual implementation member function. - ENTRY( "CreateAndDestroy", CSysErrCmdTest::CreateAndDestroyL ), - ENTRY( "InitAndClose", CSysErrCmdTest::InitAndCloseL ), - ENTRY( "Execute", CSysErrCmdTest::ExecuteL ), - ENTRY( "ExecuteCancel", CSysErrCmdTest::ExecuteCancelL ), - ENTRY( "ExecuteAfterGlobalNote", CSysErrCmdTest::ShowAfterAknGlobalNoteL ), - ENTRY( "ExecuteAfterUiServiceGlobalNote", CSysErrCmdTest::ShowAfterUiServerGlobalNoteL ) - }; - const TInt count( sizeof( KFunctions ) / sizeof( TStifFunctionInfo ) ); - TInt ret( RunInternalL( KFunctions, count, aItem ) ); - return ret; - } - -// --------------------------------------------------------- -// CSysErrCmdTest::CreateAndDestroyL -// --------------------------------------------------------- - -TInt CSysErrCmdTest::CreateAndDestroyL( CStifItemParser& aItem ) - { - FUNC_LOG; - ( void )aItem; - MSsmCustomCommand* sysErrCmd = SysErrCmdFactory::SysErrCmdNewL(); - sysErrCmd->Release(); - return KErrNone; - } - -// --------------------------------------------------------- -// CSysErrCmdTest::InitAndCloseL -// --------------------------------------------------------- -TInt CSysErrCmdTest::InitAndCloseL( CStifItemParser& aItem ) - { - FUNC_LOG; - ( void )aItem; - - MSsmCustomCommand* sysErrCmd = SysErrCmdFactory::SysErrCmdNewL(); - - TInt err( sysErrCmd->Initialize( iCustCmdEnvStub ) ); - ERROR( err, "Failed to init syserrcmd" ); - User::LeaveIfError( err ); - - sysErrCmd->Close(); - sysErrCmd->Release(); - - return KErrNone; - } -// --------------------------------------------------------- -// CSysErrCmdTest::ExecuteL -// --------------------------------------------------------- - -TInt CSysErrCmdTest::ExecuteL( CStifItemParser& aItem ) - { - FUNC_LOG; - ( void )aItem; - iSysErrCmd = SysErrCmdFactory::SysErrCmdNewL(); - TInt err( iSysErrCmd->Initialize( iCustCmdEnvStub ) ); - ERROR( err, "Failed to init syserrcmd" ); - User::LeaveIfError( err ); - - iExecuteHandler->IssueRequest(); - - WaitL( 5000 ); - - iSysErrCmd->Close(); - iSysErrCmd->Release(); - - INFO_1( "Execution result %d", iExecutionResult ); - - return iExecutionResult; - } - -// --------------------------------------------------------- -// CSysErrCmdTest::ExecuteL -// --------------------------------------------------------- - -TInt CSysErrCmdTest::ExecuteCancelL( CStifItemParser& aItem ) - { - FUNC_LOG; - ( void )aItem; - iSysErrCmd = SysErrCmdFactory::SysErrCmdNewL(); - TInt err( iSysErrCmd->Initialize( iCustCmdEnvStub ) ); - ERROR( err, "Failed to init syserrcmd" ); - User::LeaveIfError( err ); - - iExecuteHandler->IssueRequest(); - - WaitL( 5000 ); - - iSysErrCmd->ExecuteCancel(); - - WaitL( 5000 ); - - iSysErrCmd->Close(); - iSysErrCmd->Release(); - - INFO_1( "ExecutionCancel result %d", iExecutionResult ); - - return ( iExecutionResult == KErrCancel ) ? KErrNone : KErrGeneral; - } - -// --------------------------------------------------------- -// CSysErrCmdTest::ShowAfterAknGlobalNoteL -// --------------------------------------------------------- -TInt CSysErrCmdTest::ShowAfterAknGlobalNoteL( CStifItemParser& aItem ) - { - CAknGlobalNote* note = CAknGlobalNote::NewLC(); - note->ShowNoteL( EAknGlobalInformationNote, _L("CAknGlobalNote::ShowNoteL()") ); - CleanupStack::PopAndDestroy( note ); - - return ExecuteL( aItem ); - } - -// --------------------------------------------------------- -// CSysErrCmdTest::ShowAfterUiServerGlobalNoteL -// --------------------------------------------------------- -TInt CSysErrCmdTest::ShowAfterUiServerGlobalNoteL( CStifItemParser& aItem ) - { - RAknUiServer aknSrv; - - User::LeaveIfError( aknSrv.Connect() ); - - CleanupClosePushL( aknSrv ); - - aknSrv.ShowGlobalNoteL( _L("RAknUiServer::ShowGlobalNoteL()"), EAknGlobalInformationNote ); - - CleanupStack::PopAndDestroy( &aknSrv ); - - return ExecuteL( aItem ); - } - -// --------------------------------------------------------- -// CSysErrCmdTest::HandleIssueRequest -// --------------------------------------------------------- - -void CSysErrCmdTest::HandleIssueRequest( TRequestStatus& aRequest ) - { - FUNC_LOG; - - iSysErrCmd->Execute( KNullDesC8, aRequest ); - - } -// --------------------------------------------------------- -// CSysErrCmdTest::HandleRunL -// --------------------------------------------------------- - -void CSysErrCmdTest::HandleRunL( TInt aStatus ) - { - FUNC_LOG; - INFO_1( "CSysErrCmdTest::HandleRunL %d", aStatus ); - - if ( KErrNone != aStatus ) - { - iExecutionResult = aStatus; - } - } -// --------------------------------------------------------- -// CSysErrCmdTest::HandleRunError -// --------------------------------------------------------- - -TInt CSysErrCmdTest::HandleRunError( TInt aError ) - { - FUNC_LOG; - ERROR( aError, "CSysErrCmdTest::HandleRunError" ); - return KErrNone; - } -// --------------------------------------------------------- -// CSysErrCmdTest::HandleDoCancel -// --------------------------------------------------------- - -void CSysErrCmdTest::HandleDoCancel() - { - FUNC_LOG; - } - - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/syserrcmdtestsstubu.def --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/syserrcmdtestsstubu.def Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -EXPORTS - ?CustomCommandEnvStubL@SysErrCmdTestsStub@@SAPAVCSsmCustomCommandEnv@@AAVRFs@@@Z @ 1 NONAME ; class CSsmCustomCommandEnv * SysErrCmdTestsStub::CustomCommandEnvStubL(class RFs &) - ?Rfs@CSsmCustomCommandEnv@@UBEABVRFs@@XZ @ 2 NONAME ; class RFs const & CSsmCustomCommandEnv::Rfs(void) const - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/data/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/syserrcmdtestsstubu.def --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/syserrcmdtestsstubu.def Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - _ZN18SysErrCmdTestsStub21CustomCommandEnvStubLER3RFs @ 1 NONAME - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/bld.inf --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Build information file for ssmlangselcmdtest tests. -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_TESTEXPORTS -../inc/syserrcmdtestsstub.h |../../inc/syserrcmdtestsstub.h - -PRJ_TESTMMPFILES -syserrcmdtestsstub.mmp - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/syserrcmdtestsstub.mmp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/syserrcmdtestsstub.mmp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Project definition file for ssmlangselcmdtest. -* -*/ - -#include - -TARGET syserrcmdtestsstub.dll -TARGETTYPE dll - -UID 0x1000008D 0x101FB3E9 -VENDORID VID_DEFAULT -CAPABILITY ALL -TCB - -SOURCEPATH ../src -SOURCE ssmcustomcommandenvstub.cpp -SOURCE syserrcmdtestsstub.cpp - - -USERINCLUDE ../inc - -OS_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib - - - - diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/syserrcmdtestsstub.h --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/syserrcmdtestsstub.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Declaration of SsmLangSelCmdTestStub class. -* -*/ - -#ifndef SYSERRCMDTESTSSTUB_H -#define SYSERRCMDTESTSSTUB_H - -#include - -class CSsmCustomCommandEnv; -class RFs; -/** -* Stub class for syserrcmd tests -* -*/ -NONSHARABLE_CLASS( SysErrCmdTestsStub ) - { -public: - /** - * Methods for mapping p&s, cenrep and feature Uids - * - * @param aUid The Uid to map - * @return The mapped Uid - */ - - IMPORT_C static CSsmCustomCommandEnv* CustomCommandEnvStubL( RFs& aRfs ); - - }; - -#endif // SYSERRCMDTESTSSTUB_H diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/distribution.policy.s60 --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/ssmcustomcommandenvstub.cpp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/ssmcustomcommandenvstub.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * This component and the accompanying materials are made available - * under the terms of "Eclipse Public License v1.0" - * which accompanies this distribution, and is available - * at the URL "http://www.eclipse.org/legal/epl-v10.html". - * - * Initial Contributors: - * Nokia Corporation - initial contribution. - * - * Contributors: - * - * Description: - * - */ - -// SYSTEM INCLUDES - -// USER INCLUDES -#include - -// ======== MEMBER FUNCTIONS ======== - -// --------------------------------------------------------------------------- -// C++ constructor. -// --------------------------------------------------------------------------- -// -CSsmCustomCommandEnv::CSsmCustomCommandEnv( RFs& aRfs ) -:iFs( aRfs ) - { - - } - - -// --------------------------------------------------------------------------- -// Symbian two phased constructor. -// --------------------------------------------------------------------------- -// -CSsmCustomCommandEnv* CSsmCustomCommandEnv::NewL( RFs& aRfs ) - { - CSsmCustomCommandEnv* self = new ( ELeave ) CSsmCustomCommandEnv( aRfs ); - return self; - } - - -// --------------------------------------------------------------------------- -// C++ destructor. -// --------------------------------------------------------------------------- -// -CSsmCustomCommandEnv::~CSsmCustomCommandEnv() - { - - } -// --------------------------------------------------------------------------- -// CSsmCustomCommandEnv::Rfs -// --------------------------------------------------------------------------- -// -const RFs& CSsmCustomCommandEnv::Rfs() const - { - return iFs; - } -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/syserrcmdtestsstub.cpp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/syserrcmdtestsstub.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * This component and the accompanying materials are made available - * under the terms of "Eclipse Public License v1.0" - * which accompanies this distribution, and is available - * at the URL "http://www.eclipse.org/legal/epl-v10.html". - * - * Initial Contributors: - * Nokia Corporation - initial contribution. - * - * Contributors: - * - * Description: - * - */ - -// SYSTEM INCLUDES - -// USER INCLUDES -#include "syserrcmdtestsstub.h" -#include - -// --------------------------------------------------------------------------- -// C++ destructor. -// --------------------------------------------------------------------------- -// -EXPORT_C CSsmCustomCommandEnv* SysErrCmdTestsStub::CustomCommandEnvStubL( - RFs& aRfs ) - { - return CSsmCustomCommandEnv::NewL( aRfs ); - } - -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/group/Distribution.Policy.S60 --- a/startupservices/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/inc/Distribution.Policy.S60 --- a/startupservices/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/Distribution.Policy.S60 --- a/startupservices/startupanimation/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/group/Distribution.Policy.S60 --- a/startupservices/startupanimation/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/rom/Distribution.Policy.S60 --- a/startupservices/startupanimation/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimctrl/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimctrl/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimctrl/bwins/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimctrl/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimctrl/eabi/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimctrl/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimctrl/group/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimctrl/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp --- a/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -37,7 +37,7 @@ APP_LAYER_SYSTEMINCLUDE // dependency to app layer (Profiles) -LIBRARY avkon.lib + LIBRARY centralrepository.lib LIBRARY cone.lib LIBRARY efsrv.lib @@ -46,3 +46,5 @@ LIBRARY featmgr.lib LIBRARY mediatorclient.lib LIBRARY sanimengine.lib + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimctrl/inc/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimctrl/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimctrl/src/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimctrl/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp --- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007,2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -16,8 +16,9 @@ */ -#include -#include + + #include + #include #include #include @@ -30,12 +31,12 @@ #include "trace.h" const TInt KMinVolume( 0 ); /** Minimum allowed volume level. */ -const TInt KMaxVolume( 10 ); /** Maximum allowed volume level. */ +const TInt KMaxVolume( 10000 ); /** Maximum allowed volume level. */ const TInt KDefaultRepeatCount( 1 ); /** Default repeat count for animation and tone. */ const TInt KDefaultVolumeRamp( 0 ); /** Default volume ramp value in microseconds. */ -static const TInt KMediatorTimeout( 1000000 ); /** Default timeout for Mediator commands. */ +//static const TInt KMediatorTimeout( 1000000 ); /** Default timeout for Mediator commands. */ // ======== LOCAL FUNCTIONS ======== @@ -197,7 +198,7 @@ else if ( iCommandInitiator ) { INFO_1( "Secondary display data: %d", iSyncCommand ); - + iClientStatus = &aStatus; iWaitingForSyncResponse = ETrue; TInt errorCode = iCommandInitiator->IssueCommand( @@ -314,7 +315,7 @@ { iWaitingForSyncResponse = EFalse; StartAnimation(); - } + } } @@ -349,21 +350,7 @@ FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ); FeatureManager::UnInitializeLib(); - if ( secondaryDisplaySupported ) - { - iCommandInitiator = CMediatorCommandInitiator::NewL( this ); - iCommandResponder = CMediatorCommandResponder::NewL( this ); - - TInt errorCode = iCommandResponder->RegisterCommand( - KMediatorSecondaryDisplayDomain, - SecondaryDisplay::KCatStartup, - SecondaryDisplay::ECmdStartupPhaseSkip, - TVersion( 0, 0, 0 ), - ECapabilitySwEvent, - KMediatorTimeout ); - ERROR( errorCode, "Failed to register command ECmdStartupPhaseSkip with mediator" ); - User::LeaveIfError( errorCode ); - } + CSAnimCtrl::BaseConstructL( aRect, aContainer ); } @@ -504,7 +491,7 @@ if ( iPlayDefaultBeep ) { INFO( "Default startup beep requested" ); - + /* CAknAppUi* appUi = static_cast( iEikonEnv->EikAppUi() ); if ( appUi ) { @@ -512,6 +499,7 @@ appUi->KeySounds()->PlaySound( EAvkonSIDPowerOnTone ); } + */ } iEngine->Start( *iClientStatus ); diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimengine/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimengine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimengine/bwins/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimengine/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimengine/eabi/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimengine/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimengine/group/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimengine/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimengine/group/sanimengine.mmp --- a/startupservices/startupanimation/sanimengine/group/sanimengine.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/startupanimation/sanimengine/group/sanimengine.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -44,3 +44,5 @@ LIBRARY ecom.lib LIBRARY euser.lib LIBRARY fbscli.lib + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimengine/inc/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimengine/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimengine/src/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimengine/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimihlplugin/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimihlplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimihlplugin/data/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimihlplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimihlplugin/group/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimihlplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimihlplugin/group/sanimihlplugin.mmp --- a/startupservices/startupanimation/sanimihlplugin/group/sanimihlplugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/startupanimation/sanimihlplugin/group/sanimihlplugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -45,3 +45,5 @@ LIBRARY euser.lib LIBRARY ihl.lib LIBRARY sanimengine.lib + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimihlplugin/inc/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimihlplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimihlplugin/src/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimihlplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimmmfplugin/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimmmfplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimmmfplugin/data/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimmmfplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimmmfplugin/group/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimmmfplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimmmfplugin/group/sanimmmfplugin.mmp --- a/startupservices/startupanimation/sanimmmfplugin/group/sanimmmfplugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/startupanimation/sanimmmfplugin/group/sanimmmfplugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -43,3 +43,5 @@ LIBRARY euser.lib LIBRARY mediaclientaudio.lib LIBRARY sanimengine.lib + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimmmfplugin/inc/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimmmfplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimmmfplugin/src/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimmmfplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimsvgplugin/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimsvgplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimsvgplugin/data/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimsvgplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimsvgplugin/group/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimsvgplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimsvgplugin/group/sanimsvgplugin.mmp --- a/startupservices/startupanimation/sanimsvgplugin/group/sanimsvgplugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/startupservices/startupanimation/sanimsvgplugin/group/sanimsvgplugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -48,3 +48,5 @@ LIBRARY gdi.lib LIBRARY sanimengine.lib LIBRARY svgengine.lib + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimsvgplugin/inc/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimsvgplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 startupservices/startupanimation/sanimsvgplugin/src/Distribution.Policy.S60 --- a/startupservices/startupanimation/sanimsvgplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/Distribution.Policy.S60 --- a/sysresmonitoring/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/group/Distribution.Policy.S60 --- a/sysresmonitoring/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/inc/Distribution.Policy.S60 --- a/sysresmonitoring/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/BWINS/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/CenRep/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/CenRep/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/EABI/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/conf/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/conf/uiklaf.confml Binary file sysresmonitoring/oodmonitor/conf/uiklaf.confml has changed diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/conf/uiklaf_101F8774.crml Binary file sysresmonitoring/oodmonitor/conf/uiklaf_101F8774.crml has changed diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/group/OODMonitor.mmp --- a/sysresmonitoring/oodmonitor/group/OODMonitor.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oodmonitor/group/OODMonitor.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -27,11 +27,12 @@ VENDORID VID_DEFAULT +SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets USERINCLUDE ../inc -APP_LAYER_SYSTEMINCLUDE - +//APP_LAYER_SYSTEMINCLUDE +MW_LAYER_SYSTEMINCLUDE SOURCEPATH ../src SOURCE lafshut.cpp @@ -40,7 +41,7 @@ LIBRARY efsrv.lib LIBRARY bafl.lib LIBRARY ws32.lib -LIBRARY aknnotify.lib +LIBRARY HbWidgets.lib SOURCEPATH ../resource START RESOURCE lafmemorywatcher.rss @@ -49,4 +50,7 @@ LANGUAGE_IDS END + +SMPSAFE // End of file. + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/group/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/inc/Ood.h --- a/sysresmonitoring/oodmonitor/inc/Ood.h Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oodmonitor/inc/Ood.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -20,7 +20,7 @@ #define LAFSHUT_H // SYSTEM INCLUDES - +#include "hbdevicemessageboxsymbian.h" // USER INCLUDES // CONSTANTS @@ -116,7 +116,8 @@ private: TMessageType iMessageType; CMessageInfo* iMessageInfo[4]; - CAknGlobalNote* iQuery; + + }; // ====================================================================== diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/inc/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/BWINS/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/oodmonitor2/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/EABI/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/oodmonitor2/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/oodmonitor2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/group/OODMonitor.mmp --- a/sysresmonitoring/oodmonitor/oodmonitor2/group/OODMonitor.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oodmonitor/oodmonitor2/group/OODMonitor.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -26,11 +26,13 @@ CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT +SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets USERINCLUDE ../inc USERINCLUDE ../../inc -APP_LAYER_SYSTEMINCLUDE + +MW_LAYER_SYSTEMINCLUDE SOURCEPATH ../src @@ -45,13 +47,12 @@ LIBRARY efsrv.lib LIBRARY bafl.lib LIBRARY ws32.lib -LIBRARY aknnotify.lib -LIBRARY PlatformEnv.lib +LIBRARY platformenv.lib LIBRARY disknotifyhandler.lib LIBRARY commonengine.lib LIBRARY cone.lib -LIBRARY avkon.lib LIBRARY centralrepository.lib +LIBRARY HbWidgets.lib SOURCEPATH ../../resource START RESOURCE LafMemoryWatcher.rss @@ -67,4 +68,7 @@ LANGUAGE_IDS END + +SMPSAFE // End of file. + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/group/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/oodmonitor2/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/inc/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskglobalnote.h --- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskglobalnote.h Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskglobalnote.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -22,7 +22,8 @@ // SYSTEM INCLUDES #include #include -#include +#include "hbdevicemessageboxsymbian.h" + // USER INCLUDES @@ -64,7 +65,6 @@ private: // Data COutOfDiskMonitor* iOutOfDiskMonitor; //uses RFs& iFs; - CAknGlobalNote* iQuery; RResourceFile iOODResourceFile; TNoteInfo iNoteInfo; }; diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h --- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h Thu Jun 24 13:52:58 2010 +0100 @@ -90,6 +90,7 @@ TInt iDefaultMassStorage; TInt iDefaultRomDrive; RResourceFile iResourceFile; + TInt64 iOODWarningThresholdMassMemory; }; #endif // __OUTOFDISKMONITOR_H__ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/resource/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/oodmonitor2/resource/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/src/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/oodmonitor2/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp --- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -18,16 +18,12 @@ // SYSTEM INCLUDES #include -#include -#include -#include -#include #include #include #include #include // BaflUtils #include -#include + // USER INCLUDES #include "UiklafInternalCRKeys.h" @@ -60,7 +56,6 @@ COutOfDiskGlobalNote::~COutOfDiskGlobalNote() { TRACES("COutOfDiskGlobalNote::~COutOfDiskGlobalNote"); - delete iQuery; iOODResourceFile.Close(); Cancel(); // Cancel active object TRACES("COutOfDiskGlobalNote::~COutOfDiskGlobalNote: End"); @@ -110,19 +105,15 @@ void COutOfDiskGlobalNote::DisplayL(const TDesC& aMessage) { TRACES("COutOfDiskGlobalNote::DisplayL"); - if (iNoteInfo.iNoteId > KErrNotFound) - { - CancelNoteL(); - } - - if (!iQuery) - { - TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote::DisplayL: Create iQuery"); - iQuery = CAknGlobalNote::NewL(); - iQuery->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY); - } - iNoteInfo.iNoteId = iQuery->ShowNoteL(iStatus, EAknGlobalWarningNote, aMessage); - SetActive(); + + TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote::DisplayL: Create iQuery"); + CHbDeviceMessageBoxSymbian* globalNote = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning); + CleanupStack::PushL(globalNote); + globalNote->SetTextL(aMessage); + globalNote->SetTimeout(0); + globalNote->ExecL(); + CleanupStack::PopAndDestroy(globalNote); + TRACES("COutOfDiskGlobalNote::DisplayL: End"); } @@ -143,8 +134,7 @@ if (iOutOfDiskMonitor->GetGlobalNotesAllowed()) { - TInt sdDialogId = 0; - + TResourceReader resReader; HBufC8* str(NULL); CDesCArray* strings = new ( ELeave ) CDesCArrayFlat( 2 ); @@ -169,7 +159,6 @@ if (aDrive == iOutOfDiskMonitor->GetDefaultPhoneMemory()) { - sdDialogId = EAknDiskWarnignNote; str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_DEVICE_MEMORY_LOW); resReader.SetBuffer(str); strings->AppendL( driveName ); @@ -177,7 +166,6 @@ else if (driveStatus & DriveInfo::EDriveRemovable) { TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Warning note! volNameLength: %d", nameLength); - sdDialogId = EAknMMCWarningNote; TBufC name(volInfo.iName); if (nameLength) { @@ -196,7 +184,6 @@ } else { - sdDialogId = EAknDiskWarnignNote; str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MASS_STORAGE_MEMORY_LOW); resReader.SetBuffer(str); strings->AppendL( driveName ); @@ -207,14 +194,12 @@ TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Critical note! Drive: %c", aDrive+'A'); if (aDrive == iOutOfDiskMonitor->GetDefaultPhoneMemory()) { - sdDialogId = EAknDiskFullNote; str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_DEVICE_MEMORY_FULL); resReader.SetBuffer(str); strings->AppendL( driveName ); } else if (driveStatus & DriveInfo::EDriveRemovable) { - sdDialogId = EAknMMCFullNote; TBufC name(volInfo.iName); if (nameLength) { @@ -233,27 +218,25 @@ } else { - sdDialogId = EAknDiskFullNote; str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MASS_STORAGE_FULL); resReader.SetBuffer(str); strings->AppendL( driveName ); } } resReader.SetBuffer(str); - HBufC* message( FormatStringL(resReader.ReadHBufCL()->Des(), *strings)); - TRACES1("COutOfDiskMonitor::ShowGlobalQueryL: txt: %S",message); + HBufC* resHandle = resReader.ReadHBufCL(); + CleanupStack::PushL( resHandle ); + HBufC* message(FormatStringL(resHandle->Des(),*strings)); + CleanupStack::PushL( message ); + TRACES1("COutOfDiskMonitor::ShowGlobalQueryL: txt: %S",message); DisplayL(message->Des()); - TBuf8<2> sdDriveName; - sdDriveName.Append(aDrive+'A'); - sdDriveName.Append(_L8(":")); - CAknSDData* sd = CAknSDData::NewL(KAknSecondaryDisplayCategory, sdDialogId, sdDriveName); - iQuery->SetSecondaryDisplayData(sd); - iNoteInfo.iStatus = aStatus; iNoteInfo.iDrive = aDrive; + CleanupStack::PopAndDestroy(message); + CleanupStack::PopAndDestroy(resHandle); CleanupStack::PopAndDestroy( str ); - CleanupStack::PopAndDestroy( strings ); + CleanupStack::PopAndDestroy( strings ); iOutOfDiskMonitor->SetAsDisplayedL(aDrive, aStatus); } TRACES("COutOfDiskGlobalNote::ShowGlobalQueryL: End"); @@ -341,10 +324,6 @@ { TRACES("COutOfDiskGlobalNote::CancelNoteL"); - if (iNoteInfo.iNoteId > KErrNotFound) - { - iQuery->CancelNoteL(iNoteInfo.iNoteId); - } Cancel(); TRACES("COutOfDiskGlobalNote::CancelNoteL: End"); } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp --- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -107,18 +107,22 @@ CRepository* repository( NULL ); TInt warningThreshold(0); TInt criticalThreshold(0); + TInt warningThresholdMassMemory(0); TRAPD( err, repository = CRepository::NewL( KCRUidUiklaf ) ); if ( err == KErrNone ) { err = repository->Get(KUikOODDiskFreeSpaceWarningNoteLevel, warningThreshold); err = repository->Get(KUikOODDiskCriticalThreshold, criticalThreshold); + err = repository->Get(KUikOODDiskFreeSpaceWarningNoteLevelMassMemory, warningThresholdMassMemory); } delete repository; iOODWarningThreshold = warningThreshold; iOODCriticalThreshold = criticalThreshold; + iOODWarningThresholdMassMemory = warningThresholdMassMemory; - TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold: %d percent",iOODWarningThreshold); + TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold Phone Memory: %d percent",iOODWarningThreshold); TRACES1("COutOfDiskMonitor::ConstructL: Critical threshold: %ld bytes",iOODCriticalThreshold); + TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold Mass Memory: %ld bytes",iOODWarningThresholdMassMemory); iOutOfDiskNotifyObserver = COutOfDiskNotifyObserver::NewL( this, iFs ); TRACES("COutOfDiskMonitor::ConstructL: End"); @@ -208,8 +212,24 @@ TRACES1("COutOfDiskMonitor::GetThreshold: Volume size: %ld",volSize); if ( ret == KErrNone ) { - TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold: Used disk space %d percent",iOODWarningThreshold); - threshold = ((volSize*(100-iOODWarningThreshold))/100); + if(aDrive == EDriveC) + { + TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Phone Memory: Used disk space %d percent",iOODWarningThreshold); + threshold = ((volSize*(100-iOODWarningThreshold))/100); + } + else + { + if(iOODWarningThresholdMassMemory < volSize ) + { + TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Mass Memory: %ld bytes",iOODWarningThresholdMassMemory); + threshold = iOODWarningThresholdMassMemory; + } + else + { + TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Phone Memory: Used disk space %d percent",iOODWarningThreshold); + threshold = ((volSize*(100-iOODWarningThreshold))/100); + } + } } } else if (aLevel == DISK_SPACE_CRITICAL) diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/resource/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/resource/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/rom/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/src/distribution.policy.s60 --- a/sysresmonitoring/oodmonitor/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oodmonitor/src/lafshut.cpp --- a/sysresmonitoring/oodmonitor/src/lafshut.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oodmonitor/src/lafshut.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -24,10 +24,6 @@ #include #include #include -#include -#include -#include -#include #include #include @@ -726,7 +722,6 @@ CLafShutdownManager::CGlobalQueryActive::~CGlobalQueryActive() { TRACES("CLafShutdownManager::CGlobalQueryActive::~CGlobalQueryActive"); - delete iQuery; delete iMessageInfo[ECritical]; delete iMessageInfo[EWarning]; delete iMessageInfo[EWarningMMC]; @@ -801,50 +796,21 @@ return; } - if (!iQuery) - { - iQuery = CAknGlobalNote::NewL(); - iQuery->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY); - } - - if (aType != ECallBack) + if (aType != ECallBack) { iMessageType = aType; } CleanupL(); - if (iMessageType != ENone && (iMessageInfo[iMessageType]->iNoteId == KErrNotFound || aForcedNote)) - { - TInt dialogId = 0; - switch(iMessageType) - { - case EWarning: - dialogId = EAknDiskWarnignNote; - break; - case ECritical: - dialogId = EAknDiskFullNote; - break; - case ECriticalMMC: - dialogId = EAknMMCFullNote; - break; - default: - dialogId = EAknMMCWarningNote; - break; - } + + CHbDeviceMessageBoxSymbian* globalNote = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning); + CleanupStack::PushL(globalNote); + globalNote->SetTextL((iMessageInfo[iMessageType]->iMessage)->Des()); + globalNote->SetTimeoutL(0); + globalNote->ExecL(); + CleanupStack::PopAndDestroy(globalNote); - CAknSDData* sd = CAknSDData::NewL(KAknSecondaryDisplayCategory, dialogId, KNullDesC8); - iQuery->SetSecondaryDisplayData(sd); - - TInt noteid = iQuery->ShowNoteL(EAknGlobalWarningNote, - (iMessageInfo[iMessageType]->iMessage)->Des()); - - if (noteid != KErrNotFound) // Note was added to queue successfully. - { - iMessageInfo[iMessageType]->iNoteId = noteid; - } - } - iMessageType = ENone; TRACES("CLafShutdownManager::CGlobalQueryActive::DisplayL: End"); } @@ -877,11 +843,7 @@ break; } - if (cancelNoteId != KErrNotFound && aCancel) - { - iQuery->CancelNoteL(cancelNoteId); - } - } + } TRACES("CLafShutdownManager::CGlobalQueryActive::CleanupL: End"); } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/bwins/distribution.policy.s60 --- a/sysresmonitoring/oommonitor/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/bwins/oommonitorU.DEF --- a/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -13,4 +13,8 @@ ?SetMemoryMonitorTls@@YAXPAVCMemoryMonitor@@@Z @ 12 NONAME ; void SetMemoryMonitorTls(class CMemoryMonitor *) ?ThisAppIsNotExiting@ROomMonitorSession@@QAEXH@Z @ 13 NONAME ; void ROomMonitorSession::ThisAppIsNotExiting(int) ?WsSession@COomMonitorPlugin@@QAEAAVRWsSession@@XZ @ 14 NONAME ; class RWsSession & COomMonitorPlugin::WsSession(void) + ?FreeRam@COomMonitorPluginV2@@UAEXXZ @ 15 NONAME ; void COomMonitorPluginV2::FreeRam(void) + ?RequestOptionalRam@ROomMonitorSession@@QAEHHHHAAH@Z @ 16 NONAME ; int ROomMonitorSession::RequestOptionalRam(int, int, int, int &) + ?RequestOptionalRam@ROomMonitorSession@@QAEXHHHAAVTRequestStatus@@@Z @ 17 NONAME ; void ROomMonitorSession::RequestOptionalRam(int, int, int, class TRequestStatus &) + ?SetOomPriority@ROomMonitorSession@@QAEXW4TOomPriority@1@@Z @ 18 NONAME ; void ROomMonitorSession::SetOomPriority(enum ROomMonitorSession::TOomPriority) diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/data/oomconfig.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/data/oomconfig.xml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/distribution.policy.s60 --- a/sysresmonitoring/oommonitor/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/eabi/distribution.policy.s60 --- a/sysresmonitoring/oommonitor/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/eabi/oommonitorU.DEF --- a/sysresmonitoring/oommonitor/eabi/oommonitorU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/eabi/oommonitorU.DEF Thu Jun 24 13:52:58 2010 +0100 @@ -17,4 +17,10 @@ _ZN20CAppOomMonitorPlugin4NewLE4TUid @ 16 NONAME _ZTI17COomMonitorPlugin @ 17 NONAME ; ## _ZTV17COomMonitorPlugin @ 18 NONAME ; ## + _ZN18ROomMonitorSession18RequestOptionalRamEiiiRi @ 19 NONAME + _ZN19COomMonitorPluginV27FreeRamEv @ 20 NONAME + _ZTI19COomMonitorPluginV2 @ 21 NONAME ; ## + _ZTV19COomMonitorPluginV2 @ 22 NONAME ; ## + _ZN18ROomMonitorSession18RequestOptionalRamEiiiR14TRequestStatus @ 23 NONAME + _ZN18ROomMonitorSession14SetOomPriorityENS_12TOomPriorityE @ 24 NONAME diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/group/bld.inf --- a/sysresmonitoring/oommonitor/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -18,16 +18,15 @@ #include +PRJ_PLATFORMS +DEFAULT + PRJ_EXPORTS -../rom/oommonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(oommonitor.iby) +../rom/oommonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(oommonitor.iby) +../data/oomconfig.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/RELEASE/winscw/UREL/Z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml PRJ_MMPFILES - -#ifndef TOOLS - oommonitor.mmp - -#endif - -PRJ_TESTMMPFILES -// ../internal/oomtestplugin/oomtestplugin.mmp +oommonitorlib.mmp diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/group/distribution.policy.s60 --- a/sysresmonitoring/oommonitor/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/group/oommonitor.mmp --- a/sysresmonitoring/oommonitor/group/oommonitor.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/group/oommonitor.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -18,10 +18,22 @@ #include +//uncomment both of these macros to use the CLIENT_REQUEST_QUEUE +macro CLIENT_REQUEST_QUEUE +#define CLIENT_REQUEST_QUEUE + TARGET oommonitor.dll + TARGETTYPE dll UID 0x1000008D 0x10282DBF +NOEXPORTLIBRARY +#ifdef WINS +DEFFILE ../bwins/oommonitor.DEF +#else +DEFFILE ../eabi/oommonitor.DEF +#endif + CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT @@ -32,9 +44,38 @@ MW_LAYER_SYSTEMINCLUDE SOURCEPATH ../src +SOURCE oomIdletimerule.cpp +SOURCE oomaction.cpp +SOURCE oomactionconfig.cpp +SOURCE oomactionlist.cpp +SOURCE oomactionref.cpp +SOURCE oomappclosetimer.cpp +SOURCE oomappclosewatcher.cpp +SOURCE oomapplicationconfig.cpp +SOURCE oomcloseapp.cpp +SOURCE oomcloseappconfig.cpp +SOURCE oomconfig.cpp +SOURCE oomconfigparser.cpp +SOURCE oomforegroundrule.cpp +SOURCE oomglobalconfig.cpp +SOURCE oomlog.cpp +SOURCE oommemorymonitor.cpp +SOURCE oommemorymonitorserver.cpp +SOURCE oommemorymonitorsession.cpp +SOURCE oommonitor.cpp SOURCE oommonitorplugin.cpp SOURCE oommonitorsession.cpp -SOURCE oommonitor.cpp +SOURCE oomoutofmemorywatcher.cpp +SOURCE oompanic.cpp +SOURCE oompluginwaiter.cpp +SOURCE oomrunplugin.cpp +SOURCE oomrunpluginconfig.cpp +SOURCE oomsubscribehelper.cpp +SOURCE oomwindowgrouplist.cpp +SOURCE oomwserveventreceiver.cpp +#ifdef CLIENT_REQUEST_QUEUE +SOURCE oomclientrequestqueue.cpp +#endif LIBRARY euser.lib LIBRARY apparc.lib @@ -46,3 +87,8 @@ LIBRARY ecom.lib LIBRARY hal.lib LIBRARY efsrv.lib +LIBRARY xmlframework.lib +LIBRARY cone.lib +#ifdef _DEBUG +LIBRARY flogger.lib +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/group/oommonitorlib.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/group/oommonitorlib.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Project definition file +* +*/ + +TARGET oommonitor.lib +TARGETTYPE IMPLIB +UID 0x1000008D 0x10282DBF + +#ifdef WINS + DEFFILE ../bwins/oommonitor.DEF +#else + DEFFILE ../eabi/oommonitor.DEF +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/OomTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/OomTraces.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,487 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Includes some common defines used in the OOM monitor app. +* +*/ + + +#ifndef OOMTRACES_H +#define OOMTRACES_H + +#include "traceconfiguration.hrh" +#include "tracedefs.h" + +#ifdef TRACE_INTO_FILE +#include // RFileLogger +#else +#include // RDebug +#endif + +//----------------------------------------------------------------------------- +// Constants +//----------------------------------------------------------------------------- +// + +/** +* Prefix error trace +*/ +#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg ) + +/** +* Prefix info trace. +*/ +#define _PREFIX_INFO( aMsg ) _PREFIX_TRACE( "[INFO]: " L##aMsg ) + +/** +* Define needed directories if TRACE_INTO_FILE macro in use +*/ +#ifdef TRACE_INTO_FILE + + _LIT( KDir, "oommonitor2" ); + _LIT( KFile, "oommonitor2_log.txt" ); + _LIT( KFullPath, "c:\\logs\\oommonitor2\\" ); + +#endif + +//----------------------------------------------------------------------------- +// Error trace macros +//----------------------------------------------------------------------------- +// +#ifdef ERROR_TRACE + + /** + * Error trace definitions. + */ + #ifdef TRACE_INTO_FILE + + #define ERROR( aErr, aMsg )\ + {\ + if( aErr < KErrNone )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_ERROR( aMsg ), aErr );\ + }\ + } + #define ERROR_1( aErr, aMsg, aP1 )\ + {\ + if( aErr < KErrNone )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_ERROR( aMsg ), aErr, aP1 );\ + }\ + } + #define ERROR_2( aErr, aMsg, aP1, aP2 )\ + {\ + if( aErr < KErrNone )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\ + }\ + } + #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\ + {\ + if( aErr < KErrNone )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\ + }\ + } + + #else//TRACE_INTO_FILE not defined + + #define ERROR( aErr, aMsg )\ + {\ + if( aErr < KErrNone )\ + {\ + RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\ + }\ + } + #define ERROR_1( aErr, aMsg, aP1 )\ + {\ + if( aErr < KErrNone )\ + {\ + RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\ + }\ + } + #define ERROR_2( aErr, aMsg, aP1, aP2 )\ + {\ + if( aErr < KErrNone )\ + {\ + RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\ + }\ + } + #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\ + {\ + if( aErr < KErrNone )\ + {\ + RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\ + }\ + } + + #endif//TRACE_INTO_FILE + + #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg ) + #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 ) + #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 ) + #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 ) + + #define ERROR_PARAM(_p) _p + + #define TRAPD_ERR( aErr, aStmt ) TRAPD( aErr, aStmt ) + #define TRAP_ERR( aErr, aStmt ) TRAP( aErr, aStmt ) + + #define TRAP_AND_LEAVE(_s,_t) \ + { TRAPD(_e,_s); ERROR(_e,_t); User::LeaveIfError(_e); } + +#else//ERROR_TRACE not defined + + #define ERROR( aErr, aMsg ) + #define ERROR_1( aErr, aMsg, aP1 ) + #define ERROR_2( aErr, aMsg, aP1, aP2 ) + #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 ) + #define ERROR_GEN( aMsg ) + #define ERROR_GEN_1( aMsg, aP1 ) + #define ERROR_GEN_2( aMsg, aP1, aP2 ) + #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) + + #define ERROR_PARAM(_p) + + #define TRAPD_ERR( aErr, aStmt ) TRAP_IGNORE( aStmt ) + #define TRAP_ERR( aErr, aStmt ) TRAP_IGNORE( aStmt ) + + #define TRAP_AND_LEAVE(_s,_t) { _s; } + +#endif//ERROR_TRACE + +//----------------------------------------------------------------------------- +// Info trace macros +//----------------------------------------------------------------------------- +// +#ifdef INFO_TRACE + + /** + * Info log message definitions. + */ + #ifdef TRACE_INTO_FILE + + #define TRACES( aMsg )\ + {\ + RFileLogger::Write( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_INFO( aMsg ) );\ + } + #define TRACES1( aMsg, aP1 )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_INFO( aMsg ), aP1 );\ + } + #define TRACES2( aMsg, aP1, aP2 )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_INFO( aMsg ), aP1, aP2 );\ + } + #define TRACES3( aMsg, aP1, aP2, aP3 )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\ + } + #define TRACES4( aMsg, aP1, aP2, aP3, aP4 )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\ + } + #define TRACES5( aMsg, aP1, aP2, aP3, aP4, aP5 )\ + {\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \ + _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\ + } + + #else//TRACE_INTO_FILE not defined + + #define TRACES( aMsg )\ + {\ + RDebug::Print( _PREFIX_INFO( aMsg ) );\ + } + #define TRACES1( aMsg, aP1 )\ + {\ + RDebug::Print( _PREFIX_INFO( aMsg ), aP1 );\ + } + #define TRACES2( aMsg, aP1, aP2 )\ + {\ + RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2 );\ + } + #define TRACES3( aMsg, aP1, aP2, aP3 )\ + {\ + RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\ + } + #define TRACES4( aMsg, aP1, aP2, aP3, aP4 )\ + {\ + RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\ + } + #define TRACES5( aMsg, aP1, aP2, aP3, aP4, aP5 )\ + {\ + RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\ + } + + #endif//TRACE_INTO_FILE + + #define TRACES_PARAM( aParam ) aParam + +#else//INFO_TRACE not defined + + #define TRACES( aMsg ) + #define TRACES1( aMsg, aP1 ) + #define TRACES2( aMsg, aP1, aP2 ) + #define TRACES3( aMsg, aP1, aP2, aP3 ) + #define TRACES4( aMsg, aP1, aP2, aP3, aP4 ) + #define TRACES5( aMsg, aP1, aP2, aP3, aP4, aP5 ) + #define TRACES_PARAM( aParam ) + +#endif//INFO_TRACE + +//----------------------------------------------------------------------------- +// Trace current client thread name and process id +//----------------------------------------------------------------------------- +// +#ifdef CLIENT_TRACE + + #define CLIENT( aMessage )\ + {\ + RThread thread;\ + TInt err = aMessage.Client( thread );\ + if( err == KErrNone )\ + {\ + RProcess process;\ + err = thread.Process( process );\ + if( err == KErrNone )\ + {\ + TPtrC thredName( thread.Name() );\ + TUid processUid( process.SecureId() );\ + TRACES2( "Current client process UID: [%x], thread name: [%S]",\ + processUid,\ + &thredName );\ + }\ + process.Close();\ + }\ + thread.Close();\ + } + +#else + + #define CLIENT( aMessage ) + +#endif + +//----------------------------------------------------------------------------- +// Function trace macros +//----------------------------------------------------------------------------- +// +#ifdef FUNC_TRACE + + #include // TCleanupItem + + /** + * Function logging definitions. + */ + #ifdef TRACE_INTO_FILE + + #define FUNC( aMsg, aP1 )\ + {\ + TPtrC8 trace( _S8( aMsg ) );\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, trace, aP1 );\ + }\ + + #else//TRACE_INTO_FILE not defined + + #define FUNC( aMsg, aP1 )\ + {\ + RDebug::Printf( aMsg, aP1 );\ + }\ + + #endif//TRACE_INTO_FILE + + /** + * Function trace helper class. + * + * NOTE: + * LC -methods cannot be trapped. Therefore if LC -method leaves + * END trace is used instead of LEAVE trace. + * If you have an idea how to round this problem please tell. + */ + _LIT8( KFuncNameTerminator, "(" ); + _LIT8( KFuncLeavePatternL, "L" ); + class TFuncLog + { + public: + static void Cleanup( TAny* aPtr ) + { + TFuncLog* self = static_cast< TFuncLog* >( aPtr ); + self->iLeft = ETrue; + FUNC( _PREFIX_CHAR("%S-LEAVE"), &self->iFunc ); // Leave detected + } + inline TFuncLog( const char* aFunc ) : + iFunc( aFunc ? _S8( aFunc ) : _S8("") ), + iLeft( EFalse ), + iCleanupItem( Cleanup, this ), + iCanLeave( EFalse ) + { + TInt pos( iFunc.Find( KFuncNameTerminator ) ); + if( pos != KErrNotFound ) + { + iFunc.Set( iFunc.Left( pos ) ); + iCanLeave = !iFunc.Right( + KFuncLeavePatternL().Length() ).Compare( KFuncLeavePatternL ); + if ( iCanLeave ) + { + CleanupStack::PushL( iCleanupItem ); // Ignore warnings + } + } + FUNC( _PREFIX_CHAR("%S-START"), &iFunc ); + } + + inline ~TFuncLog() + { + if ( !iLeft ) + { + if ( iCanLeave ) + { + CleanupStack::Pop( this ); // Pop the cleanup item + } + FUNC( _PREFIX_CHAR("%S-END"), &iFunc ); // Normally finished + } + } + + private: // Data + TPtrC8 iFunc; + TBool iLeft; + TCleanupItem iCleanupItem; + TBool iCanLeave; + }; + #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__ ); + +#else//FUNC_TRACE not defined + + #define FUNC_LOG + +#endif//FUNC_TRACE + +//----------------------------------------------------------------------------- +// Timestamp trace macros +//----------------------------------------------------------------------------- +// +#ifdef TIMESTAMP_TRACE + + #define PREFIX_TIMESTAMP( aCaption ) _PREFIX_TRACE_2("[TIMESTAMP] (%d:%02d:%02d.%06d us) ",aCaption) + #define CURRENT_TIME( aDt ) TDateTime aDt; { TTime t; t.HomeTime(); aDt = t.DateTime(); } + #define EXTRACT_TIME( aDt ) aDt.Hour(), aDt.Minute(), aDt.Second(), aDt.MicroSecond() + + #ifdef TRACE_INTO_FILE + + #define TIMESTAMP( aCaption )\ + {\ + CURRENT_TIME( dt );\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\ + PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ) );\ + } + + #define TIMESTAMP_1( aCaption, aP1 )\ + {\ + CURRENT_TIME( dt );\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\ + PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1 );\ + } + + #define TIMESTAMP_2( aCaption, aP1, aP2 )\ + {\ + CURRENT_TIME( dt );\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\ + PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2 );\ + } + + #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 )\ + {\ + CURRENT_TIME( dt );\ + RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\ + PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2,aP3 );\ + } + + #else//TRACE_INTO_FILE not defined + + #define TIMESTAMP( aCaption )\ + {\ + CURRENT_TIME( dt );\ + RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ) );\ + } + + #define TIMESTAMP_1( aCaption, aP1 )\ + {\ + CURRENT_TIME( dt );\ + RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1 );\ + } + + #define TIMESTAMP_2( aCaption, aP1, aP2 )\ + {\ + CURRENT_TIME( dt );\ + RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2 );\ + } + + #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 )\ + {\ + CURRENT_TIME( dt );\ + RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2,aP3 );\ + } + + #endif//TRACE_INTO_FILE + +#else//TIMESTAMP_TRACE not defined + + #define TIMESTAMP( aCaption ) + #define TIMESTAMP_1( aCaption, aP1 ) + #define TIMESTAMP_2( aCaption, aP1, aP2 ) + #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 ) + +#endif//TIMESTAMP_TRACE + +#ifdef _DEBUG + + #include // RDebug + + static void Panic( const TDesC8& aFileName, const TInt aLineNum ) + { + TPath name; + name.Copy( aFileName ); + RDebug::Print( _L( "Assertion failed in file=%S, line=%d" ), &name, aLineNum ); + User::Invariant(); + } + + #define ASSERT_ALWAYS_TRACE Panic( _L8(__FILE__), __LINE__ ); + #define ASSERT_TRACE( _s ) if ( !( _s ) ) { ASSERT_ALWAYS_TRACE; } + +#else // _DEBUG + + #define ASSERT_ALWAYS_TRACE + #define ASSERT_TRACE( _s ) + +#endif // _DEBUG + +#define TRACE_MATRIX( aMsg, aMatrix ) \ + TRACES( aMsg ); \ + TRACES( "------------------------------------------------" ); \ + TRACES3( " [%f %f %f]", (TReal)(aMatrix)[0], (TReal)(aMatrix)[1], (TReal)(aMatrix)[2] ); \ + TRACES3( "Matrix [%f %f %f]", (TReal)(aMatrix)[3], (TReal)(aMatrix)[4], (TReal)(aMatrix)[5] ); \ + TRACES3( " [%f %f %f]", (TReal)(aMatrix)[6], (TReal)(aMatrix)[7], (TReal)(aMatrix)[8] ); \ + TRACES( "------------------------------------------------" ); + +#endif // OOMTRACES_H + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/distribution.policy.s60 --- a/sysresmonitoring/oommonitor/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomaction.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomaction.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,81 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMACTION_H_ +#define OOMACTION_H_ + +#include + +class MOomActionObserver; + +/* + * The base class for all OOM actions (i.e. close application or run OOM plug-in). + * + * A base class is used because both types of action have common aspects, specifically: + * - They are prioritised according to application idle time + * - They need to be prioritised against each other + * - For each action it is possible to either continue immediately or to wait for completion + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomAction) : public CBase + { +public: + + virtual ~COomAction(); + + /** + * Activate the OOM action + * + * @since S60 5.0 + * @param aBytesRequested ?description + */ + virtual void FreeMemory(TInt aBytesRequested, TBool aIsDataPaged) = 0; + + /** + * @since S60 5.0 + * @return ETrue if the action is currently freeing memory, else EFalse + */ + virtual TBool IsRunning() = 0; + +protected: + // + /** + * To be called by the derived class after the memory has been freed (or if it fails) + * + * @since S60 5.0 + * @param aError KErrNone if memory has successfully been freed, otherwise any system wide error code + */ + void MemoryFreed(TInt aError); + + COomAction(MOomActionObserver& aStateChangeObserver); + +private: //data + + enum TOomActionState + { + EOomIdle, + EOomFreeingMemory + }; + TOomActionState iState; + + MOomActionObserver& iStateChangeObserver; + }; + +#endif /*OOMACTION_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomactionconfig.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomactionconfig.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,82 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMACTIONCONFIG_ +#define OOMACTIONCONFIG_ + +#include +#include +#include + +class MOomRuleConfig; +class COomWindowGroupList; + +enum TOomSyncMode + { + EContinue, // Continue with the next action regardless of anything else (exluding max_batch_size) + EEstimate, // Continue with the next action if we estimate that we need to free more memory + ECheckRam, // Wait for this action to complete, then check the free RAM before continuing + EContinueIgnoreMaxBatchSize // Continue with the next action regardless of anything else (including max_batch_size) + }; + +/* + * The base class for the configuration of all OOM actions + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomActionConfig) : public CBase + { +public: + // Add a rule + // This class takes ownership of the given rule + void AddRuleL(MOomRuleConfig* aRule); // Add the configuration for a rule (e.g. an idle time rule) + + virtual ~COomActionConfig(); + + // Set the priority of this action + // This priority will be applied if none of the attached rules can be applied + inline void SetDefaultPriority(TUint aPriority); + +protected: + + // Return the priority for this action for the idle time of the target app + TUint Priority(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const; + + void ConstructL(); + + COomActionConfig(TInt32 aId); + +public: + + TOomSyncMode iSyncMode; + + TInt iRamEstimate; // The estimated RAM saving after performing this action + + TInt32 iId; // The ID of the affected component (e.g. an application ID for app closure, or a plugin ID for a plugin event) + + TUint iDefaultPriority; + +protected: + + RPointerArray iRules; + }; + +#include "oomactionconfig.inl" + +#endif /*OOMACTIONCONFIG_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomactionconfig.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomactionconfig.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,30 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMACTIONCONFIGINL_H_ +#define OOMACTIONCONFIGINL_H_ + +// Set the priority of this action +// This priority will be applied if none of the attached rules can be applied +inline void COomActionConfig::SetDefaultPriority(TUint aPriority) + { + iDefaultPriority = aPriority; + } + + +#endif /*OOMACTIONCONFIGINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomactionlist.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomactionlist.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,240 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMACTIONLIST_H_ +#define OOMACTIONLIST_H_ + +#include +#include + +#include "oommonitorplugin.h" + +class COomWindowGroupList; +class CMemoryMonitorServer; +class COomCloseApp; +class TActionRef; +class COomRunPlugin; +class COomConfig; + +/* + * Interface for reporting a change of state in an OOM action + * e.g. that the action has changed from a freeing-memory state to an idle state + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +class MOomActionObserver + { +public: + virtual void StateChanged() = 0; + }; + + +template +/** + * A class for getting instances of all of the OOM ECom plugins + * This class is templated because we actually need two types of list + * One list for V1 plugins + * One list for V2 plugins + * The functionality of each list is nearly identical, hence the templated class + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomPluginList) : public CBase + { +public: + + /** + * Two-phased constructor. + * @param aInterfaceUid The interface of the plugin (either V1 or V2) depending on the templated type + */ + static COomPluginList* NewL(TInt aInterfaceUid); + inline TInt Count(); + inline T& Implementation(TInt aIndex); + inline TInt32 Uid(TInt aIndex); + + ~COomPluginList(); + +private: + COomPluginList(); + void ConstructL(TInt aInterfaceUid); + +private: // data + + struct TPlugin + { + TPlugin(); + T* iImpl; + TUid iDtorUid; + TInt32 iUid; + }; + + RArray iPlugins; + }; + +/* + * The list of possible OOM actions to be run. + * + * This class is responsible for identifying the best action(s) to execute at a given time. + * This decision is based on the properties of each action and idle time of the target apps. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomActionList) : public CBase, public MOomActionObserver + { +public: + + /** + * Two-phased constructor. + * @param aMonitor the owning Memory Monitor + * @param aServer + * @param aWs a handle to a window server session, opened by the Memory Monitor + * @param aConfig + */ + static COomActionList* NewL(CMemoryMonitor& aMonitor, CMemoryMonitorServer& aServer, RWsSession& aWs, COomConfig& aConfig); + + ~COomActionList(); + + /** + * Creates a list of actions based on the contents of the config and the current window group list + * Any old actions will be replaced. + * + * @since S60 5.0 + * @param aWindowGroupList + * @param aConfig + */ + void BuildActionListL(COomWindowGroupList& aWindowGroupList, COomConfig& aConfig); + + template + void BuildPluginActionsL(COomPluginList& aPluginList, COomWindowGroupList& aWindowGroupList, COomConfig& aConfig, TInt& aActionsIndex); + + /** + * Execute the OOM actions according to their priority + * Actions are run in batches according to their sync mode + * + * @since S60 5.0 + * @param aMaxPriority The maximum priority of actions to run + */ + void FreeMemory(TInt aMaxPriority); + + /** + * Sets the target; the maximum prioirity up to which actions are run when an OomMonitor event + * occurs + * + * @since S60 5.0 + * @param aCurrentRamTarget the desired amount of free unpaged memory + * @param aCurrentSwapTarget the desired amount of free paged memory + */ + inline void SetCurrentTargets(TUint aCurrentRamTarget, TUint aCurrentSwapTarget); + + /** + * Switch all plugins to Off (Memory Good) state + * Should be called when the memory situation is good, i.e. the actions run have released enough memory + * so that the device is above the current target. + * It is also always called after an optional RAM request has been processed, even if insufficient + * memory could be freed to successfully complete the request. + * + * @since S60 5.0 + */ + void SwitchOffPlugins(); + + /** + * Compares priorites of two actions, hard-coded rules are used to determine the order + * of actions with equal priority: + * - application plugins are run in preference to system plugins + * - appliction plugins where the target app is not running are run first + * - Z order of the target app determines order of the rest of the application plugins (furthest back first) + * - system plugins are run before app close actions + * - Z order determines the prioirty of app close actions (furthest back first) + * + * @since S60 5.0 + */ + static TInt ComparePriorities(const TActionRef& aPos1, const TActionRef& aPos2 ); + + /** + * A callback from the UI framework that an applications has failed to respond to the close event. + * Allows us to cleanup the related app close action object and move on the next available action. + * + * @since S60 5.0 + * @param aWgId the window group ID of the application that has not closed. + */ + void AppNotExiting(TInt aWgId); + +// from MOomActionObserver + + /** + * + * from MOomActionObserver + * + * An action has changed state (possibly it has completed freeing memory) + */ + void StateChanged(); + +private: + + COomActionList(CMemoryMonitor& aMonitor, CMemoryMonitorServer& aServer, RWsSession& aWs); + + void ConstructL(COomConfig& aConfig); + +private: //data + + RWsSession& iWs; + + RPointerArray iCloseAppActions; + RPointerArray iRunPluginActions; + RArray iActionRefs; + + TInt iCurrentActionIndex; + + TUint iCurrentRamTarget; + TBool iSwapUsageMonitored; + TUint iCurrentSwapTarget; + + /* + * Flag specifying that a OomMonitor event is in progress. + */ + TBool iFreeingMemory; + + CMemoryMonitor& iMonitor; + + /** + * The list of V1 plugins + * Own + */ + COomPluginList* iPluginList; + + /** + * The list of V2 plugins + * Own + */ + COomPluginList* iPluginListV2; + + /** + * The maximum priority of actions that should be run by an OomMonitor Event + */ + TInt iMaxPriority; + + CMemoryMonitorServer& iServer; + + }; + +#include "oomactionlist.inl" + +#endif /*OOMACTIONLIST_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomactionlist.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomactionlist.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,47 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMACTIONLISTINL_H_ +#define OOMACTIONLISTINL_H_ + +template +inline TInt COomPluginList::Count() + { + return iPlugins.Count(); + } + +template +inline T& COomPluginList::Implementation(TInt aIndex) + { + return *(iPlugins[aIndex].iImpl); + } + +template +inline TInt32 COomPluginList::Uid(TInt aIndex) + { + return iPlugins[aIndex].iUid; + } + +inline void COomActionList::SetCurrentTargets(TUint aCurrentRamTarget, TUint aCurrentSwapTarget) + { + iCurrentRamTarget = aCurrentRamTarget; + iCurrentSwapTarget = aCurrentSwapTarget; + } + + +#endif /*OOMACTIONLISTINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomactionref.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomactionref.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,73 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMACTIONREF_H_ +#define OOMACTIONREF_H_ + +#include +#include "oomactionconfig.h" + +class COomRunPlugin; + +/** + * Encapsulates a reference to an action. + * + * Objects of this T-class are instantiated at memory freeing time in preference to the + * COomAction derived objects, so that we do not instantiate anything on the heap at a time + * when the device is, by-definition, low on memory. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +class TActionRef + { +public: + + enum TActionType + { + EAppPlugin, + ESystemPlugin, + EAppClose + }; + + //constructor for Plugin actions + TActionRef(TActionType aType, TInt aPriority, TOomSyncMode aSyncMode, TInt aRamEstimate, COomRunPlugin& aRunPlugin, TUint aWgIndexOfTargetApp); + + //constructor for AppClose actions + TActionRef(TActionType aType, TInt aPriority, TOomSyncMode aSyncMode, TInt aRamEstimate, TInt aWgId, TUint aWgIndex); + + TActionType Type() const; + TUint Priority() const; + TOomSyncMode SyncMode() const; + TInt RamEstimate() const; + TInt WgId() const; + TInt WgIndex() const; + COomRunPlugin& RunPlugin(); + +private: //data + + TActionType iType; + TUint iPriority; + TOomSyncMode iSyncMode; //needed as we don't have reference to the config + TInt iRamEstimate; //needed as we don't have reference to the config + TInt iWgId; //For AppClose + TInt iWgIndex; + COomRunPlugin* iRunPlugin; //For Plugins. Not owned + }; + +#endif /*OOMACTIONREF_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomappclosetimer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomappclosetimer.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,53 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Timer class which implements a timeout for an application close action. +* +*/ + + +#ifndef OOMAPPCLOSETIMER_H_ +#define OOMAPPCLOSETIMER_H_ + +#include + +class COomCloseApp; + +/** + * A simple timer class which implements a timeout for an application close action. + * + * If the application has not been closed within the period this timer is started with, + * then we complete the action as if he had been successful, allowing us to move on to the + * action or set of actions. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomAppCloseTimer) : public CTimer + { +public: + static COomAppCloseTimer* NewL(COomCloseApp& aMonitor); +private: + COomAppCloseTimer(COomCloseApp& aMonitor); + void RunL(); + +private: //data + + /** + * A reference to the owning close app action + */ + COomCloseApp& iMonitor; + + }; + +#endif /*OOMAPPCLOSETIMER_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomappclosewatcher.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomappclosewatcher.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,64 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: An active object which watches for app close actions successfully completing. +* +*/ + + +#ifndef OOMAPPCLOSEWATCHER_H_ +#define OOMAPPCLOSEWATCHER_H_ + +#include + +class COomCloseApp; +class TApaTask; + +/** + * This class implements an active object which watches for app close actions successfully completing. + * + * This watcher object logs-on to the thread of the application being closed and completes + * the app close action when the thread dies. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomAppCloseWatcher) : public CActive + { +public: + COomAppCloseWatcher(COomCloseApp& aMonitor); + ~COomAppCloseWatcher(); + void Start(const TApaTask& aTask); +private: + void DoCancel(); + void RunL(); + +private: //data + + /** + * A reference to the owning close app action + */ + COomCloseApp& iMonitor; + + /** + * A handle to the main thread of the application to be closed. + */ + RThread iThread; + + /** + * A backup of the orginal priority of the application's process + */ + TProcessPriority iOriginalProcessPriority; + }; + +#endif /*OOMAPPCLOSEWATCHER_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomapplicationconfig.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomapplicationconfig.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,92 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMAPPLICATIONCONFIG_ +#define OOMAPPLICATIONCONFIG_ + +#include + +class COomCloseAppConfig; +class MOomRuleConfig; + +/* + * A list of action configurations for a particular target application. + * + * All configured actions in this list must be for the same target application. + * Actions may be configured to close the application or to run an OOM plugin. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomApplicationConfig) : public CBase + { +public: + + /** + * Two-phased constructor + * @param aApplicationId the UID of the application + */ + static COomApplicationConfig* NewL(TUint aApplicationId); + +// Functions for getting configuration + + /** + * Return a pointer to the close app config, this may be NULL if no app close config has been configured + * Ownership is NOT passed to the caller + */ + inline COomCloseAppConfig* GetAppCloseConfig(); + + inline TUint Id(); + +// Functions for setting configuration + + inline void SetAppCloseConfig(COomCloseAppConfig* aActionConfig); + + /** + * Add a rule + * + * This class takes ownership of the given rule + * The rule would will apply to the "application close" event + */ + void AddRuleL(MOomRuleConfig* aRule); + + ~COomApplicationConfig(); + +public: + + TUint iGoodRamThreshold; + TUint iLowRamThreshold; + TUint iGoodSwapThreshold; + TUint iLowSwapThreshold; + +private: + + void ConstructL(); + + COomApplicationConfig(TUint aApplicationId); + + COomCloseAppConfig* iCloseAppConfig; + + TInt iIndex; + + TUint iApplicationId; + }; + +#include "oomapplicationconfig.inl" + +#endif /*OOMAPPLICATIONCONFIG_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomapplicationconfig.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomapplicationconfig.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,42 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMAPPLICATIONCONFIGINL_H_ +#define OOMAPPLICATIONCONFIGINL_H_ + +#include "oompanic.h" + +inline COomCloseAppConfig* COomApplicationConfig::GetAppCloseConfig() + { + return iCloseAppConfig; + } + +inline void COomApplicationConfig::SetAppCloseConfig(COomCloseAppConfig* aActionConfig) + { + __ASSERT_ALWAYS(iCloseAppConfig == NULL, OomMonitorPanic(KSameAppClosureConfiguredTwice)); + + iCloseAppConfig = aActionConfig; + } + + +inline TUint COomApplicationConfig::Id() + { + return iApplicationId; + } + +#endif /*OOMAPPLICATIONCONFIGINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomclientrequestqueue.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomclientrequestqueue.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,134 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: COomClientRequestQueue.cpp. +* +*/ + + +#ifndef COOMCLIENTREQUESTQUEUE_H +#define COOMCLIENTREQUESTQUEUE_H + +#include +#include +#include + +#include "oommemorymonitor.h" + +class COomClientRequestQueue; +class CMemoryMonitor; +class CSubscribeHelper; + +class TClientRequest + { +public: + TClientRequest(TActionTriggerType aClientRequestType, TInt aBytesRequested); + TClientRequest(TActionTriggerType aClientRequestType, const RMessage2& aRequestFreeRam); +public: + TActionTriggerType iClientRequestType; + TInt iBytesRequested; + RMessage2 iRequestFreeRamMessage; + TSglQueLink iLink; + }; + +/* + * If two client requests are queued, the COomClientRequestTimer is used to wait after the first request + * has been completed, to allow the first client time to allocate the memory it requested. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomClientRequestTimer) : public CTimer + { +public: + static COomClientRequestTimer* NewL(COomClientRequestQueue& aQueue); +private: + COomClientRequestTimer(COomClientRequestQueue& aQueue); + void RunL(); + +private: //data + COomClientRequestQueue& iClientRequestQueue; + }; + +/** + * Queues client requests so that the actual RAM level of the device is in a state where it can be more + * accurately determined whether more actions need to be run + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomClientRequestQueue) : public CBase + { +public: + + // Constructors and destructor + + /** + * Destructor. + */ + ~COomClientRequestQueue(); + + /** + * Two-phased constructor. + */ + static COomClientRequestQueue* NewL(CMemoryMonitor& aMonitor); + + CMemoryMonitor& Monitor(); + + void RequestFreeMemoryL(const RMessage2& aMessage); + void RequestOptionalRamL(const RMessage2& aMessage); + void ActionsCompleted(TInt aBytesFree, TBool aMemoryGood); + void RequestTimerCallbackL(); + +private: + + /** + * Constructor for performing 1st stage construction + */ + COomClientRequestQueue(CMemoryMonitor& aMonitor); + + /** + * EPOC default constructor for performing 2nd stage construction + */ + void ConstructL(); + + static TInt WatchdogStatusStatusChanged(TAny* aPtr); + void HandleWatchdogStatusCallBack(); + void AddClientRequestL(TClientRequest& request); + void StartClientRequestL(); + + // parameters for P&S watcher. + + /** + * The handle to the P&S property that can be used to initiate OOM Monitor actions + */ + RProperty iWatchdogStatusProperty; + + /** + * The active object which monitors the P&S property that can be used to initiate OOM Monitor actions + * Own. + */ + CSubscribeHelper* iWatchdogStatusSubscriber; + + TSglQue iQueue; + + TBool iClientRequestActive; + + CMemoryMonitor& iMonitor; + + COomClientRequestTimer* iClientRequestTimer; + + TTime iLastClientCompletedTime; + }; + +#endif // COOMCLIENTREQUESTQUEUE_H diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomcloseapp.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomcloseapp.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,100 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMCLOSEAPP_H_ +#define OOMCLOSEAPP_H_ + + +#include + +#include "oomaction.h" + +class COomAppCloseTimer; +class COomAppCloseWatcher; +class TApaTask; +class TActionRef; + +/* + * The OOM action of closing an application in order to free up memory. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomCloseApp) : public COomAction + { +public: + /** + * Two-phased constructor. + * @param aStateChangeObserver an observer to the state of the application + * @param aWs a connected handle to a window server session + */ + static COomCloseApp* NewL(MOomActionObserver& aStateChangeObserver, RWsSession& aWs); + + //from COomAction + + /** + * Close the application in order to free memory + * Call the COomAction::MemoryFreed when it is done + * @param aBytesRequested not used for clsoe app actions + */ + virtual void FreeMemory(TInt aBytesRequested, TBool aIsDataPaged); + + ~COomCloseApp(); + + /** + * Callback from COomAppCloseWatcher and COomAppCloseTimer + */ + void CloseAppEvent(); + + inline TBool IsRunning(); + + /** + * Configure, or reconfigure the COomCloseApp object + * Action objects are reused to minimize any memory allocation when memory is low + */ + void Reconfigure(const TActionRef& aRef); + + inline TUint WgId() const; + +private: + + COomCloseApp(MOomActionObserver& aStateChangeObserver, RWsSession& aWs); + + void ConstructL(); + + TUint iWgId; + + TBool iAppCloserRunning; + TApaTask iCurrentTask; + + /** + * A timeout for an app close action + * Own + */ + COomAppCloseTimer* iAppCloseTimer; + + /** + * A watcher for the application closing + * Own + */ + COomAppCloseWatcher* iAppCloseWatcher; + }; + +#include "oomcloseapp.inl" + +#endif /*OOMCLOSEAPP_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomcloseapp.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomcloseapp.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMCLOSEAPPINL_H_ +#define OOMCLOSEAPPINL_H_ + +inline TBool COomCloseApp::IsRunning() + { + return iAppCloserRunning; + } + +inline TUint COomCloseApp::WgId() const + { + return iWgId; + } + +#endif /*OOMCLOSEAPPINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomcloseappconfig.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomcloseappconfig.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,59 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMCLOSEAPPCONFIG_ +#define OOMCLOSEAPPCONFIG_ + +#include "oomactionconfig.h" + +/* + * + */ +/** + * The OOM action of closing an application in order to free up memory. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomCloseAppConfig) : public COomActionConfig + { +public: + /** + * Two-phased constructor. + * @param aId The Uid of the applicaton + */ + static COomCloseAppConfig* NewL(TInt32 aId); + + ~COomCloseAppConfig(); + + /** + * Calculates the priority of a close app action, based on its position on the window group list + * + * @param aWindowGroupList a fully constructed, collapsed window group list + * @param aAppIndexInWindowGroup the position in the window group list + */ + inline TUint CalculateCloseAppPriority(const COomWindowGroupList& aWindowGroupList, TUint aAppIndexInWindowGroup); + +private: + + COomCloseAppConfig(TInt32 aId); + }; + +#include "oomcloseappconfig.inl" + +#endif /*OOMCLOSEAPPCONFIG_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomcloseappconfig.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomcloseappconfig.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMCLOSEAPPCONFIGINL_H_ +#define OOMCLOSEAPPCONFIGINL_H_ + +inline TUint COomCloseAppConfig::CalculateCloseAppPriority(const COomWindowGroupList& aWindowGroupList, TUint aAppIndexInWindowGroup) + { + // Calculating the priority for application closures is simple, we just get the base class to apply the rules + return Priority(aWindowGroupList, aAppIndexInWindowGroup); + } + +#endif /*OOMCLOSEAPPCONFIGINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomconfig.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomconfig.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,105 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMCONFIG_ +#define OOMCONFIG_ + +#include + +#include "oomglobalconfig.h" + +class COomCloseAppConfig; +class COomRunPluginConfig; +class MOomRuleConfig; +class COomApplicationConfig; + +/* + * A class representing the entire configuration. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomConfig) : public CBase + { +public: + + static COomConfig* NewL(); + +// Functions for setting configuration + + // Add the configuration for an application closure. + // This class takes ownership of this configuration object. + void SetAppCloseConfigL(COomCloseAppConfig* aActionConfig); + + // Add the configuration for a plugin action. + // This class takes ownership of the configuration object. + void AddPluginConfigL(COomRunPluginConfig* aPluginConfig); + + // Add a rule for an application + // This class takes ownership of the given rule + // This rule applies to the specified application (and not a plugin associated with this application) + // The rule would usually apply to an "application close" event + void AddApplicationRuleL(TUint aTargetAppId, MOomRuleConfig* aRule); + + // Add a rule for a plugin + // This class takes ownership of the given rule + // This rule is applied to the plugin with the specified ID + void AddPluginRuleL(TUint aPluginId, MOomRuleConfig* aRule); + + // Add this application config - this class takes ownership of it + // Application config includes settings for a particular application, e.g. whether or not it can be closed + void AddApplicationConfigL(COomApplicationConfig* aApplicationConfig); + +// Functions for getting configuration + + // Get the application configuration for the given app id + // If no specific actions have been configured for this application then the default application configuration is returned + COomApplicationConfig& GetApplicationConfig(TInt32 aAppId); + + // Get the plugin configuration for the given plugin id + // If no specific actions have been configured for this plugin then the default plugin configuration is returned + COomRunPluginConfig& GetPluginConfig(TInt32 aPluginId); + +// Functions for setting global configuration + + ~COomConfig(); + + inline COomGlobalConfig& GlobalConfig(); + + inline void SetDefaultLowRamThreshold(TInt aLowRamThreshold); + inline void SetDefaultGoodRamThreshold(TInt aGoodRamThreshold); + inline void SetSwapUsageMonitored(TBool aMonitored); + inline void SetDefaultLowSwapThreshold(TInt aLowSwapThreshold); + inline void SetDefaultGoodSwapThreshold(TInt aGoodSwapThreshold); + inline void SetMaxCloseAppBatch(TUint MaxCloseAppBatch); + inline void SetDefaultWaitAfterPlugin(TInt aMilliseconds); + inline void SetMaxAppExitTime(TInt aMilliseconds); + +private: + void ConstructL(); + + RHashMap iApplicationToConfigMapping; // A hash-map of application configs, keyed on the application ID + + RHashMap iPluginToConfigMapping; // A hash-map of plug-in configs, keyed on the plugin ID + + COomGlobalConfig iGlobalConfig; + }; + +#include "oomconfig.inl" + +#endif /*OOMCONFIG_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomconfig.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomconfig.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,66 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMCONFIGINL_H_ +#define OOMCONFIGINL_H_ + +inline COomGlobalConfig& COomConfig::GlobalConfig() + { + return iGlobalConfig; + } + +void COomConfig::SetDefaultLowRamThreshold(TInt aLowRamThreshold) + { + iGlobalConfig.iLowRamThreshold = aLowRamThreshold; + } + +void COomConfig::SetDefaultGoodRamThreshold(TInt aGoodRamThreshold) + { + iGlobalConfig.iGoodRamThreshold = aGoodRamThreshold; + } + +void COomConfig::SetSwapUsageMonitored(TBool aMonitored) + { + iGlobalConfig.iSwapUsageMonitored = aMonitored; + } + +void COomConfig::SetDefaultLowSwapThreshold(TInt aLowSwapThreshold) + { + iGlobalConfig.iLowSwapThreshold = aLowSwapThreshold; + } + +void COomConfig::SetDefaultGoodSwapThreshold(TInt aGoodSwapThreshold) + { + iGlobalConfig.iGoodSwapThreshold = aGoodSwapThreshold; + } + +void COomConfig::SetMaxCloseAppBatch(TUint aMaxCloseAppBatch) + { + iGlobalConfig.iMaxCloseAppBatch = aMaxCloseAppBatch; + } +void COomConfig::SetDefaultWaitAfterPlugin(TInt aMilliseconds) + { + iGlobalConfig.iDefaultWaitAfterPlugin = aMilliseconds; + } + +void COomConfig::SetMaxAppExitTime(TInt aMilliseconds) + { + iGlobalConfig.iMaxAppExitTime = aMilliseconds; + } + +#endif /*OOMCONFIGINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomconfigparser.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomconfigparser.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,123 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: The parser for the OOM configuration file. +* +*/ + + +#ifndef OOMCONFIGPARSER_H_ +#define OOMCONFIGPARSER_H_ + +#include + +using namespace Xml; + +class COomConfig; +class COomRunPluginConfig; + +/** + * Parser for the Oom Monitor configuration file + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomConfigParser) : public CBase, public MContentHandler + { +public: + COomConfigParser(COomConfig& aConfig, RFs& aFs); + + void ParseL(); + + + // From MContent handler + virtual void OnStartDocumentL(const RDocumentParameters& aDocParam, TInt aErrorCode); + virtual void OnEndDocumentL(TInt aErrorCode); + virtual void OnStartElementL(const RTagInfo& aElement, const RAttributeArray& aAttributes, + TInt aErrorCode); + virtual void OnEndElementL(const RTagInfo& aElement, TInt aErrorCode); + virtual void OnContentL(const TDesC8& aBytes, TInt aErrorCode); + virtual void OnStartPrefixMappingL(const RString& aPrefix, const RString& aUri, + TInt aErrorCode); + virtual void OnEndPrefixMappingL(const RString& aPrefix, TInt aErrorCode); + virtual void OnIgnorableWhiteSpaceL(const TDesC8& aBytes, TInt aErrorCode); + virtual void OnSkippedEntityL(const RString& aName, TInt aErrorCode); + virtual void OnProcessingInstructionL(const TDesC8& aTarget, const TDesC8& aData, + TInt aErrorCode); + virtual void OnError(TInt aErrorCode); + virtual TAny* GetExtendedInterface(const TInt32 aUid); + + + +private: + + void ConfigError(TInt aError); + + + + void StartElementL(const TDesC8& aLocalName, + const RAttributeArray& aAttributes); + + void SetGlobalSettings(const RAttributeArray& aAttributes); + void SetForceCheckConfigL(const RAttributeArray& aAttributes); + void SetAppConfigL(const RAttributeArray& aAttributes); + void SetCloseAppConfigL(const RAttributeArray& aAttributes); + void SetAppCloseIdlePriorityConfigL(const RAttributeArray& aAttributes); + void SetForegroundAppPriorityL(const RAttributeArray& aAttributes); + + void SetSystemPluginConfigL(const RAttributeArray& aAttributes); + void SetAppPluginConfigL(const RAttributeArray& aAttributes); + void SetPluginIdlePriorityL(const RAttributeArray& aAttributes); + void SetPluginForegroundAppPriorityL(const RAttributeArray& aAttributes); + + TInt GetValueFromAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TPtrC8& aValue); + TInt GetValueFromHexAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TUint& aValue); + TInt GetValueFromDecimalAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TUint& aValue); + TInt GetValueFromDecimalAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TInt& aValue); + TInt GetValueFromBooleanAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TBool& aValue); + + void SetPluginSyncMode(const RAttributeArray& aAttributes, COomRunPluginConfig& aRunPluginConfig); + + enum TOomParsingState + { + EOomParsingStateNone, + EOomParsingStateRoot, + EOomParsingStateGlobalSettings, + EOomParsingStateAppSettings, + EOomParsingStateAppCloseSettings, + EOomParsingStateSystemPluginSettings, + EOomParsingStateAppPluginSettings + }; + + // Check that the current state is as expected + // If not then the specified config error is generated + void CheckState(TOomParsingState aExpectedState, TInt aError); + + // Check that the current state is as expected + // If not then the specified config error is generated + // This version checks to ensure that the current state matches either of the passed in states + void CheckState(TOomParsingState aExpectedState1, TOomParsingState aExpectedState2, TInt aError); + + COomConfig& iConfig; + + RFs& iFs; + + void ChangeState(TOomParsingState aState); + + TOomParsingState iState; + + TUint iParentUid; + TUint iParentTargetApp; + }; + +#endif /*OOMCONFIGPARSER_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomconstants.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomconstants.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,39 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Out of Memory Monitor Constants. +* +*/ + + +#ifndef OOMCONSTANTS_HRH_ +#define OOMCONSTANTS_HRH_ + +const TInt KAppNotInWindowGroupList = -1; + +const TInt KOomDefaultAppId = 0; +const TInt KOomDefaultPluginId = 0; +const TInt KOomThresholdUnset = 0; + +const TInt KOomBusyAppId = 0x10286A84; +const TInt KOomHighPriorityAppId = 0x10286A85; + +const TInt KOomPriorityInfinate = 1024; + +// same as Akncapserver since fast swap is contained in it +const TUid KUidFastSwap = { 0x10207218 }; +const TUid KUidPenInputServer = { 0x10281855 }; + +const TInt KMicrosecondsInMillisecond = 1000; + +#endif /*OOMCONSTANTS_HRH_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomforegroundrule.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomforegroundrule.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,48 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMFOREGROUNDRULE_ +#define OOMFOREGROUNDRULE_ + +#include +#include "oomruleconfig.h" + +/** + * A rule to modify the priority if a particular application is in the foreground + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomForegroundRule) : public CBase, public MOomRuleConfig + { +public: + // If the specified target app is in the foreground then apply the specified priority + COomForegroundRule(TInt aTargetAppId, TInt aPriority); + + TBool RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const; + + inline TUint Priority() const; + +private: + TInt iTargetAppId; + TInt iPriority; // The priority to apply if the specified app is in the foreground + }; + +#include "oomforegroundrule.inl" + +#endif /*OOMFOREGROUNDRULE_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomforegroundrule.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomforegroundrule.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMFOREGROUNDRULEINL_H_ +#define OOMFOREGROUNDRULEINL_H_ + + +inline TUint COomForegroundRule::Priority() const + { + return iPriority; + } + +#endif /*OOMFOREGROUNDRULEINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomglobalconfig.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomglobalconfig.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,57 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMGLOBALCONFIG_ +#define OOMGLOBALCONFIG_ + +#include +#include + +/** + * Class presenting the parts of the configuration that are global defaults rather than specific + * to the current state of the device + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomGlobalConfig) : public CBase + { +public: + ~COomGlobalConfig(); + + inline void AddForceCheckPriorityL(TUint aPriority); + + // Return ETrue if a force check has been added for this priority, return EFalse otherwise + inline TBool ForceCheckAtPriority(TUint aPriority) const; + +public: + TInt iLowRamThreshold; + TInt iGoodRamThreshold; + TBool iSwapUsageMonitored; + TInt iLowSwapThreshold; + TInt iGoodSwapThreshold; + TUint iMaxCloseAppBatch; + TInt iDefaultWaitAfterPlugin; + TInt iMaxAppExitTime; + + RHashSet iForceCheckPriorities; + }; + +#include "oomglobalconfig.inl" + +#endif /*OOMGLOBALCONFIG_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomglobalconfig.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomglobalconfig.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,33 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMGLOBALCONFIGINL_H_ +#define OOMGLOBALCONFIGINL_H_ + +void COomGlobalConfig::AddForceCheckPriorityL(TUint aPriority) + { + iForceCheckPriorities.InsertL(aPriority); + } + +// Return ETrue if a force check has been added for this priority, return EFalse otherwise +TBool COomGlobalConfig::ForceCheckAtPriority(TUint aPriority) const + { + return (iForceCheckPriorities.Find(aPriority) != NULL); + } + +#endif /*OOMGLOBALCONFIGINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomidletimerule.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomidletimerule.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,53 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMIDLETIMERULE_ +#define OOMIDLETIMERULE_ + +#include + +#include "oomruleconfig.h" + +/** + * A rule to modify the priority of an app close action if it has been idle for a period of time + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomIdleTimeRule) : public CBase, public MOomRuleConfig + { +public: + static COomIdleTimeRule* NewL(TTimeIntervalSeconds aIdleTime, TInt aPriority); + + TBool RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const; + + inline TUint Priority() const; + + ~COomIdleTimeRule(); + +private: + COomIdleTimeRule(TTimeIntervalSeconds aIdleTime, TInt aPriority); + +private: + TTimeIntervalSeconds iIdleTime; // The idle time after which to apply the given priority + TInt iPriority; // The priority to apply after the given idle time + }; + +#include "oomidletimerule.inl" + +#endif /*OOMIDLETIMERULE_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomidletimerule.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomidletimerule.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,27 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMIDLETIMERULEINL_H_ +#define OOMIDLETIMERULEINL_H_ + +inline TUint COomIdleTimeRule::Priority() const + { + return iPriority; + } + +#endif /*OOMIDLETIMERULEINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomlog.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomlog.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,85 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Logging functionality for OOM monitor profiling. +* +*/ + + +#ifndef OOMLOG_H_ +#define OOMLOG_H_ + +#ifdef _DEBUG + +#include + +#include "oomwindowgrouplist.h" + +const TUint KTimeBetweenMemorySamples = 100000; // In microseconds +const TUint KSamplingDurationUint = 3000000; + +const TUint KMaxBytesOfLoggingPerSample = 20; + +NONSHARABLE_CLASS(COomLogger) : public CTimer + { +public: + static COomLogger* NewL(RWsSession& aWs, RFs& aFs); + + // Start logging the available memory every n micro seconds + // Firstly a list of the app IDs is written to the log (foreground app first) + // Note that the log is created in memory (to a pre-allocated buffer) and flushed out after it is complete + // the samples are saved in CSV format so that they can easily be cut and pasted to plot graphs etc. + void StartL(); + +// From CTimer / CActice + void RunL(); + void DoCancel(); + + ~COomLogger(); + + void Write(const TDesC8& aBuffer); + +protected: + void LogApplicationIds(); + void LogFreeMemory(); + + COomLogger(RWsSession& aWs, RFs& aFs); + void ConstructL(); + + // Duplicated functionality from OomMonitor + // Duplicated because it was messy to reuse it and to minimise changes to OOM monitor during development of new features + void ColapseWindowGroupTree(); + + TUid GetUidFromWindowGroupId(TInt aWgId); + + RWsSession& iWs; + + // Used to get a list of open applications + RArray iWgIds; + CApaWindowGroupName* iWgName; + HBufC* iWgNameBuf; // owned by iWgName + + RFs& iFs; + + RFile iFile; + TBool iIsOpen; + + // The time when the logging was started + TTime iStartTime; + + TBuf8<(KSamplingDurationUint / KTimeBetweenMemorySamples) * KMaxBytesOfLoggingPerSample> iWriteBuffer; + }; + +#endif //_DEBUG + +#endif /*OOMLOG_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oommemorymonitor.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oommemorymonitor.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,205 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMMEMORYMONITOR_H +#define OOMMEMORYMONITOR_H + +#include +#include +#include +#include "oomglobalconfig.h" +#include "oomwindowgrouplist.h" +#include "oommonitorsession.h" + +enum TActionTriggerType + { + ERamRotation, + EClientServerRequestOptionalRam, + EClientServerRequestFreeMemory, + EPublishAndSubscribe + }; + +// --------------------------------------------------------- +// CMemoryMonitor +// --------------------------------------------------------- +// +class COutOfMemoryWatcher; +class CSubscribeHelper; +class COomMonitorPlugin; +class CMemoryMonitorServer; +class CWservEventReceiver; +class COomActionList; +class COomLogger; +class COomConfig; +class COomClientRequestQueue; + +/** + * The main manager class for Oom Monitor. It has the following responsibility: + * + * - initiates building the static configuration at boot time and owns the object which holds this. + * - owns and drives the action list which runs actions + * - owns the internal representation of the window group list and an active object to monitor window group changes + * - owns the public API via the server and client request queue. + * - has an active object which monitors low RAM events + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(CMemoryMonitor) : public CBase + { +public: + static CMemoryMonitor* NewL(); + ~CMemoryMonitor(); + +public: // event handlers + void FreeMemThresholdCrossedL(); + void AppNotExiting(TInt aWgId); + void StartFreeSomeRamL(TInt aFreeRamTarget, TInt aFreeSwapSpaceTarget); + void StartFreeSomeRamL(TInt aFreeRamTarget, TInt aFreeSwapSpaceTarget, TInt aMaxPriority); + void FreeOptionalRamL(TInt aBytesRequested, TInt aPluginId, TBool aDataPaged); // The ID of the plugin that will clear up the allocation, used to determine the priority of the allocation + void HandleFocusedWgChangeL(); + static const COomGlobalConfig& GlobalConfig(); + void SetPriorityBusy(TInt aWgId); + void SetPriorityNormal(TInt aWgId); + void SetPriorityHigh(TInt aWgId); + void ResetTargets(); + void RequestTimerCallbackL(); + void GetFreeMemory(TInt& aCurrentFreeMemory); + void GetFreeSwapSpace(TInt& aCurrentFreeSwapSpace); + TActionTriggerType ActionTrigger() const; +#ifdef CLIENT_REQUEST_QUEUE + void ActionsCompleted(TInt aBytesFree, TBool aMemoryGood); + TInt GoodRamThreshold() const; + TInt LowRamThreshold() const; +#endif + void RequestFreeMemoryL(TInt aBytesRequested, TBool aDataPaged); + void RequestFreeMemoryPandSL(TInt aBytesRequested); + + /* + * Sets the RProperty associated with KOomMemoryMonitorStatusPropertyKey + * It checks if the value is going to be changed. + * If the new value is the same as the old one then the property is not updated + * If the new value is different from the previously set one then the property is update + * + * @param aNewValue one of TMemoryMonitorStatusPropertyValues + */ + void SetMemoryMonitorStatusProperty(const TMemoryMonitorStatusPropertyValues aValue); + +private: + CMemoryMonitor(); + void ConstructL(); +#ifndef CLIENT_REQUEST_QUEUE + static TInt WatchdogStatusStatusChanged(TAny* aPtr); + void HandleWatchdogStatusCallBack(); + TBool FreeMemoryAboveThreshold(TInt& aCurrentFreeMemory); void CloseNextApp(); +#endif + void RefreshThresholds(); + +public: + // All members are owned + // generally useful sessions + RFs iFs; + RWsSession iWs; + + TBool iDataPaged; + +private: //data + + // parameters for OOM watcher. + TInt iLowRamThreshold; + TInt iGoodRamThreshold; + TInt iLowSwapThreshold; + TInt iGoodSwapThreshold; + TInt iCurrentRamTarget; + TInt iCurrentSwapTarget; + + + +#ifdef CLIENT_REQUEST_QUEUE + TInt iClientBytesRequested; +#endif + // event receivers + + /** + * The active object which monitors the kernel change notifier for changes in the low and good thresholds + * Own + */ + COutOfMemoryWatcher* iOOMWatcher; + + + CWservEventReceiver* iWservEventReceiver; + +#ifndef CLIENT_REQUEST_QUEUE + // parameters for P&S watcher. + /** + * The handle to the P&S property that can be used to initiate OOM Monitor actions + */ + RProperty iWatchdogStatusProperty; + + /** + * The active object which monitors the P&S property that can be used to initiate OOM Monitor actions + * Own. + */ + CSubscribeHelper* iWatchdogStatusSubscriber; +#endif + + /** + * The Memory Monitor Server + * Own. + */ + CMemoryMonitorServer* iServer; + +#ifdef CLIENT_REQUEST_QUEUE + COomClientRequestQueue* iQueue; +#endif + +#ifdef _DEBUG + /** + * Oom logging tool - samples free memory for profiling + * Own. + */ + COomLogger* iLogger; +#endif + + /** + * A list of window group Ids, with child window groups removed such that there is one Id per application + * Own. + */ + COomWindowGroupList* iOomWindowGroupList; + + /** + * The object responsible for identifying the best actions to run, and running them + * Own. + */ + COomActionList* iOomActionList; + + /** + * The entire Oom Monitor configuration + * Own. + */ + COomConfig* iConfig; + + /** + * The most recent value the memory monitor status property was set to + */ + TInt iLastMemoryMonitorStatusProperty; + + TActionTriggerType iActionTrigger; + }; + +#endif /*OOMMEMORYMONITOR_H*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oommemorymonitorserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oommemorymonitorserver.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,63 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMMEMORYMONITORSERVER_H +#define OOMMEMORYMONITORSERVER_H + +#include + +class CMemoryMonitor; +class COomClientRequestQueue; + +NONSHARABLE_CLASS(CMemoryMonitorServer) : public CServer2 + { +public: +#ifdef CLIENT_REQUEST_QUEUE + static CMemoryMonitorServer* NewL(COomClientRequestQueue& aQueue); +#else + static CMemoryMonitorServer* NewL(CMemoryMonitor& aMonitor); +#endif + ~CMemoryMonitorServer(); + + CMemoryMonitor& Monitor(); +#ifndef CLIENT_REQUEST_QUEUE + void CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood); +#endif +#ifdef CLIENT_REQUEST_QUEUE + COomClientRequestQueue& ClientRequestQueue(); +#endif + +private: +#ifdef CLIENT_REQUEST_QUEUE + CMemoryMonitorServer(COomClientRequestQueue& aQueue); +#else + CMemoryMonitorServer(CMemoryMonitor& aMonitor); +#endif + void ConstructL(); + CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const; + TInt RunError(TInt aError); + +private: +#ifdef CLIENT_REQUEST_QUEUE + COomClientRequestQueue& iQueue; +#else + CMemoryMonitor& iMonitor; +#endif + }; + +#endif /*OOMMEMORYMONITORSERVER_H*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,53 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMMEMORYMONITORSESSION_H +#define OOMMEMORYMONITORSESSION_H + +#include + +class CMemoryMonitorServer; +class CMemoryMonitor; +class COomClientRequestQueue; + +NONSHARABLE_CLASS(CMemoryMonitorSession) : public CSession2 + { +public: + CMemoryMonitorSession(); +#ifndef CLIENT_REQUEST_QUEUE + void CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood); +#endif + +private: + ~CMemoryMonitorSession(); + CMemoryMonitorServer& Server(); +#ifdef CLIENT_REQUEST_QUEUE + COomClientRequestQueue& ClientRequestQueue(); +#endif + CMemoryMonitor& Monitor(); + void ServiceL(const RMessage2& aMessage); + TBool IsDataPaged(const RMessage2& aMessage); +private: + RMessagePtr2 iRequestFreeRam; +#ifndef CLIENT_REQUEST_QUEUE + TInt iFunction; +#endif + TInt iMinimumMemoryRequested; + }; + +#endif /*OOMMEMORYMONITORSESSION_H*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oommonitorclientserver.h --- a/sysresmonitoring/oommonitor/inc/oommonitorclientserver.h Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/inc/oommonitorclientserver.h Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Command definitions for OOM Monitor client/server interface. +* Description: The client / server classes allowing clients to make requests to OOM monitor. * */ @@ -22,20 +22,24 @@ #include enum TOomMonitorClientPanic - { - EPanicIllegalFunction, - EPanicRequestActive - }; + { + EPanicIllegalFunction, + EPanicRequestActive + }; void PanicClient(const RMessagePtr2& aMessage,TOomMonitorClientPanic aPanic); _LIT(KMemoryMonitorServerName, "OomMonitorServer"); enum TOomMonitorCmd - { - EOomMonitorRequestFreeMemory, - EOomMonitorCancelRequestFreeMemory, - EOomMonitorThisAppIsNotExiting - }; + { + EOomMonitorRequestFreeMemory, + EOomMonitorCancelRequestFreeMemory, + EOomMonitorThisAppIsNotExiting, + EOomMonitorRequestOptionalRam, + EOomMonitorSetPriorityBusy, + EOomMonitorSetPriorityNormal, + EOomMonitorSetPriorityHigh + }; #endif // OOMMONITORCLIENTSERVER_H diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomoutofmemorywatcher.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomoutofmemorywatcher.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,60 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMOUTOFMEMORYWATCHER_H +#define OOMOUTOFMEMORYWATCHER_H + +#include + +class CMemoryMonitor; + +/** + * This class is an active object which monitors a kernel change notifer for changes in the + * low and good memory thresholds. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COutOfMemoryWatcher) : public CActive + { +public: + static COutOfMemoryWatcher* NewL(CMemoryMonitor& aMonitor, TInt aLowRamThreshold, TInt aGoodRamThreshold, + TBool aSwapUsageMonitored, TInt aLowSwapThreshold, TInt aGoodSwapThreshold); + ~COutOfMemoryWatcher(); + void Start(); + + /** + * Set the Low and Good thresholds that we are listening for. + * These values can change from the global default values when certain applications are in the foreground. + * @param aLowThreshold If Ram Level drops below the low threshold Oom Monitor actions are started. + * @param aGoodThreshold When memory returns above the Good threshold then Oom Monitor stops freeing memory. + */ + void UpdateThresholds(TInt aLowRamThreshold, TInt aGoodRamThreshold, TInt aLowSwapThreshold, TInt aGoodSwapThreshold); +private: + COutOfMemoryWatcher(CMemoryMonitor& aMonitor, TBool aSwapUsageMonitored); + void ConstructL(TInt aLowRamThreshold, TInt aGoodRamThreshold, TInt aLowSwapThreshold, TInt aGoodSwapThreshold); +private: // from CActive + void DoCancel(); + void RunL(); +private: // data + RChangeNotifier iChangeNotifier; + CMemoryMonitor& iMemoryMonitor; + TBool iSwapUsageMonitored; + }; + +#endif /*OOMOUTOFMEMORYWATCHER_H*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oompanic.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oompanic.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,52 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Panic codes for OOM monitor. +* +*/ + + +#ifndef OOMPANIC_ +#define OOMPANIC_ + +#include + +enum TOomMonitorPanic + { + KRuleConfiguredBeforeApplication, + KCloseAppActionIsResued, + KAppConfigAddedTwice, + KSameAppClosureConfiguredTwice, + KOomDefaultAppCloseNotConfigured, + KPluginConfigAddedTwice, + KRuleConfiguredBeforePlugin, + KOomDefaultAppNotConfigured, + KOomDefaultPluginNotConfigured, + KNoCoeEnvFound, + KInvalidWgName, + KOomInvalidPriority, + KAppCloseActionEqualPriorities, + KClientQueueNotEmpty, + KClientRequestTimerActive, + KInvalidClientRequestType, + KPluginArrayIndexOutOfBounds, + KWindowGroupArrayIndexOutOfBounds, + KStartingActiveCloseAppTimer, + KStartingActiveAppCloseWatcher, + KStartingActivePluginWaiter + }; + +void OomMonitorPanic(TOomMonitorPanic aReason); +void OomConfigParserPanic(TInt aReason); + +#endif /*OOMPANIC_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oompluginwaiter.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oompluginwaiter.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,53 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMPLUGINWAITER_H_ +#define OOMPLUGINWAITER_H_ + +#include + +class COomRunPlugin; + + +/* + * A class used for waiting for a pre-determined period before completing the plugin operation + * It is intended to be used to force a delay between the call to the plugin and the memory check, + * thus allowing the plugin to free some memory first. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomPluginWaiter) : public CTimer + { +public: + static COomPluginWaiter* NewL(TInt aMillisecondsToWait, COomRunPlugin& aCallbackClass); + + // Start the timer, it will call the plugin back when it expires + void Start(); + +protected: + void RunL(); + + COomPluginWaiter(TInt aMillisecondsToWait, COomRunPlugin& aCallbackClass); + +private: + TInt iMillisecondsToWait; + COomRunPlugin& iCallbackClass; + }; + +#endif /*OOMPLUGINWAITER_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomruleconfig.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomruleconfig.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,33 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMRULECONFIG_ +#define OOMRULECONFIG_ + +#include + +class COomWindowGroupList; + +NONSHARABLE_CLASS(MOomRuleConfig) + { +public: + virtual TBool RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const = 0; + virtual TUint Priority() const = 0; + }; + +#endif /*OOMRULECONFIG_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomrunplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomrunplugin.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,85 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMRUNPLUGIN_H_ +#define OOMRUNPLUGIN_H_ + +#include "oomaction.h" + +class COomRunPlugin; +class COomRunPluginConfig; +class MOomActionObserver; +class COomPluginWaiter; +class COomMonitorPlugin; +class COomMonitorPluginV2; +class COomActionConfig; + +/* + * The OOM action of running an OOM plug-in to free up memory. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomRunPlugin) : public COomAction + { +public: + static COomRunPlugin* NewL(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin = NULL); + + ~COomRunPlugin(); + + // Run the OOM plugin in order to free memory + // Call the COomAction::MemoryFreed when it is done + virtual void FreeMemory(TInt aBytesRequested, TBool aIsDataPaged); + + // Call the memory good function on the plugin but... + // only if there is an outstanding FreeMemory request + void MemoryGood(); + + inline TBool IsRunning(); + + // To be called by the COomPluginWaiter + inline void WaitCompleted(); + +protected: + + void ConstructL(COomRunPluginConfig& aPluginConfig); + + inline COomActionConfig& GetConfig(); + +private: + + COomRunPlugin(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin); + + TUint iPluginId; + + COomMonitorPlugin& iPlugin; + + COomRunPluginConfig& iConfig; + + COomPluginWaiter* iPluginWaiter; + + // Note that this shouldn't be deleted + // If it is pointing to a V2 plugin then it is a cast to the same instance as iPlugin + COomMonitorPluginV2* iV2Plugin; + + TBool iFreeMemoryCalled; // True if FreeMemory has been called since the last call to MemoryGood + }; + +#include "oomrunplugin.inl" + +#endif /*OOMRUNPLUGIN_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomrunplugin.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomrunplugin.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,43 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMRUNPLUGININL_H_ +#define OOMRUNPLUGININL_H_ + +#include "oomactionconfig.h" +#include "oompluginwaiter.h" +#include "oomrunpluginconfig.h" + +inline COomActionConfig& COomRunPlugin::GetConfig() + { + return iConfig; + } + + +inline TBool COomRunPlugin::IsRunning() + { + return iPluginWaiter->IsActive(); + } + +inline void COomRunPlugin::WaitCompleted() + { + MemoryFreed(KErrNone); + } + + +#endif /*OOMRUNPLUGININL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomrunpluginconfig.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomrunpluginconfig.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,81 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMRUNPLUGINCONFIG_ +#define OOMRUNPLUGINCONFIG_ + +#include "oomactionconfig.h" + +enum TOomPluginType + { + EOomAppPlugin, + EOomSystemPlugin + }; + +/* + * The OOM action of running an OOM plug-in to free up memory. + */ +NONSHARABLE_CLASS(COomRunPluginConfig) : public COomActionConfig + { +public: + static COomRunPluginConfig* NewL(TUint aPluginId, TOomPluginType aPluginType); + + TUint CalculatePluginPriority(const COomWindowGroupList& aWindowGroupList); + + inline TUint Id(); + + inline void SetTargetApp(TUint aTargetAppId); + + inline TUint TargetApp() const; + + ~COomRunPluginConfig(); + + // Returns ETrue if a wait period has been explicitly configured for this plugin + inline TBool WaitAfterPluginDefined() const; + + // Returns the configured wait after the plugin has been called + inline TInt WaitAfterPlugin() const; + + inline TBool CallIfTargetAppNotRunning() const; + + // Set the time to wait + inline void SetWaitAfterPlugin(TInt aMillisecondsToWait); + + inline void SetCallIfTargetAppNotRunning(TBool aCallIfTargetAppNotRunning); + + inline TOomPluginType PluginType(); + +private: + COomRunPluginConfig(TUint aPluginId, TOomPluginType aPluginType); + + TUint iPluginId; + + TUint iTargetAppId; + + TBool iWaitAfterPluginDefined; + + TInt iWaitAfterPlugin; // The period to wait after a plugin has been called + + TBool iCallIfTargetAppNotRunning; + + TOomPluginType iPluginType; + }; + +#include "oomrunpluginconfig.inl" + +#endif /*OOMRUNPLUGINCONFIG_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomrunpluginconfig.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomrunpluginconfig.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,72 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMRUNPLUGINCONFIGINL_H_ +#define OOMRUNPLUGINCONFIGINL_H_ + + +// Returns ETrue if a wait period has been explicitly configured for this plugin +inline TBool COomRunPluginConfig::WaitAfterPluginDefined() const + { + return iWaitAfterPluginDefined; + } + +// Returns the configured wait after the plugin has been called +inline TInt COomRunPluginConfig::WaitAfterPlugin() const + { + return iWaitAfterPlugin; + } + +inline TBool COomRunPluginConfig::CallIfTargetAppNotRunning() const + { + return iCallIfTargetAppNotRunning; + } + +// Set the time to wait +inline void COomRunPluginConfig::SetWaitAfterPlugin(TInt aMillisecondsToWait) + { + iWaitAfterPluginDefined = ETrue; + iWaitAfterPlugin = aMillisecondsToWait; + } + +inline void COomRunPluginConfig::SetCallIfTargetAppNotRunning(TBool aCallIfTargetAppNotRunning) + { + iCallIfTargetAppNotRunning = aCallIfTargetAppNotRunning; + } + +inline void COomRunPluginConfig::SetTargetApp(TUint aTargetAppId) + { + iTargetAppId = aTargetAppId; + } + +inline TUint COomRunPluginConfig::Id() + { + return iPluginId; + } + +inline TOomPluginType COomRunPluginConfig::PluginType() + { + return iPluginType; + } + +inline TUint COomRunPluginConfig::TargetApp() const + { + return iTargetAppId; + } + +#endif /*OOMRUNPLUGINCONFIGINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomsubscribehelper.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomsubscribehelper.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,52 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMSUBSCRIBEHELPER_H +#define OOMSUBSCRIBEHELPER_H + +#include + +class RProperty; + +/** + * This class is a simple active object which monitors the publish subscribe key method of calling the + * requesting that the OOM Monitor starts to free memory + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(CSubscribeHelper) : public CActive + { +public: + CSubscribeHelper(TCallBack aCallBack, RProperty& aProperty); + ~CSubscribeHelper(); + +public: // New functions + void Subscribe(); + void StopSubscribe(); + +private: // from CActive + void RunL(); + void DoCancel(); + +private: + TCallBack iCallBack; + RProperty& iProperty; + }; + +#endif /*OOMSUBSCRIBEHELPER_H*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomwindowgrouplist.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomwindowgrouplist.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,119 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: A wrapper for the window group list, adding additional functionality required by OOM Monitor v2. +* +*/ + + +#ifndef OOMWINDOWGROUPLIST_H_ +#define OOMWINDOWGROUPLIST_H_ + +#include +#include +#include + +class CApaWindowGroupName; + +/** + * This class holds a snapshot of the window group tree. + * + * The window group tree is collapsed (see CollapseWindowGroupTree) to remove child windows as we are only + * interested in a single window group Id per application. + * + * @lib oommonitor.lib + * @since S60 v5.0 + */ +NONSHARABLE_CLASS(COomWindowGroupList) : public CBase + { +public: + + static COomWindowGroupList* NewL(RWsSession& aWs); + + // Update the list of window groups + void RefreshL(); + + // Update the list of window groups, non-leaving version + void Refresh(); + + // Return the number of application instances in this list + inline TUint Count() const; + + TUint AppId(TInt aIndex, TBool aResolveFromThread = EFalse) const; + + inline const RWsSession::TWindowGroupChainInfo& WgId(TInt aIndex) const; + + TTimeIntervalSeconds IdleTime(TInt aIndex) const; + + ~COomWindowGroupList(); + + void SetPriorityBusy(TInt aWgId); + + void SetPriorityNormal(TInt aWgId); + + void SetPriorityHigh(TInt aWgId); + + TBool IsBusy(TInt wgIndex); + + // Returns ETrue if an application has registered itself as high priority at runtime + TBool IsDynamicHighPriority(TInt wgIndex); + + CApaWindowGroupName* WgName() const; + + // Find the specificed application in the window group list and return the index + TInt GetIndexFromAppId(TUint aAppId) const; + +private: + + void CollapseWindowGroupTree(); + + void RemovePropertiesForClosedWindowsL(); + + TInt FindParentIdL(TInt aWgId); + +private: + + COomWindowGroupList(RWsSession& aWs); + + void ConstructL(); + + RArray iWgIds; + RArray iUncollapsedWgIds; + + enum TOomPriority + { + EOomPriorityNormal, + EOomPriorityHigh, + EOomPriorityBusy + }; + + class TOomWindowGroupProperties + { + public: + TOomWindowGroupProperties(); + TUint32 iIdleTickTime; + TOomPriority iDynamicPriority; + }; + + RHashMap iWgToPropertiesMapping; // A mapping between window group IDs and the properties such as idle time and the high-priority flag + RHashSet iExistingWindowIds; // Used locally in RemoveIdleTimesForClosedWindows(), declared globally because we need to reserve space + + RWsSession& iWs; + + CApaWindowGroupName* iWgName; + HBufC* iWgNameBuf; // owned by iWgName + }; + +#include "oomwindowgrouplist.inl" + +#endif /*OOMWINDOWGROUPLIST_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomwindowgrouplist.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomwindowgrouplist.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,33 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#ifndef OOMWINDOWGROUPLISTINL_H_ +#define OOMWINDOWGROUPLISTINL_H_ + +// Return the number of application instances in this list +inline TUint COomWindowGroupList::Count() const + { + return iWgIds.Count(); + } + +inline const RWsSession::TWindowGroupChainInfo& COomWindowGroupList::WgId(TInt aIndex) const + { + return iWgIds[aIndex]; + } + +#endif /*OOMWINDOWGROUPLISTINL_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/oomwserveventreceiver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/oomwserveventreceiver.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,41 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + +#ifndef OOMWSERVEVENTRECEIVER_H +#define OOMWSERVEVENTRECEIVER_H + +#include +class CMemoryMonitor; + +NONSHARABLE_CLASS(CWservEventReceiver) : public CActive + { +public: + CWservEventReceiver(CMemoryMonitor& aMonitor, RWsSession& aWs); + ~CWservEventReceiver(); + void ConstructL(); +private: + void Queue(); + void DoCancel(); + void RunL(); +private: + CMemoryMonitor& iMonitor; + RWsSession& iWs; + RWindowGroup iWg; + }; + +#endif /*OOMWSERVEVENTRECEIVER_H*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/traceconfiguration.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/traceconfiguration.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,84 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Tracing flags configuration. +* +*/ + + +#ifndef TRACECONFIGURATION_HRH +#define TRACECONFIGURATION_HRH + +//----------------------------------------------------------------------------- +// Trace definitions +//----------------------------------------------------------------------------- +// + +/** +* Error trace enabled +*/ +#ifdef _DEBUG + #define ERROR_TRACE +#else + #undef ERROR_TRACE +#endif + +/** +* Info trace enabled +*/ +#define __OOM_INFO_TRACE__ +#if defined _DEBUG && defined __OOM_INFO_TRACE__ + #define INFO_TRACE + #define TIMESTAMP_TRACE +#else + #undef INFO_TRACE + #undef TIMESTAMP_TRACE +#endif + +/** +* Function trace enabled +*/ +#if defined _DEBUG && defined __OOM_FUNC_TRACE__ + #define FUNC_TRACE +#else + #undef FUNC_TRACE +#endif + +/** +* Timestamp tracing on +*/ +#if defined _DEBUG && defined __OOM_TIMESTAMP_TRACE__ + #define TIMESTAMP_TRACE +#else + #undef TIMESTAMP_TRACE +#endif + +/** +* Tracing current client process and thread +*/ +#ifdef _DEBUG + #define CLIENT_TRACE +#else + #undef CLIENT_TRACE +#endif + +/** +* Tracing into file enabled, default RDebug +*/ +#ifdef __OOM_TRACE_INTO_FILE__ + #define TRACE_INTO_FILE +#else + #undef TRACE_INTO_FILE +#endif + +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/inc/tracedefs.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/inc/tracedefs.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,39 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Definitions for tracing. +* +*/ + + +#ifndef TRACEDEFS_H +#define TRACEDEFS_H + +//----------------------------------------------------------------------------- +// Constants +//----------------------------------------------------------------------------- +// + +/** +* Prefix trace macro to complete tracing with component name. +* Returns TDesC which can be used directly with RDebug or RFileLogger. +*/ +#define _PREFIX_TRACE( aMsg ) TPtrC( (const TText*)L"[OOM]: " L##aMsg ) +#define _PREFIX_TRACE_2( aMsg1, aMsg2 ) TPtrC( (const TText*)L"[OOM]: " L##aMsg1 L##aMsg2 ) + +/** +* Prefix macro for strings +*/ +#define _PREFIX_CHAR( aMsg ) (const char*)"[OOM]: " ##aMsg + +#endif // TRACEDEFS_H diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/rom/distribution.policy.s60 --- a/sysresmonitoring/oommonitor/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/rom/oommonitor.iby --- a/sysresmonitoring/oommonitor/rom/oommonitor.iby Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/rom/oommonitor.iby Thu Jun 24 13:52:58 2010 +0100 @@ -22,6 +22,7 @@ #include file=ABI_DIR\BUILD_DIR\oommonitor.dll SHARED_LIB_DIR\oommonitor.dll +data=ZSYSTEM\..\private\10207218\oomconfig.xml private\10207218\oomconfig.xml #endif // OOMMONITOR_IBY diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/distribution.policy.s60 --- a/sysresmonitoring/oommonitor/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomIdletimerule.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomIdletimerule.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,51 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + +#include "oomidletimerule.h" +#include "oomwindowgrouplist.h" +#include "OomTraces.h" + +COomIdleTimeRule* COomIdleTimeRule::NewL(TTimeIntervalSeconds aIdleTime, TInt aPriority) + { + FUNC_LOG; + + COomIdleTimeRule* self = new (ELeave) COomIdleTimeRule(aIdleTime, aPriority); + return self; + } + +TBool COomIdleTimeRule::RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const + { + FUNC_LOG; + + TBool applicable = EFalse; + if (aAppIndexInWindowGroup >= 0) + { + applicable = (aWindowGroupList.IdleTime(aAppIndexInWindowGroup) >= iIdleTime); + } + return applicable; + } + +COomIdleTimeRule::~COomIdleTimeRule() + { + FUNC_LOG; + } + +COomIdleTimeRule::COomIdleTimeRule(TTimeIntervalSeconds aIdleTime, TInt aPriority) : iIdleTime(aIdleTime), iPriority(aPriority) + { + FUNC_LOG; + } + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomaction.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomaction.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,40 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#include "oomaction.h" +#include "oomactionlist.h" +#include "OomTraces.h" + +COomAction::~COomAction() + { + FUNC_LOG; + } + +// To be called by the derived class after the memory has been freed (or if it fails) +void COomAction::MemoryFreed(TInt) + { + FUNC_LOG; + + iState = EOomIdle; + iStateChangeObserver.StateChanged(); + } + +COomAction::COomAction(MOomActionObserver& aStateChangeObserver) : iStateChangeObserver(aStateChangeObserver) + { + FUNC_LOG; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomactionconfig.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomactionconfig.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,77 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + + +#include "oomactionconfig.h" +#include "oomruleconfig.h" +#include "OomTraces.h" + +// Add a rule +// This class takes ownership of the given rule +void COomActionConfig::AddRuleL(MOomRuleConfig* aRule) // Add the configuration for a rule (e.g. an idle time rule) + { + FUNC_LOG; + + iRules.AppendL(aRule); + } + +COomActionConfig::~COomActionConfig() + { + FUNC_LOG; + + iRules.ResetAndDestroy(); + iRules.Close(); + } + +// Utility function to return the priority for this action for the given rule +TUint COomActionConfig::Priority(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const + { + FUNC_LOG; + + TUint priority = iDefaultPriority; + + // See if any rules apply + TInt index = 0; + while (index < iRules.Count()) + { + if (iRules[index]->RuleIsApplicable(aWindowGroupList, aAppIndexInWindowGroup)) + { + // If an applicable rule has been found, then apply the new priority + // The last applicable rule in the config file should be used + // This is ensured because the last rule in the list will be the last rule from the file + if (iRules[index]->Priority()) + priority = iRules[index]->Priority(); + } + + index++; + } + + return priority; + } + +void COomActionConfig::ConstructL() + { + FUNC_LOG; + } + +COomActionConfig::COomActionConfig(TInt32 aId) : iId(aId) + { + FUNC_LOG; + } + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomactionlist.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomactionlist.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,712 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + + +#include +#include +#include + +#include "oommonitorplugin.h" +#include "oommonitorplugin.hrh" +#include "oomactionlist.h" +#include "oomwindowgrouplist.h" +#include "oompanic.h" +#include "OomTraces.h" +#include "oomconstants.hrh" +#include "oommemorymonitor.h" +#include "oommemorymonitorserver.h" +#include "oomrunplugin.h" +#include "oomcloseapp.h" +#include "oomconfig.h" +#include "oomactionref.h" +#include "oomapplicationconfig.h" +#include "oomcloseappconfig.h" +#include "oomrunpluginconfig.h" + +const TUid KUidMatrixMenuApp = { 0x101F4CD2 }; + +template +COomPluginList::COomPluginList() + { + FUNC_LOG; + } + +template +COomPluginList::~COomPluginList() + { + FUNC_LOG; + + TInt count = iPlugins.Count(); + for (TInt ii=0; ii +void COomPluginList::ConstructL(TInt aInterfaceUid) + { + FUNC_LOG; + + RImplInfoPtrArray implArray; + CleanupClosePushL(implArray); + REComSession::ListImplementationsL(TUid::Uid(aInterfaceUid), implArray); + + TInt count = implArray.Count(); + iPlugins.ReserveL(count); + + for (TInt ii=0; iiImplementationUid()); + plugin.iImpl = static_cast(REComSession::CreateImplementationL(uid, plugin.iDtorUid, NULL)); + plugin.iUid = uid.iUid; + } + + CleanupStack::PopAndDestroy(&implArray); + } + +template +COomPluginList::TPlugin::TPlugin() +: iImpl(0) + { + FUNC_LOG; + } + +template +COomPluginList* COomPluginList::NewL(TInt aInterfaceUid) + { + FUNC_LOG; + + COomPluginList* self = new (ELeave) COomPluginList(); + CleanupStack::PushL(self); + self->ConstructL(aInterfaceUid); + CleanupStack::Pop(self); + return self; + } + +COomActionList* COomActionList::NewL(CMemoryMonitor& aMonitor, CMemoryMonitorServer& aServer, RWsSession& aWs, COomConfig& aConfig) + { + FUNC_LOG; + + COomActionList* self = new (ELeave) COomActionList(aMonitor, aServer, aWs); + CleanupStack::PushL(self); + self->ConstructL(aConfig); + CleanupStack::Pop(self); + return self; + } + +COomActionList::~COomActionList() + { + FUNC_LOG; + + iCloseAppActions.ResetAndDestroy(); + iCloseAppActions.Close(); + iRunPluginActions.ResetAndDestroy(); + iRunPluginActions.Close(); + + iActionRefs.Close(); + + delete iPluginList; + delete iPluginListV2; + } + + + +// Creates a list of actions based on the contents of the config and the current window group list +// Any old actions will be replaced. +// This function may leave, however enough memory should be reserved for this process so that at least +// some actions have been created for freeing memory, these can then be run by calling FreeMemory. +// Note that this function will only leave in extreme circumstances, in normal usage we should have +// enough reserved memory to build the complete action list. +void COomActionList::BuildActionListL(COomWindowGroupList& aWindowGroupList, COomConfig& aConfig) + { + FUNC_LOG; + + if (iFreeingMemory) + { + TRACES("COomActionList::BuildActionListL Memory is currently being freed, do not build action list"); + return; + } + + iActionRefs.Reset(); + iCurrentActionIndex = 0; + + aWindowGroupList.RefreshL(); + + TInt actionsIndex = 0; + + // we rely on the two pluginlists not having changed since construction + BuildPluginActionsL(*iPluginList, aWindowGroupList, aConfig, actionsIndex); + BuildPluginActionsL(*iPluginListV2, aWindowGroupList, aConfig, actionsIndex); + + // Go through each item in the wglist, create an app close action for this application + TUint wgIndex = aWindowGroupList.Count() - 1; + + // Fix for when fast swap has focus, or pen input server has put itself into the foreground: + // the wg at index 1 should be considered as the foreground app. + // stopIndex is calculated to take this into account. + TUint stopIndex = 0; + TUid foregroundUid = TUid::Uid(aWindowGroupList.AppId(0)); + if ( KUidFastSwap == foregroundUid || KUidPenInputServer == foregroundUid) + { + stopIndex = 1; + } + + while (wgIndex > stopIndex) // Don't go down to entry stopIndex because this is the foreground window + { + COomCloseAppConfig* appCloseConfig = NULL; + + CApaWindowGroupName* wgName = aWindowGroupList.WgName(); + __ASSERT_DEBUG(wgName, OomMonitorPanic(KInvalidWgName)); + + // Get the app ID for the wglist item + // This sets the window group name + TInt32 appId = aWindowGroupList.AppId(wgIndex); + + if ( !appId || wgName->IsSystem() || wgName->Hidden() ) + { + //If the UID is NULL at this point, we assume the process is not an application + //and therefore is not a suitable candidate for closure. + //We also do not close system or hidden apps. + + //Matrix Menu is temporarily hardcoded here as a system app that can be closed + TUid appUid = TUid::Uid(aWindowGroupList.AppId(wgIndex, ETrue)); + if ( KUidMatrixMenuApp == appUid) + { + TRACES2("BuildActionListL: System App is Matrix Menu; UID = %x, wgIndex = %d", aWindowGroupList.AppId(wgIndex, ETrue),wgIndex); + // Find the app close config for Menu App + appCloseConfig = aConfig.GetApplicationConfig(appId).GetAppCloseConfig(); + } + else + { + TRACES2("BuildActionListL: Not adding process to action list; UID = %x, wgIndex = %d", aWindowGroupList.AppId(wgIndex, ETrue),wgIndex); + TRACES2("BuildActionListL: IsSystem = %d, Hidden = %d", wgName->IsSystem() ? 1 : 0, wgName->Hidden() ? 1 : 0); + wgIndex--; + continue; + } + } + if (aWindowGroupList.IsBusy(wgIndex) || wgName->IsBusy()) + // If the application has been flagged as busy then look up the configuration for busy apps in the config file + { + // Find the app close config for this app ID + appCloseConfig = aConfig.GetApplicationConfig(KOomBusyAppId).GetAppCloseConfig(); + } + else if (aWindowGroupList.IsDynamicHighPriority(wgIndex)) + // If the application has been flagged as busy then look up the configuration for busy apps in the config file + { + // Find the app close config for this app ID + appCloseConfig = aConfig.GetApplicationConfig(KOomHighPriorityAppId).GetAppCloseConfig(); + } + else + // If the application hasn't been flagged as busy or high priority then look up the priority according to the config + { + // Find the app close config for this app ID + appCloseConfig = aConfig.GetApplicationConfig(appId).GetAppCloseConfig(); + } + + //If the app close config is NULL it is because there is an app specific threshold for this + //app but no specific close config. Use the default app close config + if (!appCloseConfig) + { + appCloseConfig = aConfig.GetApplicationConfig(KOomDefaultAppId).GetAppCloseConfig(); + } + + TUint priority = appCloseConfig->CalculateCloseAppPriority(aWindowGroupList, wgIndex); + TInt wgId = aWindowGroupList.WgId(wgIndex).iId; + TOomSyncMode syncMode = appCloseConfig->iSyncMode; + TInt ramEstimate = appCloseConfig->iRamEstimate; + TActionRef ref = TActionRef(TActionRef::EAppClose, priority, syncMode, ramEstimate, wgId, wgIndex); + + //AppClose Actions should always have a unique prioirity determined by the application's z order. + TInt err = iActionRefs.InsertInOrder(ref, ComparePriorities); + if ((err != KErrNone) && (err != KErrAlreadyExists)) + { + User::Leave(err); + } + TRACES3("BuildActionListL: Adding app to action list, Uid = %x, wgId = %d, wgIndex = %d", appId, wgId, wgIndex); + + wgIndex--; + } + + TRACES1("BuildActionListL: Action list built with %d items",iActionRefs.Count()); + } + +template +void COomActionList::BuildPluginActionsL(COomPluginList& aPluginList, COomWindowGroupList& aWindowGroupList, COomConfig& aConfig, TInt& aActionsIndex) + { + TInt pluginIndex = aPluginList.Count(); + + while (pluginIndex--) + { + // Get the config for this plugin + COomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(aPluginList.Uid(pluginIndex)); + + TActionRef::TActionType actionType; + + if (pluginConfig.PluginType() == EOomAppPlugin) + { + if (pluginConfig.CallIfTargetAppNotRunning() == EFalse) + { + //loop through wg group and if find can't find the target app, don't add this plugin + TInt index = aWindowGroupList.Count() - 1; + TUint targetApp = pluginConfig.TargetApp(); + TBool targetAppFound = EFalse; + while (index >= 0) + { + if (aWindowGroupList.AppId(index) == targetApp) + { + targetAppFound = ETrue; + break; + } + index--; + } + if (targetAppFound == EFalse) + { + aActionsIndex++; + continue; + } + } + actionType = TActionRef::EAppPlugin; + } + else + { + actionType = TActionRef::ESystemPlugin; + } + + TInt priority = pluginConfig.CalculatePluginPriority(aWindowGroupList); + TOomSyncMode syncMode = pluginConfig.iSyncMode; + TInt ramEstimate = pluginConfig.iRamEstimate; + + __ASSERT_DEBUG(aActionsIndex < iRunPluginActions.Count(), OomMonitorPanic(KPluginArrayIndexOutOfBounds)); + TActionRef ref = TActionRef(actionType, priority, syncMode, ramEstimate, *(iRunPluginActions[aActionsIndex]), aWindowGroupList.GetIndexFromAppId(pluginConfig.TargetApp())); + + //It is valid to have plugins with equal priority + User::LeaveIfError(iActionRefs.InsertInOrderAllowRepeats(ref, ComparePriorities)); + + aActionsIndex++; + } + } + + +// Execute the OOM actions according to their priority +// Run batches of OOM actions according to their sync mode +void COomActionList::FreeMemory(TInt aMaxPriority) + { + FUNC_LOG; + if (iFreeingMemory) + { + TRACES("COomActionList::FreeMemory Memory is currently being freed, do not start any more actions"); + return; + } + + iMaxPriority = aMaxPriority; + + TBool memoryFreeingActionRun = EFalse; + + // Get the configured maximum number of applications that can be closed at one time + const COomGlobalConfig& globalConfig = CMemoryMonitor::GlobalConfig(); + TInt maxBatchSize = globalConfig.iMaxCloseAppBatch; + TInt numberOfRunningActions = 0; + + TInt freeRamEstimate = 0; // The amount of free memory we expect to be free after the currently initiated operations + HAL::Get(HALData::EMemoryRAMFree, freeRamEstimate); + TUint64 freeSwapEstimate = 0; + if (iSwapUsageMonitored) + { + SVMSwapInfo swapInfo; + UserSvr::HalFunction(EHalGroupVM, EVMHalGetSwapInfo, &swapInfo, 0); + freeSwapEstimate = swapInfo.iSwapFree; + } + + while (iCurrentActionIndex < iActionRefs.Count() + && iActionRefs[iCurrentActionIndex].Priority() <= aMaxPriority) + { + TActionRef ref = iActionRefs[iCurrentActionIndex]; + COomAction* action = NULL; + if (ref.Type() == TActionRef::EAppClose) + { + action = iCloseAppActions[numberOfRunningActions]; + static_cast(action)->Reconfigure(ref); + } + else + { + action = &(ref.RunPlugin()); + } + + iFreeingMemory = ETrue; + TRACES2("COomActionList::FreeMemory: Running action %d which has priority %d", iCurrentActionIndex,ref.Priority()); + + iMonitor.SetMemoryMonitorStatusProperty(EFreeingMemory); + + // At the moment the actions don't make any difference between freeing + // RAM and freeing swap. So we try to free the biggest of the two. + // Until the plugins are updated to make a distinction between swap and RAM this is the best + // we can do. For application close actions the amount to try to free is ignored anyway. + TUint amountToTryToFree = 0; + if (iCurrentRamTarget > freeRamEstimate) + { + amountToTryToFree = iCurrentRamTarget - freeRamEstimate; + } + if (iSwapUsageMonitored && (iCurrentSwapTarget > freeSwapEstimate) && ((iCurrentSwapTarget - freeSwapEstimate) > amountToTryToFree)) + { + amountToTryToFree = iCurrentSwapTarget - freeSwapEstimate; + } + action->FreeMemory(amountToTryToFree, iMonitor.iDataPaged); + memoryFreeingActionRun = ETrue; + + // Actions with EContinueIgnoreMaxBatchSize don't add to the tally of running actions + if (ref.SyncMode() != EContinueIgnoreMaxBatchSize) + numberOfRunningActions++; + + // Update our estimate of how much RAM we think we'll have after this operation + freeRamEstimate += ref.RamEstimate(); + + // Do we estimate that we are freeing enough memory (only applies if the sync mode is "esimtate" for this action) + TBool estimatedEnoughMemoryFreed = EFalse; + if ((ref.SyncMode() == EEstimate) + && (freeRamEstimate >= iCurrentRamTarget)) + { + estimatedEnoughMemoryFreed = ETrue; + } + + if ((ref.SyncMode() == ECheckRam) + || (numberOfRunningActions >= maxBatchSize) + || estimatedEnoughMemoryFreed + || globalConfig.ForceCheckAtPriority(iActionRefs[iCurrentActionIndex].Priority())) + // If this actions requires a RAM check then wait for it to complete + // Also force a check if we've reached the maximum number of concurrent operations + // Also check if we estimate that we have already freed enough memory (assuming that the sync mode is "estimate" + { + // Return from the loop - we will be called back (in COomActionList::StateChanged()) when the running actions complete + TRACES("COomActionList::FreeMemory: Exiting run action loop"); + return; + } + // ... otherwise continue running actions, don't wait for any existing ones to complete + iCurrentActionIndex++; + } + + + if (!memoryFreeingActionRun) + { + // No usable memory freeing action has been found, so we give up + TRACES("COomActionList::FreeMemory: No usable memory freeing action has been found"); + iMonitor.ResetTargets(); + TInt freeMemory = 0; + iMonitor.GetFreeMemory(freeMemory); + TInt freeSwap = 0; + if (iSwapUsageMonitored) + { + iMonitor.GetFreeSwapSpace(freeSwap); + } + if ((freeMemory >= iCurrentRamTarget) && + ((!iSwapUsageMonitored) || (freeSwap >= iCurrentSwapTarget))) + { + SwitchOffPlugins(); + iMonitor.SetMemoryMonitorStatusProperty(EAboveTreshHold); + } + else + { + if (iMonitor.ActionTrigger() == EClientServerRequestOptionalRam) + { + //We always switch off the plugins after an optional RAM request + SwitchOffPlugins(); + } + iMonitor.SetMemoryMonitorStatusProperty(EBelowTreshHold); + } +#ifdef CLIENT_REQUEST_QUEUE + iMonitor.ActionsCompleted(freeMemory, EFalse); +#else + iServer.CloseAppsFinished(freeMemory, EFalse); +#endif + } + } + +void COomActionList::SwitchOffPlugins() + { + FUNC_LOG; + + TInt actionRefIndex = iActionRefs.Count(); + + // Go through each of the action references, if it's a plugin action then call MemoryGood on it + // Note that this only results in a call to the plugin if FreeMemory has been called on this plugin since that last call to MemoryGood + while (actionRefIndex--) + { + if ((iActionRefs[actionRefIndex].Type() == TActionRef::EAppPlugin) + || (iActionRefs[actionRefIndex].Type() == TActionRef::ESystemPlugin)) + { + iActionRefs[actionRefIndex].RunPlugin().MemoryGood(); + } + } + } + +TInt COomActionList::ComparePriorities(const TActionRef& aPos1, const TActionRef& aPos2 ) + { + FUNC_LOG; + + if (aPos1.Priority()< aPos2.Priority()) + { + return -1; + } + if (aPos1.Priority() > aPos2.Priority()) + { + return 1; + } + + // If priorities are equal then we use hardcoded rules to determine which one is run... + + // All other actions are run in preference to application closures + if ((aPos1.Type() != TActionRef::EAppClose) + && ((aPos2.Type() == TActionRef::EAppClose))) + { + return -1; + } + if ((aPos1.Type() == TActionRef::EAppClose) + && ((aPos2.Type() != TActionRef::EAppClose))) + { + return 1; + } + // If both actions are application closures then the Z order is used to determine which one to run (furthest back application will be closed first) + if ((aPos1.Type() == TActionRef::EAppClose) + && ((aPos2.Type() == TActionRef::EAppClose))) + { + if (aPos1.WgIndex() < aPos2.WgIndex()) + { + return 1; + } + else + { + return -1; + } + //Two Apps should not have equal window group indexes, we panic below if this is the case. + } + + // Application plugins will be run in preference to system plugins + if ((aPos1.Type() == TActionRef::EAppPlugin) + && ((aPos2.Type() == TActionRef::ESystemPlugin))) + { + return -1; + } + if ((aPos1.Type() == TActionRef::ESystemPlugin) + && ((aPos2.Type() == TActionRef::EAppPlugin))) + { + return 1; + } + + // If both actions are application plugins then the Z order of the target app is used to determine which one to run (the one with the furthest back target app will be closed first) + // If the target app is not running then the plugin is run in preference to target apps where the target app is running + if ((aPos1.Type() == TActionRef::EAppPlugin) + && ((aPos2.Type() == TActionRef::EAppPlugin))) + { + // When the target app is not running then the plugin will be run ahead of plugins where the target app is running + if ((aPos1.WgIndex() == KAppNotInWindowGroupList) && (aPos2.WgIndex() != KAppNotInWindowGroupList)) + { + return -1; + } + if ((aPos1.WgIndex() != KAppNotInWindowGroupList) && (aPos2.WgIndex() == KAppNotInWindowGroupList)) + { + return 1; + } + // If the target apps for both plugins are running then compare the Z order + if ((aPos1.WgIndex() != KAppNotInWindowGroupList) && (aPos2.WgIndex() != KAppNotInWindowGroupList)) + { + if (aPos1.WgIndex() < aPos2.WgIndex()) + { + return 1; + } + else + { + return -1; + } + } + // If the target app for neither plugin is running then they are of equal priority + } + //App Close Actions must have a unique priority. + __ASSERT_DEBUG((aPos1.Type() != TActionRef::EAppClose) && (aPos2.Type() != TActionRef::EAppClose), OomMonitorPanic(KAppCloseActionEqualPriorities)); + return 0; + } + +void COomActionList::AppNotExiting(TInt aWgId) + { + FUNC_LOG; + + TInt index = iCloseAppActions.Count(); + while (index--) + { + COomCloseApp* action = iCloseAppActions[index]; + if ( (action->WgId() == aWgId) && (action->IsRunning()) ) + { + TRACES1("COomCloseApp::AppNotExiting: App with window group id %d has not responded to the close event", aWgId); + action->CloseAppEvent(); + } + } + } + +// From MOomActionObserver +// An action has changed state (possibly it has completed freeing memory) +void COomActionList::StateChanged() + { + FUNC_LOG; + + TBool allActionsComplete = ETrue; + + // Note that the actions themselves are responsible for timing out if necessary. + TInt index = iCloseAppActions.Count(); + while ((index--) && (allActionsComplete)) + { + if (iCloseAppActions[index]->IsRunning()) + { + allActionsComplete = EFalse; + } + } + + index = iRunPluginActions.Count(); + while ((index--) && (allActionsComplete)) + { + if (iRunPluginActions[index]->IsRunning()) + { + allActionsComplete = EFalse; + } + } + + if (allActionsComplete) + { + //All immediate actions are complete and iFreeingMemory is being set to false but + //SetMemoryMonitorStatusProperty will not change here because it is possible for the freeing actions to recommence + //in essence, all immediate actions have been completed but not all possible actions have been processed + //and therefore we are still in a memory freeing state + iFreeingMemory = EFalse; + // If all of the actions are complete then check memory and run more if necessary + TInt freeMemory = 0; + iMonitor.GetFreeMemory(freeMemory); + TInt freeSwap = 0; + if (iSwapUsageMonitored) + { + iMonitor.GetFreeSwapSpace(freeSwap); + } + if ((freeMemory < iCurrentRamTarget) || + (iSwapUsageMonitored && (freeSwap < iCurrentSwapTarget))) + // If we are still below the good-memory-threshold then continue running actions + { + iCurrentActionIndex++; + + if (iCurrentActionIndex >= iActionRefs.Count()) + { + // There are no more actions to try, so we give up + TRACES1("COomActionList::StateChanged: All current actions complete, below good threshold with no more actions available. freeMemory=%d", freeMemory); + iMonitor.ResetTargets(); + if ((freeMemory >= iCurrentRamTarget) && + ((!iSwapUsageMonitored) || (freeSwap >= iCurrentSwapTarget))) + { + SwitchOffPlugins(); + iMonitor.SetMemoryMonitorStatusProperty(EAboveTreshHold); + } + else + { + if (iMonitor.ActionTrigger() == EClientServerRequestOptionalRam) + { + //We always switch off the plugins after an optional RAM request + SwitchOffPlugins(); + } + iMonitor.SetMemoryMonitorStatusProperty(EBelowTreshHold); + } +#ifdef CLIENT_REQUEST_QUEUE + iMonitor.ActionsCompleted(freeMemory, EFalse); +#else + iServer.CloseAppsFinished(freeMemory, EFalse); +#endif + } + else + { + // There are still more actions to try, so we continue + TRACES1("COomActionList::StateChanged: All current actions complete, running more actions. freeMemory=%d", freeMemory); + FreeMemory(iMaxPriority); + } + } + else + { + TRACES1("COomActionList::StateChanged: All current actions complete, memory good. freeMemory=%d", freeMemory); + iMonitor.ResetTargets(); + SwitchOffPlugins(); + iMonitor.SetMemoryMonitorStatusProperty(EAboveTreshHold); +#ifdef CLIENT_REQUEST_QUEUE + iMonitor.ActionsCompleted(freeMemory, ETrue); +#else + iServer.CloseAppsFinished(freeMemory, ETrue); +#endif + } + } + + // If some actions are not yet in the idle state then we must continue to wait for them (they will notify us of a state change via a callback) + } + +COomActionList::COomActionList(CMemoryMonitor& aMonitor, CMemoryMonitorServer& aServer, RWsSession& aWs) + : iWs(aWs), iMonitor(aMonitor), iServer(aServer) + { + FUNC_LOG; + } + +void COomActionList::ConstructL(COomConfig& aConfig) + { + FUNC_LOG; + + iCurrentActionIndex = 0; + iSwapUsageMonitored = aConfig.GlobalConfig().iSwapUsageMonitored; + iFreeingMemory = EFalse; + + // Get the list of V1 and V2 plugins available to the system + iPluginList = COomPluginList::NewL(KOomPluginInterfaceUidValue); + iPluginListV2 = COomPluginList::NewL(KOomPluginInterfaceV2UidValue); + // Go through each plugin in the plugin list, create a run-plugin action for each one + TInt pluginIndex = iPluginList->Count(); + while (pluginIndex--) + { + // Get the config for this plugin + COomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(iPluginList->Uid(pluginIndex)); + + // Create an action acording to the config + COomRunPlugin* action = COomRunPlugin::NewL(iPluginList->Uid(pluginIndex), pluginConfig, *this, iPluginList->Implementation(pluginIndex)); + + iRunPluginActions.AppendL(action); + } + + // Go through each V2 in the V2 plugin list, create a run-plugin action for each one + pluginIndex = iPluginListV2->Count(); + while (pluginIndex--) + { + // Get the config for this plugin + COomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(iPluginListV2->Uid(pluginIndex)); + + // Create an action acording to the config + COomRunPlugin* action = COomRunPlugin::NewL(iPluginList->Uid(pluginIndex), pluginConfig, *this, iPluginListV2->Implementation(pluginIndex), &(iPluginListV2->Implementation(pluginIndex))); + + iRunPluginActions.AppendL(action); + } + + //allocate empty COomCloseApp objects + TInt appCloseIndex = aConfig.GlobalConfig().iMaxCloseAppBatch; + while (appCloseIndex--) + { + COomCloseApp* action = COomCloseApp::NewL(*this, iWs); + iCloseAppActions.AppendL(action); + } + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomactionref.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomactionref.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,66 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + + +#include "oomactionref.h" + +TActionRef::TActionRef(TActionType aType, TInt aPriority, TOomSyncMode aSyncMode, TInt aRamEstimate, COomRunPlugin& aRunPlugin, TUint aWgIndexOfTargetApp) + : iType(aType), iPriority(aPriority), iSyncMode(aSyncMode), iRamEstimate(aRamEstimate), iWgIndex(aWgIndexOfTargetApp), iRunPlugin(&aRunPlugin) + { + } + +TActionRef::TActionRef(TActionType aType, TInt aPriority, TOomSyncMode aSyncMode, TInt aRamEstimate, TInt aWgId, TUint aWgIndex) +: iType(aType), iPriority(aPriority), iSyncMode(aSyncMode), iRamEstimate(aRamEstimate), iWgId(aWgId), iWgIndex(aWgIndex), iRunPlugin(NULL) + { + } + + +TActionRef::TActionType TActionRef::Type() const + { + return iType; + } + +TUint TActionRef::Priority() const + { + return iPriority; + } + +TOomSyncMode TActionRef::SyncMode() const + { + return iSyncMode; + } + +TInt TActionRef::RamEstimate() const + { + return iRamEstimate; + } + +TInt TActionRef::WgId() const + { + return iWgId; + } + +TInt TActionRef::WgIndex() const + { + return iWgIndex; + } + +COomRunPlugin& TActionRef::RunPlugin() + { + return *iRunPlugin; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomappclosetimer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomappclosetimer.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,47 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Timer class which implements a timeout for an application close action. +* +*/ + + +#include "oomappclosetimer.h" +#include "oomcloseapp.h" +#include "OomTraces.h" + +COomAppCloseTimer* COomAppCloseTimer::NewL(COomCloseApp& aMonitor) + { + FUNC_LOG; + + COomAppCloseTimer* self = new (ELeave) COomAppCloseTimer(aMonitor); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +COomAppCloseTimer::COomAppCloseTimer(COomCloseApp& aMonitor) +: CTimer(CActive::EPriorityStandard), iMonitor(aMonitor) + { + FUNC_LOG; + + CActiveScheduler::Add(this); + } + +void COomAppCloseTimer::RunL() + { + FUNC_LOG; + + iMonitor.CloseAppEvent(); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomappclosewatcher.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomappclosewatcher.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,84 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: An active object which watches for app close actions successfully completing. +* +*/ + + + +#include "oomappclosewatcher.h" +#include "oomcloseapp.h" +#include "OomTraces.h" + +COomAppCloseWatcher::COomAppCloseWatcher(COomCloseApp& aMonitor) : CActive(CActive::EPriorityStandard), iMonitor(aMonitor) + { + FUNC_LOG; + + CActiveScheduler::Add(this); + } + +COomAppCloseWatcher::~COomAppCloseWatcher() + { + FUNC_LOG; + + Cancel(); + } + +void COomAppCloseWatcher::Start(const TApaTask& aTask) + { + FUNC_LOG; + + if (!IsActive()) + { + TInt err = iThread.Open(aTask.ThreadId()); + if (err == KErrNone) + { + iOriginalProcessPriority = iThread.ProcessPriority(); + iThread.SetProcessPriority(EPriorityForeground); + iThread.Logon(iStatus); + SetActive(); + } + else + { + TRequestStatus* s = &iStatus; + User::RequestComplete(s, err); + SetActive(); + } + } + } + +void COomAppCloseWatcher::DoCancel() + { + FUNC_LOG; + + iThread.LogonCancel(iStatus); + iThread.SetProcessPriority(iOriginalProcessPriority); + iThread.Close(); + } + +void COomAppCloseWatcher::RunL() + { + FUNC_LOG; + + if (iThread.Handle()) + iThread.SetProcessPriority(iOriginalProcessPriority); + iThread.Close(); + // Experimentation shows that memory may take up to 40ms + // to be released back to the system after app thread close. + // Using this delay should minimise the number of apps that + // need to be closed to recover the necessary memory. + const TInt KAppTidyUpDelay = 40000; + User::After(KAppTidyUpDelay); + iMonitor.CloseAppEvent(); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomapplicationconfig.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomapplicationconfig.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,69 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + + +#include "oomapplicationconfig.h" +#include "oomconstants.hrh" +#include "oomcloseappconfig.h" +#include "OomTraces.h" + +COomApplicationConfig* COomApplicationConfig::NewL(TUint aApplicationId) + { + FUNC_LOG; + + COomApplicationConfig* self = new (ELeave) COomApplicationConfig(aApplicationId); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +// Add a rule +// This class takes ownership of the given rule +// This rule applies to this application itself (and not a plugin associated with this application) +// The rule would usually apply to an "application close" event +void COomApplicationConfig::AddRuleL(MOomRuleConfig* aRule) + { + FUNC_LOG; + + __ASSERT_ALWAYS(iCloseAppConfig, OomMonitorPanic(KRuleConfiguredBeforeApplication)); + + iCloseAppConfig->AddRuleL(aRule); + } + +COomApplicationConfig::~COomApplicationConfig() + { + FUNC_LOG; + + delete iCloseAppConfig; + } + +void COomApplicationConfig::ConstructL() + { + FUNC_LOG; + + iGoodRamThreshold = KOomThresholdUnset; + iLowRamThreshold = KOomThresholdUnset; + iGoodSwapThreshold = KOomThresholdUnset; + iLowSwapThreshold = KOomThresholdUnset; + } + +COomApplicationConfig::COomApplicationConfig(TUint aApplicationId) : iApplicationId(aApplicationId) + { + FUNC_LOG; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,359 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: COomClientRequestQueue.cpp. +* +*/ + + + +#include "oomclientrequestqueue.h" +#include "OomTraces.h" +#include "oomsubscribehelper.h" +#include "oompanic.h" +#include "oommemorymonitor.h" +#include + +const TInt KOomWatchDogStatusIdle = -1; +const TInt KClientTimeToFreeMemory = 500000; //microseconds + +COomClientRequestQueue::COomClientRequestQueue(CMemoryMonitor& aMonitor) + :iQueue(_FOFF(TClientRequest,iLink)), + iMonitor(aMonitor) + { + FUNC_LOG; + } + +COomClientRequestQueue::~COomClientRequestQueue() + { + FUNC_LOG; + + if (iWatchdogStatusSubscriber) + { + iWatchdogStatusSubscriber->StopSubscribe(); + } + iWatchdogStatusProperty.Close(); + delete iWatchdogStatusSubscriber; + + if (iClientRequestTimer) + { + iClientRequestTimer->Cancel(); + } + delete iClientRequestTimer; + + TClientRequest* request; + TSglQueIter iter(iQueue); + iter.SetToFirst(); + while (iter) + { + request = iter++; + iQueue.Remove(*request); + delete request; + }; + } + +COomClientRequestQueue* COomClientRequestQueue::NewL(CMemoryMonitor& aMonitor) + { + FUNC_LOG; + + COomClientRequestQueue* self = new (ELeave) COomClientRequestQueue(aMonitor); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +void COomClientRequestQueue::ConstructL() + { + FUNC_LOG; + + TInt err = iWatchdogStatusProperty.Attach(KPSUidUikon, KUikOOMWatchdogStatus); + + TRACES1("COomClientRequestQueue::ConstructL: KUikOOMWatchdogStatus err = %d", err); + + err = iWatchdogStatusProperty.Set(KOomWatchDogStatusIdle); + + iWatchdogStatusSubscriber = new (ELeave) CSubscribeHelper(TCallBack(WatchdogStatusStatusChanged, this), iWatchdogStatusProperty); + iWatchdogStatusSubscriber->Subscribe(); + + + iClientRequestTimer = COomClientRequestTimer::NewL(*this); + } + +void COomClientRequestQueue::RequestFreeMemoryL(const RMessage2& aMessage) + { + FUNC_LOG; + + TClientRequest* request = new (ELeave) TClientRequest(EClientServerRequestFreeMemory, aMessage); + CleanupStack::PushL(request); + AddClientRequestL(*request); + CleanupStack::Pop(request); + } + +void COomClientRequestQueue::RequestOptionalRamL(const RMessage2& aMessage) + { + FUNC_LOG; + + TClientRequest* request = new (ELeave) TClientRequest(EClientServerRequestOptionalRam, aMessage); + CleanupStack::PushL(request); + AddClientRequestL(*request); + CleanupStack::Pop(request); + } + +TInt COomClientRequestQueue::WatchdogStatusStatusChanged(TAny* aPtr) + { + FUNC_LOG; + + COomClientRequestQueue* self = static_cast(aPtr); + if (self) + { + self->HandleWatchdogStatusCallBack(); + } + return KErrNone; + } + +void COomClientRequestQueue::HandleWatchdogStatusCallBack() + { + FUNC_LOG; + + // Someone has set the key to request some free memory. + TInt memoryRequested = 0; + iWatchdogStatusProperty.Get(memoryRequested); + + // Try to free the RAM. + if (memoryRequested >= 1) + { + TClientRequest request = TClientRequest(EPublishAndSubscribe, memoryRequested); + TRAP_IGNORE(AddClientRequestL(request)); + } + // Set the key back to KOomWatchDogStatusIdle to indicate we're done. + iWatchdogStatusProperty.Set(KOomWatchDogStatusIdle); + } + +// The new request is added to the queue, then we have the following conditions: +// 1. A client request is currently being processed +// 2. The last client request completed less than KClientTimeToFreeMemory microseconds ago -> start the timer +// 3. The timer has already been started +// 4. none of the above -> process this request +void COomClientRequestQueue::AddClientRequestL(TClientRequest& request) + { + FUNC_LOG; + + iQueue.AddLast(request); + + if ( !iClientRequestActive && !iClientRequestTimer->IsActive() ) + { + TTime now; + now.UniversalTime(); + TInt64 interval64 = (now.MicroSecondsFrom(iLastClientCompletedTime)).Int64(); + TRACES3("COomClientRequestQueue::AddClientRequestL: now = %Ld, iLastClientCompletedTime = %Ld, interval64 = %Ld", + now.Int64(), iLastClientCompletedTime.Int64(), interval64); + + if ( interval64 < 0) + { + //If the system time is moved backwards we lose the information about when the last request was + //made, so we wait for KClientTimeToFreeMemory microseconds + iClientRequestTimer->After(TTimeIntervalMicroSeconds32(KClientTimeToFreeMemory)); + } + else if ( interval64 < KClientTimeToFreeMemory) + { + //The last completed client is given KClientTimeToFreeMemory microseconds to allocate the memory + //it requested + iClientRequestTimer->After(TTimeIntervalMicroSeconds32(interval64)); + } + else + { + StartClientRequestL(); + } + } + } + +void COomClientRequestQueue::StartClientRequestL() + { + FUNC_LOG; + + iClientRequestActive = ETrue; + + TClientRequest* request = iQueue.First(); + + RThread clientThread; + TInt err = (request->iRequestFreeRamMessage).Client(clientThread); + TBool dataPaged = EFalse; + if(err == KErrNone) + { + RProcess processName; + err = clientThread.Process(processName); + dataPaged = processName.DefaultDataPaged(); + } + else + { + OomMonitorPanic(KInvalidClientRequestType); + } + + + switch (request->iClientRequestType) + { + case EClientServerRequestOptionalRam: + { + TInt pluginId = request->iRequestFreeRamMessage.Int2(); + iMonitor.FreeOptionalRamL(request->iBytesRequested, pluginId, dataPaged); + break; + } + case EClientServerRequestFreeMemory: + iMonitor.RequestFreeMemoryL(request->iBytesRequested, dataPaged); + break; + case EPublishAndSubscribe: + iMonitor.RequestFreeMemoryPandSL(request->iBytesRequested); + break; + default: + OomMonitorPanic(KInvalidClientRequestType); + break; + } + } + +CMemoryMonitor& COomClientRequestQueue::Monitor() + { + FUNC_LOG; + + return iMonitor; + } + +TClientRequest::TClientRequest(TActionTriggerType aClientRequestType, TInt aBytesRequested) + : iClientRequestType(aClientRequestType), iBytesRequested(aBytesRequested) + { + FUNC_LOG; + } + +TClientRequest::TClientRequest(TActionTriggerType aClientRequestType, const RMessage2& aRequestFreeRam) + : iClientRequestType(aClientRequestType), iRequestFreeRamMessage(aRequestFreeRam) + { + FUNC_LOG; + + iBytesRequested = aRequestFreeRam.Int0(); + } + +void COomClientRequestQueue::ActionsCompleted(TInt aBytesFree, TBool aMemoryGood) + { + FUNC_LOG; + + if (iClientRequestActive) + { +#ifdef _DEBUG + TSglQueIter iter(iQueue); + iter.SetToFirst(); + TClientRequest* req; + while (iter) + { + req = iter++; + TActionTriggerType crt = req->iClientRequestType; + TInt bytes = req->iBytesRequested; + TRACES2("COomClientRequestQueue::ActionsCompleted Printing Queue: Type = %d, Bytes Requested = %d", crt, bytes); + }; +#endif + + __ASSERT_DEBUG(!iQueue.IsEmpty(), OomMonitorPanic(KClientQueueNotEmpty)); + __ASSERT_DEBUG(!iClientRequestTimer->IsActive(), OomMonitorPanic(KClientRequestTimerActive)); + + TClientRequest* request = iQueue.First(); + RMessage2 message; + + switch (request->iClientRequestType) + { + case EClientServerRequestOptionalRam: + message = request->iRequestFreeRamMessage; + if (!message.IsNull()) + { + TInt memoryAvailable = aBytesFree - iMonitor.GoodRamThreshold(); + TInt minimumNeeded = message.Int1(); + if (memoryAvailable >= minimumNeeded) + { + message.Complete(memoryAvailable); + } + else + { + message.Complete(KErrNoMemory); + } + } + break; + case EClientServerRequestFreeMemory: + message = request->iRequestFreeRamMessage; + if (!message.IsNull()) + { + // If memory available is greater than the requested RAM then complete with the amount of free memory, otherwise complete with KErrNoMemory + message.Complete(aMemoryGood ? KErrNone : KErrNoMemory); + } + break; + case EPublishAndSubscribe: + // No action required for P&S key + break; + default: + OomMonitorPanic(KInvalidClientRequestType); + break; + } + + iClientRequestActive = EFalse; + iQueue.Remove(*request); + delete request; + + iLastClientCompletedTime.UniversalTime(); + + if (!iQueue.IsEmpty()) + { + //We give the client KClientTimeToFreeMemory microseconds to free the memory it requested before + //processing the next request + iClientRequestTimer->After(TTimeIntervalMicroSeconds32(KClientTimeToFreeMemory)); + } + } + } + +void COomClientRequestQueue::RequestTimerCallbackL() + { + FUNC_LOG; + + __ASSERT_DEBUG(!iQueue.IsEmpty(), OomMonitorPanic(KClientQueueNotEmpty)); + + StartClientRequestL(); + } + +COomClientRequestTimer* COomClientRequestTimer::NewL(COomClientRequestQueue& aQueue) + { + FUNC_LOG; + + COomClientRequestTimer* self = new (ELeave) COomClientRequestTimer(aQueue); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +COomClientRequestTimer::COomClientRequestTimer(COomClientRequestQueue& aQueue) +: CTimer(CActive::EPriorityStandard), iClientRequestQueue(aQueue) + { + FUNC_LOG; + + CActiveScheduler::Add(this); + } + + +void COomClientRequestTimer::RunL() + { + FUNC_LOG; + + iClientRequestQueue.RequestTimerCallbackL(); + } + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomcloseapp.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomcloseapp.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,123 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#include + +#include "oomcloseapp.h" +#include "OomTraces.h" +#include "oomappclosetimer.h" +#include "oomappclosewatcher.h" +#include "oomactionref.h" +#include "oommemorymonitor.h" +#include "oomconstants.hrh" +#include "oompanic.h" + +COomCloseApp* COomCloseApp::NewL(MOomActionObserver& aStateChangeObserver, RWsSession& aWs) + { + FUNC_LOG; + + COomCloseApp* self = new (ELeave) COomCloseApp(aStateChangeObserver, aWs); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +// Close the application in order to free memory +// Call the COomAction::MemoryFreed when it is done +void COomCloseApp::FreeMemory(TInt, TBool aIsDataPaged) + { + FUNC_LOG; + + iAppCloserRunning = ETrue; + + // Set the TApaTask to the app + iCurrentTask.SetWgId(iWgId); + + __ASSERT_DEBUG(!iAppCloseTimer->IsActive(), OomMonitorPanic(KStartingActiveCloseAppTimer)); + __ASSERT_DEBUG(!iAppCloseWatcher->IsActive(), OomMonitorPanic(KStartingActiveAppCloseWatcher)); + // Start a timer and the thread watcher + iAppCloseTimer->After(CMemoryMonitor::GlobalConfig().iMaxAppExitTime * KMicrosecondsInMillisecond); + iAppCloseWatcher->Start(iCurrentTask); + // Tell the app to close + TRACES1("COomCloseApp::FreeMemory: Closing app with window group id %d",iWgId); + + RThread thread; + TInt err=thread.Open(iCurrentTask.ThreadId()); + if (!err) + { + RProcess process; + thread.Process(process); + TBool isDataPaged = process.DefaultDataPaged(); + if((aIsDataPaged && isDataPaged) || (!aIsDataPaged && !isDataPaged )) + { + iCurrentTask.EndTask(); + } + } + } + +COomCloseApp::~COomCloseApp() + { + FUNC_LOG; + + if (iAppCloseTimer) + iAppCloseTimer->Cancel(); + + if (iAppCloseWatcher) + iAppCloseWatcher->Cancel(); + + delete iAppCloseTimer; + delete iAppCloseWatcher; + } + +// Callback from COomAppCloseWatcher and COomAppCloseTimer +void COomCloseApp::CloseAppEvent() + { + FUNC_LOG; + + // The application has closed (or we have a timeout) + iAppCloserRunning = EFalse; + + if (iAppCloseTimer) + iAppCloseTimer->Cancel(); + if (iAppCloseWatcher) + iAppCloseWatcher->Cancel(); + + MemoryFreed(KErrNone); + } + +void COomCloseApp::Reconfigure(const TActionRef& aRef) + { + FUNC_LOG; + + iWgId = aRef.WgId(); + } + +void COomCloseApp::ConstructL() + { + FUNC_LOG; + + iAppCloseTimer = COomAppCloseTimer::NewL(*this); + iAppCloseWatcher = new(ELeave) COomAppCloseWatcher(*this); + } + +COomCloseApp::COomCloseApp(MOomActionObserver& aStateChangeObserver, RWsSession& aWs) + : COomAction(aStateChangeObserver), iCurrentTask(aWs) + { + FUNC_LOG; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomcloseappconfig.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomcloseappconfig.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,42 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + + +#include "oomcloseappconfig.h" +#include "OomTraces.h" + +COomCloseAppConfig* COomCloseAppConfig::NewL(TInt32 aId) + { + FUNC_LOG; + + COomCloseAppConfig* self = new (ELeave) COomCloseAppConfig(aId); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +COomCloseAppConfig::~COomCloseAppConfig() + { + FUNC_LOG; + } + +COomCloseAppConfig::COomCloseAppConfig(TInt32 aId) : COomActionConfig(aId) + { + FUNC_LOG; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomconfig.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomconfig.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,195 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + + +#include + +#include "oomconfig.h" +#include "oomconstants.hrh" +#include "oomapplicationconfig.h" +#include "oomrunpluginconfig.h" +#include "oomcloseappconfig.h" +#include "OomTraces.h" + +COomConfig* COomConfig::NewL() + { + FUNC_LOG; + + COomConfig* self = new (ELeave) COomConfig; + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + + +// Add the configuration for an application closure. +// This class takes ownership of this action. +void COomConfig::SetAppCloseConfigL(COomCloseAppConfig* aActionConfig) + { + FUNC_LOG; + + // Find the right application config (if there is one) for the app + // The map actually contains pointers for values, so we get pointers to pointers here... + COomApplicationConfig** applicationConfigPointer = iApplicationToConfigMapping.Find(aActionConfig->iId); + + // Used to de-reference the pointer-to-pointer, hopefully making the code more readable + COomApplicationConfig* applicationConfig = NULL; + + // Create a new COomApplicationConfig if there isn't one for this app + if (!applicationConfigPointer) + { + applicationConfig = COomApplicationConfig::NewL(aActionConfig->iId); + iApplicationToConfigMapping.InsertL(aActionConfig->iId, applicationConfig); + } + else + { + applicationConfig = *applicationConfigPointer; + } + + // Append the action config to the appropriate list (the list for the relevant application) + applicationConfig->SetAppCloseConfig(aActionConfig); + } + +// Add the configuration for a plugin action. +// This class takes ownership of the configuration object. +void COomConfig::AddPluginConfigL(COomRunPluginConfig* aPluginConfig) + { + FUNC_LOG; + + // Check if the plugin has already been added, if so then this is an error in configuration (something is trying to add the same plugin twice) + COomRunPluginConfig** runPluginConfig = iPluginToConfigMapping.Find(aPluginConfig->Id()); + if (runPluginConfig) + { + OomMonitorPanic(KPluginConfigAddedTwice); + } + + iPluginToConfigMapping.InsertL(aPluginConfig->Id(), aPluginConfig); + + } + +// Add a rule +// This class takes ownership of the given rule +// This rule applies to the specified application (and not a plugin associated with this application) +// The rule would usually apply to an "application close" event +void COomConfig::AddApplicationRuleL(TUint aTargetAppId, MOomRuleConfig* aRule) + { + FUNC_LOG; + + COomApplicationConfig** applicationConfig = iApplicationToConfigMapping.Find(aTargetAppId); + + if (applicationConfig) + { + (*applicationConfig)->AddRuleL(aRule); + } + else + { + OomMonitorPanic(KRuleConfiguredBeforeApplication); + } + } + +// Add a rule for a plugin +// This class takes ownership of the given rule +// This rule is applied to the plugin with the specified ID +void COomConfig::AddPluginRuleL(TUint aPluginId, MOomRuleConfig* aRule) + { + FUNC_LOG; + + COomRunPluginConfig** runPluginConfig = iPluginToConfigMapping.Find(aPluginId); + + if (runPluginConfig) + { + (*runPluginConfig)->AddRuleL(aRule); + } + else + { + OomMonitorPanic(KRuleConfiguredBeforePlugin); + } + } + +// Add this application config - this class takes ownership of it +// Application config includes settings for a particular application, e.g. whether or not it can be closed +void COomConfig::AddApplicationConfigL(COomApplicationConfig* aApplicationConfig) + { + FUNC_LOG; + + // Check if the application has already been added, if so then this is an error in configuration (something is trying to add the same app twice) + COomApplicationConfig** applicationConfig = iApplicationToConfigMapping.Find(aApplicationConfig->Id()); + if (applicationConfig) + { + OomMonitorPanic(KAppConfigAddedTwice); + } + + iApplicationToConfigMapping.InsertL(aApplicationConfig->Id(), aApplicationConfig); + } + +// Get the list of configured actions for the given app id +// If no specific actions have been configured for this application then the default action is returned +COomApplicationConfig& COomConfig::GetApplicationConfig(TInt32 aAppId) + { + FUNC_LOG; + + COomApplicationConfig** applicationConfig = iApplicationToConfigMapping.Find(aAppId); + + if (!applicationConfig) + applicationConfig = iApplicationToConfigMapping.Find(KOomDefaultAppId); + + // The default app configuration should always exist + __ASSERT_ALWAYS(applicationConfig, OomMonitorPanic(KOomDefaultAppNotConfigured)); + + return *(*applicationConfig); + } + +// Get the plugin configuration for the given plugin id +// If no specific actions have been configured for this plugin then the default plugin configuration is returned +COomRunPluginConfig& COomConfig::GetPluginConfig(TInt32 aPluginId) + { + FUNC_LOG; + + COomRunPluginConfig** runPluginConfig = iPluginToConfigMapping.Find(aPluginId); + + if (!runPluginConfig) + runPluginConfig = iPluginToConfigMapping.Find(KOomDefaultPluginId); + + // The default app configuration should always exist + __ASSERT_ALWAYS(runPluginConfig, OomMonitorPanic(KOomDefaultPluginNotConfigured)); + + return *(*runPluginConfig); + } + +COomConfig::~COomConfig() + { + FUNC_LOG; + + // Iterate through the hash map deleting all of the items + RHashMap::TIter iterator(iApplicationToConfigMapping); + while (iterator.NextValue()) + delete iterator.CurrentValue(); + + // Iterate through the plugiun hash map deleting all of the items + RHashMap::TIter pluginIterator(iPluginToConfigMapping); + while (pluginIterator.NextValue()) + delete pluginIterator.CurrentValue(); + + iApplicationToConfigMapping.Close(); + } + +void COomConfig::ConstructL() + { + FUNC_LOG; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomconfigparser.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomconfigparser.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,1149 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: The parser for the OOM configuration file. +* +*/ +#include +#include + +#include "oomconfigparser.h" +#include "oompanic.h" +#include "OomTraces.h" +#include "oomidletimerule.h" +#include "oomforegroundrule.h" +#include "oomconstants.hrh" +#include "oomapplicationconfig.h" +#include "oomcloseappconfig.h" +#include "oomconfig.h" +#include "oomrunpluginconfig.h" + +enum TOomConfigParserPanic +{ +KOomErrMoreThanOneOomConfig = 0, +KOomErrGlobalSettingsMustComeAfterRoot, +KOomErrAppSettingsMustComeAfterGlobalSettings, +KOomErrCloseAppSettingsMustComeAfterAppSettings, +KOomErrAppIdleSettingsMustComeAfterAppCloseSettings, +KOomErrLowRamErrorInGlobalSettings, +KOomErrGoodRamErrorInGlobalSettings, +KOomErrSwapUsageMonitoredErrorInGlobalSettings, +KOomErrLowSwapErrorInGlobalSettings, +KOomErrGoodSwapErrorInGlobalSettings, +KOomErrMaxCloseErrorInGlobalSettings, +KOomErrDefaultPriorityErrorInGlobalSettings, +KOomErrMissingUidFromAppCloseConfig, +KOomErrMissingPriorityFromAppCloseConfig, +KOomErrMissingSyncModeFromAppCloseConfig, +KOomErrMissingEstimateFromAppCloseConfig, +KOomErrInvalidSyncMode, +KOomErrMissingSyncModeInAppCloseConfig, +KOomErrBadOrMissingPriorityInAppIdleRule, +KOomErrBadOrMissingIdleTimeInAppIdleRule, +KOomErrBadOrMissingUidInAppIdleRule, +KOomErrBadNeverCloseValue, +KOomErrBadOrMissingUidInAppConfig, +KOomErrBadOrMissingPriorityInAppCloseConfig, +KOomErrBadLowThresholdValueForAppConfig, +KOomErrBadGoodThresholdValueForAppConfig, +KOomErrSystemPluginSettingsMustComeAfterAppCloseSettings, +KOomErrAppPluginSettingsMustComeAfterSystemPluginSettings, +KOomErrAppPluginIdleTimeRulesMustComeAfterAppPluginSettings, +KOomErrBadOrMissingUidInAppCloseConfig, +KOomErrBadOrMissingUidInSystemPluginConfig, +KOomErrBadOrMissingPriorityInSystemPluginConfig, +KOomErrBadOrMissingTargetAppIdInAppPluginConfig, +KOomErrBadOrMissingUidInAppPluginConfig, +KOomErrBadOrMissingPriorityInAppPluginConfig, +KOomErrBadOrMissingPriorityInPluginIdleRule, +KOomErrBadOrMissingIdleTimeInPluginIdleRule, +KOomErrBadOrMissingUidInPluginIdleRule, +KOomErrBadOrMissingUidInForegroundAppRule, +KOomErrBadOrMissingPriorityInForegroundAppRule, +KOomErrBadOrMissingTargetAppIdInForegroundAppRule, +KOomErrDefaultWaitAfterPluginInGlobalSettings, +KOomErrBadOrMissingPriorityInForceCheck, +KOomErrOomRulesMustComeLast, +KOomErrBadPluginWaitTime, +KOomErrBadXml, +KOomErrAppCloseIdleRuleOutsideAppCloseElement, +KOomErrForegroundAppRuleOutsideAppCloseElement, +KOomErrPluginIdleRuleOutsideAppPluginElement, +KOomErrPluginForegroundRuleOutsidePluginElement, +KOomErrBadCallIfTargetAppNotRunning +}; + +const TInt KOomXmlFileBufferSize = 1024; +const TInt KOomMaxAppExitTime = 2000; +const TInt KBytesInMegabyte = 1024; +#ifdef __WINS__ +const TInt KEmulatorTickDivisor = 5; // The tick is 5 times slower on the emulator than on the phone +#endif +using namespace Xml; + +// Mime type of the parsed document +_LIT8(KXmlMimeType, "text/xml"); + +_LIT(KOomConfigFilePath, ":\\private\\10207218\\oomconfig.xml"); +_LIT(KRomDrive, "z"); + +// Element strings +// Root +_LIT8(KOomConfigOomConfig, "oom_config"); + +// Global settings +_LIT8(KOomConfigGlobalSettings, "global_settings"); +_LIT8(KOomConfigForceCheckAtPriority, "force_check"); + +// App settings +_LIT8(KOomConfigAppSettings, "app_specific_thresholds"); +_LIT8(KOomConfigApp, "app"); + +// App close settings +_LIT8(KOomConfigAppCloseSettings, "app_close_settings"); +_LIT8(KOomConfigCloseApp, "close_app"); + +// App close idle time +_LIT8(KOomConfigAppCloseIdlePriority, "app_close_idle_priority"); + +_LIT8(KOomConfigForegroundAppPriority, "foreground_app_priority"); + +// Global settings attribute names +_LIT8(KOomAttributeLowRamThreshold, "low_ram_threshold"); +_LIT8(KOomAttributeGoodRamThreshold, "good_ram_threshold"); +_LIT8(KOomAttributeSwapUsageMonitored, "swap_usage_monitored"); +_LIT8(KOomAttributeLowSwapThreshold, "low_swap_threshold"); +_LIT8(KOomAttributeGoodSwapThreshold, "good_swap_threshold"); +_LIT8(KOomAttributeMaxAppCloseBatch, "max_app_close_batch"); +_LIT8(KOomAttributeDefaultWaitAfterPlugin, "default_wait_after_plugin"); +_LIT8(KOomAttributeMaxAppExitTime , "max_app_exit_time"); + +// System plugins + +_LIT8(KOomAttributeSystemPluginSettings, "system_plugin_settings"); +_LIT8(KOomAttributeSystemPlugin, "system_plugin"); + +// Application plugins + +_LIT8(KOomAttributeAppPluginSettings, "app_plugin_settings"); +_LIT8(KOomAttributeAppPlugin, "app_plugin"); + +// Plugin idle time rules + +_LIT8(KOomAttributePluginIdlePriority, "plugin_idle_priority"); + +// Plugin foreground app rules +_LIT8(KOomAttributePluginForegroundAppPriority, "plugin_foreground_app_priority"); + +// Atribute names +_LIT8(KOomAttibuteUid, "uid"); +_LIT8(KOomAttibuteSyncMode, "sync_mode"); +_LIT8(KOomAttibutePriority, "priority"); +_LIT8(KOomAttibuteRamEstimate, "ram_estimate"); + +_LIT8(KOomConfigSyncModeContinue, "continue"); +_LIT8(KOomConfigSyncModeCheck, "check"); +_LIT8(KOomConfigSyncModeEstimate, "estimate"); + +_LIT8(KOomAttibuteIdleTime, "idle_time"); +_LIT8(KOomAttibuteIdlePriority, "priority"); + +_LIT8(KOomAttibuteNeverClose, "NEVER_CLOSE"); + +_LIT8(KOomAttributeTargetAppId, "target_app_id"); + +_LIT8(KOomAttributeWait, "wait"); + +_LIT8(KOomAttributeIfForegroundAppId, "if_foreground_app_id"); + +_LIT8(KOomAttributeCallIfTargetAppNotRunning, "call_if_target_app_not_running"); +_LIT8(KOomAttributeTrue, "true"); +_LIT8(KOomAttributeFalse, "false"); +_LIT8(KOomAttribute0, "0"); +_LIT8(KOomAttribute1, "1"); + + +_LIT8(KOomConfigDefaultAppUid, "DEFAULT_APP"); +_LIT8(KOomConfigDefaultPluginUid, "DEFAULT_PLUGIN"); +_LIT8(KOomConfigTargetAppValue, "TARGET_APP"); + +_LIT8(KOomConfigBusyAppUid, "BUSY_APP"); +_LIT8(KOomConfigHighPriorityAppUid, "HIGH_PRIORITY_APP"); + +COomConfigParser::COomConfigParser(COomConfig& aConfig, RFs& aFs) : iConfig(aConfig), iFs(aFs), iState(EOomParsingStateNone) + { + } + +void COomConfigParser::ParseL() + { + FUNC_LOG; + + TRACES("COomConfigParser::ParseL: Parsing Config File"); + + CParser* parser = CParser::NewLC(KXmlMimeType, *this); + + RFile configFile; + TFileName configFileName; + TChar driveChar = iFs.GetSystemDriveChar(); + configFileName.Append(driveChar); + configFileName.Append(KOomConfigFilePath); + if (configFile.Open(iFs, configFileName, EFileShareExclusive) != KErrNone) + { + configFileName.Replace(0,1,KRomDrive); //replace 'c' with 'z' + User::LeaveIfError(configFile.Open(iFs, configFileName, EFileShareExclusive)); + } + CleanupClosePushL(configFile); + + TBuf8 fileBuffer; + TInt bytesRead; + do + { + User::LeaveIfError(configFile.Read(fileBuffer)); + bytesRead = fileBuffer.Size(); + + parser->ParseL(fileBuffer); + + } while (bytesRead != 0); + + CleanupStack::PopAndDestroy(2, parser); // config file - automatically closes it + // parser + + TRACES("COomConfigParser::ParseL: Finished Parsing Config File"); + } + +void COomConfigParser::OnStartDocumentL(const RDocumentParameters&, TInt) + { + FUNC_LOG; + } + +void COomConfigParser::OnEndDocumentL(TInt) + { + FUNC_LOG; + } + + +void COomConfigParser::OnEndElementL(const RTagInfo&, TInt) + { + } + +void COomConfigParser::OnContentL(const TDesC8&, TInt) + { + } + +void COomConfigParser::OnStartPrefixMappingL(const RString&, const RString&, + TInt) + { + } + +void COomConfigParser::OnEndPrefixMappingL(const RString&, TInt) + { + } + +void COomConfigParser::OnIgnorableWhiteSpaceL(const TDesC8&, TInt) + { + } + +void COomConfigParser::OnSkippedEntityL(const RString&, TInt) + { + } + +void COomConfigParser::OnProcessingInstructionL(const TDesC8&, const TDesC8&, + TInt) + { + } + +void COomConfigParser::OnError(TInt) + { + } + +TAny* COomConfigParser::GetExtendedInterface(const TInt32) + { + return 0; + } + +void COomConfigParser::OnStartElementL(const RTagInfo& aElement, const RAttributeArray& aAttributes, + TInt aErrorCode) + { + if (aErrorCode != KErrNone) + ConfigError(KOomErrBadXml); + + StartElementL(aElement.LocalName().DesC(), aAttributes); + } + +void COomConfigParser::StartElementL(const TDesC8& aLocalName, + const RAttributeArray& aAttributes) + { + // Root + if (aLocalName == KOomConfigOomConfig) + { + if (iState != EOomParsingStateNone) + ConfigError(KOomErrMoreThanOneOomConfig); + + ChangeState(EOomParsingStateRoot); + } + // Parse main elements + else if (aLocalName == KOomConfigGlobalSettings) + { + if (iState != EOomParsingStateRoot) + ConfigError(KOomErrGlobalSettingsMustComeAfterRoot); + + SetGlobalSettings(aAttributes); + + ChangeState(EOomParsingStateGlobalSettings); + } + else if (aLocalName == KOomConfigAppSettings) + { + ChangeState(EOomParsingStateAppSettings); + } + else if (aLocalName == KOomConfigAppCloseSettings) + { + ChangeState(EOomParsingStateAppCloseSettings); + } + else if (aLocalName == KOomAttributeSystemPluginSettings) + { + ChangeState(EOomParsingStateSystemPluginSettings); + } + else if (aLocalName == KOomAttributeAppPluginSettings) + { + ChangeState(EOomParsingStateAppPluginSettings); + } + // Parse actual configuration elements + else if (aLocalName == KOomConfigForceCheckAtPriority) + { + SetForceCheckConfigL(aAttributes); + } + else if (aLocalName == KOomConfigApp) + { + SetAppConfigL(aAttributes); + } + else if (aLocalName == KOomConfigCloseApp) + { + SetCloseAppConfigL(aAttributes); + } + else if (aLocalName == KOomConfigAppCloseIdlePriority) + { + CheckState(EOomParsingStateAppCloseSettings, KOomErrAppCloseIdleRuleOutsideAppCloseElement); + SetAppCloseIdlePriorityConfigL(aAttributes); + } + else if (aLocalName == KOomConfigForegroundAppPriority) + { + CheckState(EOomParsingStateAppCloseSettings, KOomErrForegroundAppRuleOutsideAppCloseElement); + SetForegroundAppPriorityL(aAttributes); + } + else if (aLocalName == KOomAttributeSystemPlugin) + { + SetSystemPluginConfigL(aAttributes); + } + else if (aLocalName == KOomAttributeAppPlugin) + { + SetAppPluginConfigL(aAttributes); + } + else if (aLocalName == KOomAttributePluginIdlePriority) + { + CheckState(EOomParsingStateAppPluginSettings, KOomErrPluginIdleRuleOutsideAppPluginElement); + SetPluginIdlePriorityL(aAttributes); + } + else if (aLocalName == KOomAttributePluginForegroundAppPriority) + { + CheckState(EOomParsingStateAppPluginSettings, EOomParsingStateSystemPluginSettings, KOomErrPluginForegroundRuleOutsidePluginElement); + SetPluginForegroundAppPriorityL(aAttributes); + } + + } + +void COomConfigParser::ConfigError(TInt aError) + { + OomConfigParserPanic(aError); + } + +void COomConfigParser::SetGlobalSettings(const RAttributeArray& aAttributes) + { + TInt defaultLowMemoryThreshold; + TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeLowRamThreshold, defaultLowMemoryThreshold); + + if (err == KErrNone) + iConfig.SetDefaultLowRamThreshold(defaultLowMemoryThreshold * KBytesInMegabyte); + else + ConfigError(KOomErrLowRamErrorInGlobalSettings); + + if (err == KErrNone) + { + TInt defaultGoodMemoryThreshold; + TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeGoodRamThreshold, defaultGoodMemoryThreshold); + + if (err == KErrNone) + iConfig.SetDefaultGoodRamThreshold(defaultGoodMemoryThreshold * KBytesInMegabyte); + else + ConfigError(KOomErrGoodRamErrorInGlobalSettings); + } + + if (err == KErrNone) + { + TInt swapUsageMonitored; + TInt err = GetValueFromBooleanAttributeList(aAttributes, KOomAttributeSwapUsageMonitored, swapUsageMonitored); + + if (err == KErrNone) + iConfig.SetSwapUsageMonitored(swapUsageMonitored); + else + ConfigError(KOomErrSwapUsageMonitoredErrorInGlobalSettings); + } + + if (err == KErrNone) + { + TInt defaultLowSwapThreshold; + TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeLowSwapThreshold, defaultLowSwapThreshold); + + if (err == KErrNone) + iConfig.SetDefaultLowSwapThreshold(defaultLowSwapThreshold * KBytesInMegabyte); + else + ConfigError(KOomErrLowSwapErrorInGlobalSettings); + } + + if (err == KErrNone) + { + TInt defaultGoodSwapThreshold; + TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeGoodSwapThreshold, defaultGoodSwapThreshold); + + if (err == KErrNone) + iConfig.SetDefaultGoodSwapThreshold(defaultGoodSwapThreshold * KBytesInMegabyte); + else + ConfigError(KOomErrGoodSwapErrorInGlobalSettings); + } + + if (err == KErrNone) + { + TInt defaultMaxCloseAppBatch; + TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeMaxAppCloseBatch, defaultMaxCloseAppBatch); + + if (err == KErrNone) + iConfig.SetMaxCloseAppBatch(defaultMaxCloseAppBatch); + else + ConfigError(KOomErrMaxCloseErrorInGlobalSettings); + } + + if (err == KErrNone) + { + TInt defaultWaitAfterPlugin; + TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeDefaultWaitAfterPlugin, defaultWaitAfterPlugin); + + if (err == KErrNone) + iConfig.SetDefaultWaitAfterPlugin(defaultWaitAfterPlugin); + else + ConfigError(KOomErrDefaultWaitAfterPluginInGlobalSettings); + } + + if (err == KErrNone) + { + TInt maxAppExitTime; + TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeMaxAppExitTime, maxAppExitTime); + + if (err == KErrNone) + iConfig.SetMaxAppExitTime(maxAppExitTime); + else + iConfig.SetMaxAppExitTime(KOomMaxAppExitTime); + } + } + +void COomConfigParser::SetForceCheckConfigL(const RAttributeArray& aAttributes) + { + TUint priority; + TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibutePriority, priority); + if (err == KErrNone) + { + iConfig.GlobalConfig().AddForceCheckPriorityL(priority); + } + else + { + ConfigError(KOomErrBadOrMissingPriorityInForceCheck); + } + } + +void COomConfigParser::SetAppConfigL(const RAttributeArray& aAttributes) + { + TUint uid; + COomApplicationConfig* appConfig = NULL; + + TInt err = GetValueFromHexAttributeList(aAttributes, KOomAttibuteUid, uid); + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingUidInAppConfig); + } + else + iParentUid = uid; + + appConfig = COomApplicationConfig::NewL(uid); + CleanupStack::PushL(appConfig); + + // Set the app specific memory thresholds (if they exist) + // Get the app specific low threshold + if (err == KErrNone) + { + TUint lowThreshold; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeLowRamThreshold, lowThreshold); + if (err == KErrNone) + { + appConfig->iLowRamThreshold = lowThreshold * KBytesInMegabyte; + } + else if (err == KErrNotFound) + err = KErrNone; + + if (err != KErrNone) + ConfigError(KOomErrBadLowThresholdValueForAppConfig); + } + + // Get the app specific good threshold + if (err == KErrNone) + { + TUint goodThreshold; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeGoodRamThreshold, goodThreshold); + if (err == KErrNone) + { + appConfig->iGoodRamThreshold = goodThreshold * KBytesInMegabyte; + } + else if (err == KErrNotFound) + err = KErrNone; + + if (err != KErrNone) + ConfigError(KOomErrBadGoodThresholdValueForAppConfig); + } + + // Set the app specific swap thresholds (if they exist) + // Get the app specific low swap threshold + if (err == KErrNone) + { + TUint lowThreshold; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeLowSwapThreshold, lowThreshold); + if (err == KErrNone) + { + appConfig->iLowSwapThreshold = lowThreshold * KBytesInMegabyte; + } + else if (err == KErrNotFound) + err = KErrNone; + + if (err != KErrNone) + ConfigError(KOomErrBadLowThresholdValueForAppConfig); + } + + // Get the app specific good swapthreshold + if (err == KErrNone) + { + TUint goodThreshold; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeGoodSwapThreshold, goodThreshold); + if (err == KErrNone) + { + appConfig->iGoodSwapThreshold = goodThreshold * KBytesInMegabyte; + } + else if (err == KErrNotFound) + err = KErrNone; + + if (err != KErrNone) + ConfigError(KOomErrBadGoodThresholdValueForAppConfig); + } + + // Add the applciation config to the main config + if ((err == KErrNone) && (appConfig)) + { + iConfig.AddApplicationConfigL(appConfig); + } + + if (appConfig) + CleanupStack::Pop(appConfig); + } + +void COomConfigParser::SetCloseAppConfigL(const RAttributeArray& aAttributes) + { + // Get and convert uid attribute to TInt + TInt err = KErrNone; + + TUint uid; + err = GetValueFromHexAttributeList(aAttributes, KOomAttibuteUid, uid); + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingUidInAppCloseConfig); + return; + } + else + iParentUid = uid; + + COomCloseAppConfig* closeAppConfig = COomCloseAppConfig::NewL(uid); // Radio UID + CleanupStack::PushL(closeAppConfig); + + if (err == KErrNone) + { + // Check that we have a priority for the added app_close event + // Specifying a priority is mandatory + TUint priority; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibutePriority, priority); + if (err == KErrNone) + { + closeAppConfig->SetDefaultPriority(priority); + } + else + { + ConfigError(KOomErrBadOrMissingPriorityInAppCloseConfig); + } + } + + if (err == KErrNone) + { + TPtrC8 syncModeString; + err = GetValueFromAttributeList(aAttributes, KOomAttibuteSyncMode, syncModeString); + + if (err == KErrNone) + { + TOomSyncMode syncMode = EContinue; + + if (syncModeString == KOomConfigSyncModeContinue) + syncMode = EContinue; + else if (syncModeString == KOomConfigSyncModeCheck) + syncMode = ECheckRam; + else if (syncModeString == KOomConfigSyncModeEstimate) + syncMode = EEstimate; + else + ConfigError(KOomErrInvalidSyncMode); + + if (err == KErrNone) + { + closeAppConfig->iSyncMode = syncMode; + } + } + else + { + ConfigError(KOomErrMissingSyncModeInAppCloseConfig); + } + } + + + if (err == KErrNone) + { + // If we have a default priority attribute then add it, otherwise use the global default priority + TInt ramEstimate; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteRamEstimate, ramEstimate); + if ((err == KErrNotFound) && (closeAppConfig->iSyncMode != EEstimate)) + { + err = KErrNone; + } + + if (err != KErrNone) + ConfigError(KOomErrMissingEstimateFromAppCloseConfig); + else + closeAppConfig->iRamEstimate = ramEstimate * KBytesInMegabyte; + } + + if (err == KErrNone) + iConfig.SetAppCloseConfigL(closeAppConfig); + + CleanupStack::Pop(closeAppConfig); + } + +void COomConfigParser::SetAppCloseIdlePriorityConfigL(const RAttributeArray& aAttributes) + { + TUint uid; + TInt idleTime; + TUint priority; + + // Use the UID from the parent scope + uid = iParentUid; + + TInt err = KErrNone; + + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdleTime, idleTime); + +#ifdef __WINS__ + // The tick is 5 times slower on the emulator than on the phone + idleTime = idleTime / KEmulatorTickDivisor; +#endif + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingIdleTimeInAppIdleRule); + } + + if (err == KErrNone) + { + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdlePriority, priority); + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingPriorityInAppIdleRule); + } + } + + if (err == KErrNone) + { + COomIdleTimeRule* idleRule = COomIdleTimeRule::NewL(idleTime, priority); + CleanupStack::PushL(idleRule); + iConfig.AddApplicationRuleL(uid, idleRule); + CleanupStack::Pop(idleRule); + } + } + +void COomConfigParser::SetForegroundAppPriorityL(const RAttributeArray& aAttributes) + { + TUint appUid; + TUint targetAppId; + TUint priority; + + TInt err = KErrNone; + + // Use the UID from the parent scope + appUid = iParentUid; + + // Check that we have a priority for the added system plugin action + // Specifying a priority is mandatory + err = GetValueFromHexAttributeList(aAttributes, KOomAttributeIfForegroundAppId, targetAppId); + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingTargetAppIdInForegroundAppRule); + } + + if (err == KErrNone) + { + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdlePriority, priority); + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingPriorityInForegroundAppRule); + } + } + + if (err == KErrNone) + { + COomForegroundRule* foregroundRule = new (ELeave) COomForegroundRule(targetAppId, priority); + CleanupStack::PushL(foregroundRule); + iConfig.AddApplicationRuleL(appUid, foregroundRule); + CleanupStack::Pop(foregroundRule); + } + + } + +void COomConfigParser::SetSystemPluginConfigL(const RAttributeArray& aAttributes) + { + // Get and convert uid attribute to TInt + TInt err = KErrNone; + + TUint uid; + err = GetValueFromHexAttributeList(aAttributes, KOomAttibuteUid, uid); + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingUidInSystemPluginConfig); + return; + } + else + iParentUid = uid; + + COomRunPluginConfig* pluginConfig = COomRunPluginConfig::NewL(uid, EOomSystemPlugin); + CleanupStack::PushL(pluginConfig); + + if (err == KErrNone) + { + // Check that we have a priority for the added system plugin action + // Specifying a priority is mandatory + TUint priority; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibutePriority, priority); + if (err == KErrNone) + { + pluginConfig->SetDefaultPriority(priority); + } + else + { + ConfigError(KOomErrBadOrMissingPriorityInSystemPluginConfig); + } + } + + if (err == KErrNone) + { + TInt wait; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeWait, wait); + if (err == KErrNone) + { + pluginConfig->SetWaitAfterPlugin(wait); + } + else if (err == KErrNotFound) + { + // If this attribute isn't present then just don't set it, and clear the error + err = KErrNone; + } + else + ConfigError(KOomErrBadPluginWaitTime); + } + + if (err == KErrNone) + { + // Get the config for the sync mode for this plugin (if one is specified) and set it + SetPluginSyncMode(aAttributes, *pluginConfig); + } + + iConfig.AddPluginConfigL(pluginConfig); + + CleanupStack::Pop(pluginConfig); + } + +void COomConfigParser::SetAppPluginConfigL(const RAttributeArray& aAttributes) + { + // Get and convert uid attribute to TInt + TInt err = KErrNone; + + TUint uid; + err = GetValueFromHexAttributeList(aAttributes, KOomAttibuteUid, uid); + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingUidInAppPluginConfig); + return; + } + else + iParentUid = uid; + + COomRunPluginConfig* pluginConfig = COomRunPluginConfig::NewL(uid, EOomAppPlugin); + CleanupStack::PushL(pluginConfig); + + if (err == KErrNone) + { + // Check that we have a priority for the added system plugin action + // Specifying a priority is mandatory + TUint priority; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibutePriority, priority); + if (err == KErrNone) + { + pluginConfig->SetDefaultPriority(priority); + } + else + { + ConfigError(KOomErrBadOrMissingPriorityInAppPluginConfig); + } + } + + if (err == KErrNone) + { + // Check that we have a priority for the added system plugin action + // Specifying a priority is mandatory + TUint targetAppId; + err = GetValueFromHexAttributeList(aAttributes, KOomAttributeTargetAppId, targetAppId); + if (err == KErrNone) + { + pluginConfig->SetTargetApp(targetAppId); + iParentTargetApp = targetAppId; + } + else + { + ConfigError(KOomErrBadOrMissingTargetAppIdInAppPluginConfig); + } + } + + if (err == KErrNone) + { + TInt wait; + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeWait, wait); + if (err == KErrNone) + { + pluginConfig->SetWaitAfterPlugin(wait); + } + else if (err == KErrNotFound) + { + // If this attribute isn't present then just don't set it, and clear the error + err = KErrNone; + } + else + ConfigError(KOomErrBadPluginWaitTime); + } + + if (err == KErrNone) + { + // Get the config for the sync mode for this plugin (if one is specified) and set it + SetPluginSyncMode(aAttributes, *pluginConfig); + + TBool targetAppNotRunning; + err = GetValueFromBooleanAttributeList(aAttributes, KOomAttributeCallIfTargetAppNotRunning, targetAppNotRunning); + if (err == KErrNone) + { + pluginConfig->SetCallIfTargetAppNotRunning(targetAppNotRunning); + } + else if (err == KErrNotFound) + { + // If this attribute isn't present then just don't set it, and clear the error + err = KErrNone; + } + else + { + ConfigError(KOomErrBadCallIfTargetAppNotRunning); + } + } + + iConfig.AddPluginConfigL(pluginConfig); + + CleanupStack::Pop(pluginConfig); + + } + +void COomConfigParser::SetPluginIdlePriorityL(const RAttributeArray& aAttributes) + { + TUint uid; + TInt idleTime; + TUint priority; + + TInt err = KErrNone; + + // Use the UID from the parent scope + uid = iParentUid; + + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdleTime, idleTime); + +#ifdef __WINS__ + // The tick is 5 times slower on the emulator than on the phone + idleTime = idleTime / KEmulatorTickDivisor; +#endif + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingIdleTimeInPluginIdleRule); + } + + if (err == KErrNone) + { + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdlePriority, priority); + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingPriorityInPluginIdleRule); + } + } + + if (err == KErrNone) + { + COomIdleTimeRule* idleRule = COomIdleTimeRule::NewL(idleTime, priority); + CleanupStack::PushL(idleRule); + iConfig.AddPluginRuleL(uid, idleRule); + CleanupStack::Pop(idleRule); + } + } + +void COomConfigParser::SetPluginForegroundAppPriorityL(const RAttributeArray& aAttributes) + { + TUint uid; + TUint targetAppId; + TUint priority; + + TInt err = KErrNone; + + // Use the UID from the parent scope + uid = iParentUid; + + // Check that we have a priority for the added system plugin action + // Specifying a priority is mandatory + + TPtrC8 targetAppString; + err = GetValueFromAttributeList(aAttributes, KOomAttributeTargetAppId, targetAppString); + if ((err == KErrNone) + && (targetAppString == KOomConfigTargetAppValue) + && (iState == EOomParsingStateAppPluginSettings)) + // If the target app is specified as "TARGET_APP" then we use the target app from the parent entry + { + targetAppId = iParentTargetApp; + } + else + { + err = GetValueFromHexAttributeList(aAttributes, KOomAttributeTargetAppId, targetAppId); + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingTargetAppIdInForegroundAppRule); + } + } + + if (err == KErrNone) + { + err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdlePriority, priority); + + if (err != KErrNone) + { + ConfigError(KOomErrBadOrMissingPriorityInForegroundAppRule); + } + } + + if (err == KErrNone) + { + COomForegroundRule* foregroundRule = new (ELeave) COomForegroundRule(targetAppId, priority); + CleanupStack::PushL(foregroundRule); + iConfig.AddPluginRuleL(uid, foregroundRule); + CleanupStack::Pop(foregroundRule); + } + } + +// Finds an attribute of the given name and gets its value +// A value is only valid as long as AAtrributes is valid (and unmodified) +// Returns KErrNone if the attribute is present in the list, KErrNotFound otherwise +TInt COomConfigParser::GetValueFromAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TPtrC8& aValue) + { + TInt index = aAttributes.Count(); + TBool attributeFound = EFalse; + while ((index--) && (!attributeFound)) + { + if (aAttributes[index].Attribute().LocalName().DesC() == aName) + { + attributeFound = ETrue; + aValue.Set(aAttributes[index].Value().DesC()); + } + } + + TInt err = KErrNone; + + if (!attributeFound) + err = KErrNotFound; + + return err; + } + +// Finds an attribute of the given name and gets its value (coverting the string hex value to a UInt) +// Returns KErrNone if the attribute is present in the list, KErrNotFound otherwise +// Returns KErrCorrupt if the string is not a valid hex number +TInt COomConfigParser::GetValueFromHexAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TUint& aValue) + { + TPtrC8 hexString; + TInt err = GetValueFromAttributeList(aAttributes, aName, hexString); + + if (hexString == KOomConfigDefaultAppUid) + { + // This is a special case + // When we hit this value in a hex field then we return the default app UID + aValue = KOomDefaultAppId; + } + else if (hexString == KOomConfigDefaultPluginUid) + { + // This is a special case + // When we hit this value in a hex field then we return the default app UID + aValue = KOomDefaultPluginId; + } + else if (hexString == KOomConfigBusyAppUid) + { + aValue = KOomBusyAppId; + } + else if (hexString == KOomConfigHighPriorityAppUid) + { + aValue = KOomHighPriorityAppId; + } + else if (err == KErrNone) + { + TLex8 hexLex(hexString); + err = hexLex.Val(aValue, EHex); + if (err != KErrNone) + err = KErrCorrupt; + } + + return err; + } + +// Finds an attribute of the given name and gets its value (coverting the string decimal value to a UInt) +// Returns KErrNone if the attribute is present in the list, KErrNotFound otherwise +// Returns KErrCorrupt if the string is not a valid decimal number +TInt COomConfigParser::GetValueFromDecimalAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TUint& aValue) + { + TPtrC8 decimalString; + TInt err = GetValueFromAttributeList(aAttributes, aName, decimalString); + + if (err == KErrNone) + { + if (decimalString == KOomAttibuteNeverClose) + aValue = KOomPriorityInfinate; + else + { + TLex8 decimalLex(decimalString); + err = decimalLex.Val(aValue, EDecimal); + if (err != KErrNone) + err = KErrCorrupt; + } + } + + return err; + } + +TInt COomConfigParser::GetValueFromDecimalAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TInt& aValue) + { + TUint uintValue; + TInt err = GetValueFromDecimalAttributeList(aAttributes, aName, uintValue); + aValue = uintValue; + return err; + } + +TInt COomConfigParser::GetValueFromBooleanAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TBool& aValue) + { + TPtrC8 ptrValue; + TInt err = GetValueFromAttributeList(aAttributes, aName, ptrValue); + if (err == KErrNone) + { + if (ptrValue == KOomAttributeTrue || ptrValue == KOomAttribute1) + { + aValue = ETrue; + } + else if (ptrValue == KOomAttributeFalse || ptrValue == KOomAttribute0) + { + aValue = EFalse; + } + else + { + err = KErrCorrupt; + } + } + return err; + } + +void COomConfigParser::SetPluginSyncMode(const RAttributeArray& aAttributes, COomRunPluginConfig& aRunPluginConfig) + { + TPtrC8 syncModeString; + TInt err = GetValueFromAttributeList(aAttributes, KOomAttibuteSyncMode, syncModeString); + + if (err == KErrNone) + // If there is no specified sync mode then leave it as the default + { + TOomSyncMode syncMode = EContinue; + + if (syncModeString == KOomConfigSyncModeContinue) + syncMode = EContinueIgnoreMaxBatchSize; + else if (syncModeString == KOomConfigSyncModeCheck) + syncMode = ECheckRam; + else if (syncModeString == KOomConfigSyncModeEstimate) + syncMode = EEstimate; + else + ConfigError(KOomErrInvalidSyncMode); + + if (err == KErrNone) + { + aRunPluginConfig.iSyncMode = syncMode; + } + } + } + +// Check that the current state is as expected +// If not then the specified config error is generated +void COomConfigParser::CheckState(TOomParsingState aExpectedState, TInt aError) + { + if (iState != aExpectedState) + ConfigError(aError); + } + +// Check that the current state is as expected +// If not then the specified config error is generated +// This version checks to ensure that the current state matches either of the passed in states +void COomConfigParser::CheckState(TOomParsingState aExpectedState1, TOomParsingState aExpectedState2, TInt aError) + { + if ((iState != aExpectedState1) + && (iState != aExpectedState2)) + ConfigError(aError); + } + +void COomConfigParser::ChangeState(TOomParsingState aState) + { + iState = aState; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomforegroundrule.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomforegroundrule.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,43 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#include "oomforegroundrule.h" +#include "oomwindowgrouplist.h" +#include "OomTraces.h" + +// If the specified target app is in the foreground then apply the specified priority +COomForegroundRule::COomForegroundRule(TInt aTargetAppId, TInt aPriority) : iTargetAppId(aTargetAppId), iPriority(aPriority) + { + FUNC_LOG; + } + +TBool COomForegroundRule::RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt /*aAppIndexInWindowGroup*/) const + { + FUNC_LOG; + + TBool ruleIsApplicable = EFalse; + if (aWindowGroupList.Count() > 0) + { + // If the target app is in the foreground then this rule is applicable + TUint foregroundAppId = aWindowGroupList.AppId(0, ETrue); + if (foregroundAppId == iTargetAppId) + ruleIsApplicable = ETrue; + } + + return ruleIsApplicable; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomglobalconfig.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomglobalconfig.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + + +#include "oomglobalconfig.h" +#include "OomTraces.h" + +COomGlobalConfig::~COomGlobalConfig() + { + FUNC_LOG; + + iForceCheckPriorities.Close(); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomlog.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomlog.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,306 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Logging functionality for OOM monitor profiling. +* +*/ + + + +#ifdef _DEBUG + +#include +#include +#include +#include +#include + +#include "oomlog.h" +#include "oompanic.h" + +_LIT8(KMemorySampleLoggingString, "%d"); +_LIT8(KMemorySampleLoggingSeparator, ", "); + +_LIT8(KCrLf, "\r\n"); + +_LIT8(KOomLogCancel, "Sampling triggered before previous sampling has completed. Results so far: "); + +_LIT(KOomLogFile, ":\\logs\\OOM\\liveoommonitor.txt"); +_LIT(KOomOldLogFile, ":\\logs\\OOM\\oommonitor.txt"); + +const TInt KMaxTimeStampSize = 30; +_LIT(KTimeStampFormat, "%F %H:%T:%S"); + +_LIT(KDummyWgName, "20"); + +_LIT8(KUidPreamble, "App UIDs:"); +_LIT8(KUidFormat, " 0x%x"); + +const TInt KPreallocatedSpaceForAppList = 50; + +const TInt KMaxUidBufferSize = 1024; + +COomLogger* COomLogger::NewL(RWsSession& aWs, RFs& aFs) + { + COomLogger* self = new (ELeave) COomLogger(aWs, aFs); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +// Start logging the available memory every n micro seconds +// Firstly a list of the app IDs is written to the log (foreground app first) +// Note that the log is created in memory (to a pre-allocated buffer) and flushed out after it is complete +// the samples are saved in CSV format so that they can easily be cut and pasted to plot graphs etc. +void COomLogger::StartL() + { + // If the log file doesn't exist then don't attempt to sample anything + if (!iIsOpen) + return; + + // If we are already active then cancel first + if (IsActive()) + Cancel(); + + iWriteBuffer.Zero(); + + iStartTime.HomeTime(); + + // Log the timestamp + TBuf16 timeStamp; + iStartTime.FormatL(timeStamp, KTimeStampFormat); + TBuf8 timeStamp8; + timeStamp8.Copy(timeStamp); + Write(timeStamp8); + + // Log all of the application IDs (foreground app first, then the other apps moving towards the back) + LogApplicationIds(); + + // Then, record the free memory + // Note that this is done to a buffer so as not to affect the timing too much + LogFreeMemory(); + + // Finally, set a timer to record the memory every n microseconds + HighRes(KTimeBetweenMemorySamples); + } + +// From CTimer / CActice +void COomLogger::RunL() + { + TTime currentTime; + currentTime.HomeTime(); + TTimeIntervalMicroSeconds loggingDuration = currentTime.MicroSecondsFrom(iStartTime); + TTimeIntervalMicroSeconds samplingDuration = KSamplingDurationUint; + if (loggingDuration > samplingDuration) + // If we have passed the desired logging duration then write the data we have collected + { + Write(iWriteBuffer); + } + else + { + // If we haven't passed the desired logging duration then record the free memory + // Note that this is recorded into a buffer and then logged later + iWriteBuffer.Append(KMemorySampleLoggingSeparator); + LogFreeMemory(); + + // Wait before taking another memory sample + HighRes(KTimeBetweenMemorySamples); + } + } + +void COomLogger::DoCancel() + { + CTimer::DoCancel(); + + Write(KOomLogCancel); + Write(iWriteBuffer); + } + +COomLogger::~COomLogger() + { + iWgIds.Close(); + // delete iWgName; // Not owned + if (iIsOpen) + iFile.Close(); + + } + +void COomLogger::Write(const TDesC8& aBuffer) + { + if (iIsOpen) + { + iFile.Write(aBuffer); + + // Add the line break + iFile.Write(KCrLf); + } + } + +void COomLogger::LogApplicationIds() + { + // get all window groups, with info about parents + TInt numGroups = iWs.NumWindowGroups(0); + TRAPD(err, iWgIds.ReserveL(numGroups)); + + if (err != KErrNone) + return; + + if (iWs.WindowGroupList(0, &iWgIds) != KErrNone) + return; + + // Remove all child window groups, promote parents to foremost child position + ColapseWindowGroupTree(); + + // Go through each window group ID in the list, get the Uid of each app then log it + // Start with the foreground application + TInt index = 0; + + TUid uid; + + TBuf8 uidBuffer; + + uidBuffer = KUidPreamble; + + while (index < numGroups) + { + __ASSERT_DEBUG(index < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds)); + uid = GetUidFromWindowGroupId(iWgIds[index].iId); + + uidBuffer.AppendFormat(KUidFormat, uid.iUid); + + index++; + } + + Write(uidBuffer); + } + +void COomLogger::LogFreeMemory() + { + TMemoryInfoV1Buf meminfo; + UserHal::MemoryInfo(meminfo); + TInt freeMem = meminfo().iFreeRamInBytes; + + // Save the free memory to a descriptor which will be written later + iWriteBuffer.AppendFormat(KMemorySampleLoggingString(), freeMem); + } + +COomLogger::COomLogger(RWsSession& aWs, RFs& aFs) : CTimer(EPriorityStandard), iWs(aWs), iFs(aFs) + { + } + +void COomLogger::ConstructL() + { + CActiveScheduler::Add(this); + + CTimer::ConstructL(); + + TFileName oldLogFileName; + TFileName newLogFileName; + TChar driveChar = iFs.GetSystemDriveChar(); + oldLogFileName.Append(driveChar); + oldLogFileName.Append(KOomOldLogFile); + newLogFileName.Append(driveChar); + newLogFileName.Append(KOomLogFile); + // If there is an existing log then copy it, this will be the log that can be sent to the PC + // Without this feature then you can't get the logs off of the device because the "live" log will always be is use. + CFileMan* fileMan = CFileMan::NewL(iFs); + CleanupStack::PushL(fileMan); + fileMan->Copy(newLogFileName, oldLogFileName); + CleanupStack::PopAndDestroy(fileMan); + + // Create the log file, or open it if is already exists (note that the directory must already be present + TInt err = iFile.Create(iFs, KOomLogFile, EFileShareAny | EFileWrite); + if (KErrNone != err) + { + err = iFile.Open(iFs, KOomLogFile, EFileShareAny | EFileWrite); + } + + if (KErrNone == err) + { + iIsOpen = ETrue; + + // Append all new data to the end of the file + TInt offset = 0; + iFile.Seek(ESeekEnd, offset); + } + + // Reserve enough space to build an app list later. + iWgIds.ReserveL(KPreallocatedSpaceForAppList); + // Reserve enough space for CApaWindowGroupName. + iWgName = CApaWindowGroupName::NewL(iWs); + iWgNameBuf = HBufC::NewL(CApaWindowGroupName::EMaxLength); + (*iWgNameBuf) = KDummyWgName; + iWgName->SetWindowGroupName(iWgNameBuf); // iWgName takes ownership of iWgNameBuf*/ + + } + +void COomLogger::ColapseWindowGroupTree() + { + // start from the front, wg count can reduce as loop runs + for (TInt ii=0; ii 0) // wg has a parent + { + // Look for the parent position + TInt parentPos = ii; // use child pos as not-found signal + TInt count = iWgIds.Count(); + for (TInt jj=0; jj ii) // parent should be moved forward + { + iWgIds[ii] = iWgIds[parentPos]; + iWgIds.Remove(parentPos); + } + else if (parentPos < ii) // parent is already ahead of child, remove child + iWgIds.Remove(ii); + else // parent not found, skip + ii++; + } + else // wg does not have a parent, skip + ii++; + } + } + +TUid COomLogger::GetUidFromWindowGroupId(TInt aWgId) + { + // get the app's details + TPtr wgPtr(iWgNameBuf->Des()); + + TUid uid; + + TInt err = iWs.GetWindowGroupNameFromIdentifier(aWgId, wgPtr); + + if (KErrNone != err) + // If there is an error then set the UID to 0; + { + uid.iUid = 0; + } + else + { + iWgName->SetWindowGroupName(iWgNameBuf); + uid = iWgName->AppUid(); // This UID comes from the app, not the mmp! + } + + return uid; + } + +#endif //_DEBUG diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oommemorymonitor.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oommemorymonitor.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,523 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + +#include +#include + +#include + +#include "oommemorymonitor.h" +#include "oommonitorplugin.h" +#include "oomsubscribehelper.h" +#include "oomconfig.h" +#include "oommemorymonitorserver.h" +#include "oomconfigparser.h" +#include "oomactionlist.h" +#include "oomlog.h" +#include "OomTraces.h" +#include "oomoutofmemorywatcher.h" +#include "oomwserveventreceiver.h" +#include "oomconstants.hrh" +#include "oomrunpluginconfig.h" +#include "oomapplicationconfig.h" +#include "oomclientrequestqueue.h" + +#ifndef CLIENT_REQUEST_QUEUE +const TInt KOomWatchDogStatusIdle = -1; +#endif + +// ====================================================================== +// class CMemoryMonitor +// ====================================================================== + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +CMemoryMonitor* CMemoryMonitor::NewL() + { // static + FUNC_LOG; + + CMemoryMonitor* self = new(ELeave) CMemoryMonitor(); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +CMemoryMonitor::CMemoryMonitor() + { + FUNC_LOG; + + SetMemoryMonitorTls(this); + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +CMemoryMonitor::~CMemoryMonitor() + { + FUNC_LOG; + +#ifndef CLIENT_REQUEST_QUEUE + if (iWatchdogStatusSubscriber) + { + iWatchdogStatusSubscriber->StopSubscribe(); + } + iWatchdogStatusProperty.Close(); + delete iWatchdogStatusSubscriber; +#endif + + delete iServer; + delete iWservEventReceiver; + delete iOOMWatcher; + iFs.Close(); + iWs.Close(); + + delete iOomWindowGroupList; + delete iOomActionList; + delete iConfig; +#ifdef CLIENT_REQUEST_QUEUE + delete iQueue; +#endif + +#ifdef _DEBUG + delete iLogger; +#endif + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void CMemoryMonitor::ConstructL() + { + FUNC_LOG; + + User::LeaveIfError(iWs.Connect()); + + iOomWindowGroupList = COomWindowGroupList::NewL(iWs); + + iConfig = COomConfig::NewL(); + +#ifdef CLIENT_REQUEST_QUEUE + iQueue = COomClientRequestQueue::NewL(*this); + + iServer = CMemoryMonitorServer::NewL(*iQueue); +#else + iServer = CMemoryMonitorServer::NewL(*this); +#endif + + // Load up threshold & OOM app lists from resource. + User::LeaveIfError(iFs.Connect()); + + COomConfigParser* oomConfigParser = new (ELeave) COomConfigParser(*iConfig, iFs); + CleanupStack::PushL(oomConfigParser); + oomConfigParser->ParseL(); + CleanupStack::PopAndDestroy(oomConfigParser); + + iOomActionList = COomActionList::NewL(*this, *iServer, iWs, *iConfig); + +#ifdef _DEBUG + iLogger = COomLogger::NewL(iWs, iFs); +#endif + + // Get the thresholds based on the current foreground app and the config + RefreshThresholds(); + + _LIT_SECURITY_POLICY_S0(KOomMemoryMonitorPolicyWrite, KOomMemoryMonitorStatusPropertyCategory.iUid); + _LIT_SECURITY_POLICY_PASS(KOomMemoryMonitorPolicyRead); + + // Define MemoryMonitorStatusProperty. set to "above treshhold". + TInt err = RProperty::Define(KOomMemoryMonitorStatusPropertyCategory, KOomMemoryMonitorStatusPropertyKey, RProperty::EInt, KOomMemoryMonitorPolicyRead, KOomMemoryMonitorPolicyWrite); + TRACES1("CMemoryMonitor::ConstructL: KOomMemoryMonitorStatusProperty: Define err = %d", err); + + err = RProperty::Set(KOomMemoryMonitorStatusPropertyCategory, KOomMemoryMonitorStatusPropertyKey, EAboveTreshHold); + TRACES1("CMemoryMonitor::ConstructL: KOomMemoryMonitorStatusProperty: Set err = %d", err); + +#ifndef CLIENT_REQUEST_QUEUE + err = iWatchdogStatusProperty.Attach(KPSUidUikon, KUikOOMWatchdogStatus); + + TRACES1("CMemoryMonitor::ConstructL: KUikOOMWatchdogStatus err = %d", err); + + err = iWatchdogStatusProperty.Set(KOomWatchDogStatusIdle); + + iWatchdogStatusSubscriber = new (ELeave) CSubscribeHelper(TCallBack(WatchdogStatusStatusChanged, this), iWatchdogStatusProperty); + iWatchdogStatusSubscriber->Subscribe(); +#endif + + + iOOMWatcher = COutOfMemoryWatcher::NewL(*this, iLowRamThreshold, iGoodRamThreshold, iConfig->GlobalConfig().iSwapUsageMonitored, iLowSwapThreshold, iGoodSwapThreshold); + iOOMWatcher->Start(); + + iWservEventReceiver = new(ELeave) CWservEventReceiver(*this, iWs); + iWservEventReceiver->ConstructL(); + } + +const COomGlobalConfig& CMemoryMonitor::GlobalConfig() + { + CMemoryMonitor* globalMemoryMonitor = static_cast(Dll::Tls()); + return globalMemoryMonitor->iConfig->GlobalConfig(); + } + + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void CMemoryMonitor::FreeMemThresholdCrossedL() + { + FUNC_LOG; + + iActionTrigger = ERamRotation; + StartFreeSomeRamL(iGoodRamThreshold, iGoodSwapThreshold); + } + +void CMemoryMonitor::HandleFocusedWgChangeL() + { + FUNC_LOG; + + TInt oldGoodRamThreshold = iGoodRamThreshold; + TInt oldLowRamThreshold = iLowRamThreshold; + TInt oldGoodSwapThreshold = iGoodSwapThreshold; + TInt oldLowSwapThreshold = iLowSwapThreshold; + + // Refresh the low and good memory thresholds as they may have changed due to the new foreground application + RefreshThresholds(); + + if ((oldGoodRamThreshold != iGoodRamThreshold) + || (oldLowRamThreshold != iLowRamThreshold) + || (oldGoodSwapThreshold != iGoodSwapThreshold) + || (oldLowSwapThreshold != iLowSwapThreshold)) + // If the thresholds have changed then update the memory watched + { + iOOMWatcher->UpdateThresholds(iLowRamThreshold, iGoodRamThreshold, iLowSwapThreshold, iGoodSwapThreshold); + } + + // If the available memory is less than the low memory threshold then free some RAM + User::CompressAllHeaps(); + TInt currentFreeRam = 0; + HAL::Get( HALData::EMemoryRAMFree, currentFreeRam ); + TInt currentFreeSwap = 0; + if (iConfig->GlobalConfig().iSwapUsageMonitored) + { + SVMSwapInfo swapInfo; + UserSvr::HalFunction(EHalGroupVM, EVMHalGetSwapInfo, &swapInfo, 0); + currentFreeSwap = swapInfo.iSwapFree; + } + + if ((currentFreeRam < iLowRamThreshold) || + (iConfig->GlobalConfig().iSwapUsageMonitored && (currentFreeSwap < iLowSwapThreshold))) + { + iActionTrigger = ERamRotation; + StartFreeSomeRamL(iGoodRamThreshold, iGoodSwapThreshold); + } + } + +void CMemoryMonitor::StartFreeSomeRamL(TInt aFreeRamTarget, TInt aFreeSwapTarget) + { + StartFreeSomeRamL(aFreeRamTarget, aFreeSwapTarget, KOomPriorityInfinate - 1); + } + +void CMemoryMonitor::StartFreeSomeRamL(TInt aFreeRamTarget, TInt aFreeSwapTarget, TInt aMaxPriority) // The maximum priority of action to run + { + FUNC_LOG; + + TRACES4("MemoryMonitor::StartFreeSomeRamL: aFreeRamTarget = %d, iCurrentRamTarget = %d, aFreeSwapSpaceTarget = %d, iCurrentSwapTarget = %d", aFreeRamTarget, iCurrentRamTarget, aFreeSwapTarget, iCurrentSwapTarget); + + // Update the target if new target is higher. If the target is lower than the current target and memory + // is currently being freed then we do not want to reduce the amount of memory this operation frees. + if (aFreeRamTarget > iCurrentRamTarget) + { + iCurrentRamTarget = aFreeRamTarget; + } + + if (aFreeSwapTarget > iCurrentSwapTarget) + { + iCurrentSwapTarget = aFreeSwapTarget; + } + + // check if there is enough free memory already. + TInt freeMemory = 0; + GetFreeMemory(freeMemory); + TInt freeSwap = 0; + if (iConfig->GlobalConfig().iSwapUsageMonitored) + { + GetFreeSwapSpace(freeSwap); + } + + TRACES2("MemoryMonitor::StartFreeSomeRamL, freeMemory = %d, freeSwap = %d", freeMemory, freeSwap); + + if ((freeMemory >= iCurrentRamTarget) && + ((!iConfig->GlobalConfig().iSwapUsageMonitored) || (freeSwap >= iCurrentSwapTarget))) + { + if (iLastMemoryMonitorStatusProperty != EFreeingMemory) + { + ResetTargets(); + iOomActionList->SwitchOffPlugins(); + SetMemoryMonitorStatusProperty(EAboveTreshHold); +#ifdef CLIENT_REQUEST_QUEUE + iQueue->ActionsCompleted(freeMemory, ETrue); +#else + iServer->CloseAppsFinished(freeMemory, ETrue); +#endif + } + return; + } + +#ifdef _DEBUG + iLogger->StartL(); +#endif + + // Build the list of memory freeing actions + iOomActionList->BuildActionListL(*iOomWindowGroupList, *iConfig); + + iOomActionList->SetCurrentTargets(iCurrentRamTarget, iCurrentSwapTarget); + + // Run the memory freeing actions + iOomActionList->FreeMemory(aMaxPriority); + } + +void CMemoryMonitor::RequestFreeMemoryPandSL(TInt aBytesRequested) + { + FUNC_LOG; + + iActionTrigger = EPublishAndSubscribe; + StartFreeSomeRamL(aBytesRequested + iLowRamThreshold, iLowSwapThreshold); + } + +void CMemoryMonitor::RequestFreeMemoryL(TInt aBytesRequested, TBool aDataPaged) + { + FUNC_LOG; + + iActionTrigger = EClientServerRequestFreeMemory; + iDataPaged = aDataPaged; + StartFreeSomeRamL(iLowRamThreshold, aBytesRequested + iLowSwapThreshold); + } + +void CMemoryMonitor::FreeOptionalRamL(TInt aBytesRequested, TInt aPluginId, TBool aDataPaged) // The ID of the plugin that will clear up the allocation, used to determine the priority of the allocation + { + FUNC_LOG; + + iActionTrigger = EClientServerRequestOptionalRam; + + iDataPaged = aDataPaged; + + // Calculate the priority of the allocation (the priority of the plugin that will clear it up - 1) + TInt priorityOfAllocation = iConfig->GetPluginConfig(aPluginId).CalculatePluginPriority(*iOomWindowGroupList) - 1; + + StartFreeSomeRamL(aBytesRequested + iGoodRamThreshold, iLowSwapThreshold, priorityOfAllocation); + } + +void CMemoryMonitor::GetFreeMemory(TInt& aCurrentFreeMemory) + { + FUNC_LOG; + + // may cause some extra load but allows more precise action + User::CompressAllHeaps(); + + HAL::Get( HALData::EMemoryRAMFree, aCurrentFreeMemory ); + + TRACES1("CMemoryMonitor::GetFreeMemory: Free RAM now %d", aCurrentFreeMemory); + } + +void CMemoryMonitor::GetFreeSwapSpace(TInt& aCurrentFreeSwapSpace) + { + FUNC_LOG; + + SVMSwapInfo swapInfo; + UserSvr::HalFunction(EHalGroupVM, EVMHalGetSwapInfo, &swapInfo, 0); + aCurrentFreeSwapSpace = swapInfo.iSwapFree; + + TRACES1("CMemoryMonitor::GetFreeSwapSpace: Free swap space now %d", aCurrentFreeSwapSpace); + } + +#ifndef CLIENT_REQUEST_QUEUE +TInt CMemoryMonitor::WatchdogStatusStatusChanged(TAny* aPtr) + { + FUNC_LOG; + + CMemoryMonitor* self = STATIC_CAST(CMemoryMonitor*,aPtr); + if (self) + self->HandleWatchdogStatusCallBack(); + return KErrNone; + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void CMemoryMonitor::HandleWatchdogStatusCallBack() + { + FUNC_LOG; + + // Someone has set the key to request some free memory. + TInt memoryRequested = 0; + iWatchdogStatusProperty.Get(memoryRequested); + + // Try to free the RAM. + if (memoryRequested >= 1) + { + iOOMWatcher->Cancel(); // Pause memory notifys. + TRAP_IGNORE(RequestFreeMemoryPandSL(memoryRequested + iLowThreshold)); // This call could take a few seconds to do its stuff. + iOOMWatcher->Start(); // Restarts memory monitoring. + } + // Set the key back to KOomWatchDogStatusIdle to indicate we're done. + iWatchdogStatusProperty.Set(KOomWatchDogStatusIdle); + } +#endif //CLIENT_REQUEST_QUEUE + +void CMemoryMonitor::AppNotExiting(TInt aWgId) + { + FUNC_LOG; + + iOomActionList->AppNotExiting(aWgId); + } + + +void CMemoryMonitor::RefreshThresholds() + { + FUNC_LOG; + + iOomWindowGroupList->Refresh(); + + // Calculate the desired good threshold, this could be the globally configured value... + iGoodRamThreshold = CMemoryMonitor::GlobalConfig().iGoodRamThreshold; + iLowRamThreshold = CMemoryMonitor::GlobalConfig().iLowRamThreshold; + iGoodSwapThreshold = CMemoryMonitor::GlobalConfig().iGoodSwapThreshold; + iLowSwapThreshold = CMemoryMonitor::GlobalConfig().iLowSwapThreshold; + TRACES4("CMemoryMonitor::RefreshThresholds: Global Good Ram Threshold = %d, Global Low Ram Threshold = %d, Global Good Swap Threshold = %d, Global Low Swap Threshold = %d", iGoodRamThreshold, iLowRamThreshold, iGoodSwapThreshold, iLowSwapThreshold); + +#ifdef _DEBUG + TRACES("CMemoryMonitor::RefreshThresholds: Dumping Window Group List"); + TInt wgIndex = iOomWindowGroupList->Count() - 1; + while (wgIndex >= 0) + { + TInt32 appId = iOomWindowGroupList->AppId(wgIndex, ETrue); + TInt wgId = iOomWindowGroupList->WgId(wgIndex).iId; + TInt parentId = iOomWindowGroupList->WgId(wgIndex).iId; + TRACES4("CMemoryMonitor::RefreshThresholds: wgIndex=%d, oom uid=%x, wgId(child)=%d, parentId=%d", wgIndex, appId, wgId, parentId); + wgIndex--; + } +#endif + + // The global value can be overridden by an app specific value + // Find the application config entry for the foreground application + if (iOomWindowGroupList->Count()) + { + TUint foregroundAppId = iOomWindowGroupList->AppId(0, ETrue); + TUid foregroundAppUid = TUid::Uid(foregroundAppId); + + if ( (foregroundAppUid == KUidPenInputServer || foregroundAppUid == KUidFastSwap) && + iOomWindowGroupList->Count() > 1 ) + { + // pen input server puts itself to the foreground when the web browser is active + // fast swap should not reset the thresholds for the app behind it + foregroundAppId = iOomWindowGroupList->AppId(1, ETrue); + } + + // If this application configuration overrides the good_ram_threshold then set it + if (iConfig->GetApplicationConfig(foregroundAppId).iGoodRamThreshold != KOomThresholdUnset) + { + iGoodRamThreshold = iConfig->GetApplicationConfig(foregroundAppId).iGoodRamThreshold; + TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Good Ram Threshold = %d", foregroundAppId, iGoodRamThreshold); + } + // If this application configuration overrides the low_ram_threshold then set it + if (iConfig->GetApplicationConfig(foregroundAppId).iLowRamThreshold != KOomThresholdUnset) + { + iLowRamThreshold = iConfig->GetApplicationConfig(foregroundAppId).iLowRamThreshold; + TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Low Ram Threshold = %d", foregroundAppId, iLowRamThreshold); + } + + if (iConfig->GetApplicationConfig(foregroundAppId).iGoodSwapThreshold != KOomThresholdUnset) + { + iGoodSwapThreshold = iConfig->GetApplicationConfig(foregroundAppId).iGoodSwapThreshold; + TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Good Swap Threshold = %d", foregroundAppId, iGoodSwapThreshold); + } + // If this application configuration overrides the low_swap_threshold then set it + if (iConfig->GetApplicationConfig(foregroundAppId).iLowSwapThreshold != KOomThresholdUnset) + { + iLowSwapThreshold = iConfig->GetApplicationConfig(foregroundAppId).iLowSwapThreshold; + TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Low Swap Threshold = %d", foregroundAppId, iLowSwapThreshold); + } + } + } + +// SetMemoryMonitorStatusProperty - updates the property value only if it has changed +void CMemoryMonitor::SetMemoryMonitorStatusProperty(const TMemoryMonitorStatusPropertyValues aValue) + { + if (iLastMemoryMonitorStatusProperty != aValue) + { + TInt err = RProperty::Set(KOomMemoryMonitorStatusPropertyCategory, KOomMemoryMonitorStatusPropertyKey, aValue); + TRACES1("CMemoryMonitor::SetMemoryMonitorStatusProperty: err = %d", err); + iLastMemoryMonitorStatusProperty = aValue; + } + } + +void CMemoryMonitor::ResetTargets() + { + FUNC_LOG; + + //we reset the target when a memory free operation completes, to deal with the case + //where the operation was initiated with a target larger than the current good threshold + iCurrentRamTarget = iGoodRamThreshold; + iCurrentSwapTarget = iGoodSwapThreshold; + iOomActionList->SetCurrentTargets(iCurrentRamTarget, iCurrentSwapTarget); + } + +void CMemoryMonitor::SetPriorityBusy(TInt aWgId) + { + FUNC_LOG; + + iOomWindowGroupList->SetPriorityBusy(aWgId); + } + +void CMemoryMonitor::SetPriorityNormal(TInt aWgId) + { + FUNC_LOG; + + iOomWindowGroupList->SetPriorityNormal(aWgId); + } + +void CMemoryMonitor::SetPriorityHigh(TInt aWgId) + { + iOomWindowGroupList->SetPriorityHigh(aWgId); + } + +TActionTriggerType CMemoryMonitor::ActionTrigger() const + { + return iActionTrigger; + } + +#ifdef CLIENT_REQUEST_QUEUE +TInt CMemoryMonitor::GoodRamThreshold() const + { + return iGoodRamThreshold; + } + +TInt CMemoryMonitor::LowRamThreshold() const + { + return iLowRamThreshold; + } + +void CMemoryMonitor::ActionsCompleted(TInt aBytesFree, TBool aMemoryGood) + { + iQueue->ActionsCompleted(aBytesFree, aMemoryGood); + } +#endif //CLIENT_REQUEST_QUEUE diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oommemorymonitorserver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oommemorymonitorserver.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,114 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + + +#include "oommemorymonitorserver.h" +#include "oommonitorclientserver.h" +#include "oommemorymonitorsession.h" +#include "oommemorymonitor.h" +#include "OomTraces.h" + +#ifdef CLIENT_REQUEST_QUEUE +CMemoryMonitorServer* CMemoryMonitorServer::NewL(COomClientRequestQueue& aQueue) +#else +CMemoryMonitorServer* CMemoryMonitorServer::NewL(CMemoryMonitor& aMonitor) +#endif + { + FUNC_LOG; + +#ifdef CLIENT_REQUEST_QUEUE + CMemoryMonitorServer* self=new(ELeave) CMemoryMonitorServer(aQueue); +#else + CMemoryMonitorServer* self=new(ELeave) CMemoryMonitorServer(aMonitor); +#endif + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +CMemoryMonitorServer::~CMemoryMonitorServer() + { + FUNC_LOG; + } + +#ifdef CLIENT_REQUEST_QUEUE +CMemoryMonitorServer::CMemoryMonitorServer(COomClientRequestQueue& aQueue) + :CServer2(CActive::EPriorityStandard), iQueue(aQueue) +#else +CMemoryMonitorServer::CMemoryMonitorServer(CMemoryMonitor& aMonitor) + :CServer2(CActive::EPriorityStandard), iMonitor(aMonitor) +#endif + { + FUNC_LOG; + } + +void CMemoryMonitorServer::ConstructL() + { + FUNC_LOG; + + StartL(KMemoryMonitorServerName); + } + +CSession2* CMemoryMonitorServer::NewSessionL(const TVersion& /*aVersion*/, const RMessage2& /*aMessage*/) const + { + FUNC_LOG; + + return new(ELeave) CMemoryMonitorSession(); + } + +TInt CMemoryMonitorServer::RunError(TInt aError) + { + FUNC_LOG; + + Message().Complete(aError); + // + // The leave will result in an early return from CServer::RunL(), skipping + // the call to request another message. So do that now in order to keep the + // server running. + ReStart(); + return KErrNone; // handled the error fully + } + +#ifdef CLIENT_REQUEST_QUEUE +COomClientRequestQueue& CMemoryMonitorServer::ClientRequestQueue() + { + FUNC_LOG; + + return iQueue; + } +#else +CMemoryMonitor& CMemoryMonitorServer::Monitor() + { + FUNC_LOG; + + return iMonitor; + } +#endif + +#ifndef CLIENT_REQUEST_QUEUE +void CMemoryMonitorServer::CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood) + { + FUNC_LOG; + + iSessionIter.SetToFirst(); + CSession2* s; + while ((s = iSessionIter++) != 0) + static_cast(s)->CloseAppsFinished(aBytesFree, aMemoryGood); + } +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,183 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + +#include "oommonitorclientserver.h" +#include "oommemorymonitorsession.h" +#include "oommemorymonitor.h" +#include "oommemorymonitorserver.h" +#include "OomTraces.h" +#include "oomclientrequestqueue.h" + +CMemoryMonitorSession::CMemoryMonitorSession() + { + FUNC_LOG; + } + + +CMemoryMonitorSession::~CMemoryMonitorSession() + { + FUNC_LOG; + } + +CMemoryMonitorServer& CMemoryMonitorSession::Server() + { + FUNC_LOG; + + return *static_cast(const_cast(CSession2::Server())); + } + +#ifdef CLIENT_REQUEST_QUEUE +COomClientRequestQueue& CMemoryMonitorSession::ClientRequestQueue() + { + FUNC_LOG; + + return Server().ClientRequestQueue(); + } +#endif + +CMemoryMonitor& CMemoryMonitorSession::Monitor() + { + FUNC_LOG; + +#ifdef CLIENT_REQUEST_QUEUE + return ClientRequestQueue().Monitor(); +#else + return Server().Monitor(); +#endif + } + +TBool CMemoryMonitorSession::IsDataPaged(const RMessage2& aMessage) + { + RThread clientThread; + TInt err = aMessage.Client(clientThread); + TBool dataPaged = EFalse; + if(err == KErrNone) + { + RProcess processName; + err = clientThread.Process(processName); + if(err == KErrNone) + { + dataPaged = processName.DefaultDataPaged(); + } + else + { + PanicClient(aMessage, EPanicIllegalFunction); + } + } + else + { + PanicClient(aMessage, EPanicIllegalFunction); + } + return dataPaged; + } + +void CMemoryMonitorSession::ServiceL(const RMessage2& aMessage) + { + FUNC_LOG; + +#ifndef CLIENT_REQUEST_QUEUE + iFunction = aMessage.Function(); +#endif + + switch (aMessage.Function()) + { + case EOomMonitorRequestFreeMemory: + if (!iRequestFreeRam.IsNull()) + PanicClient(aMessage, EPanicRequestActive); + // message will be completed when CloseAppsFinished() is called. + +#ifdef CLIENT_REQUEST_QUEUE + ClientRequestQueue().RequestFreeMemoryL(aMessage); +#else + iRequestFreeRam = aMessage; + Monitor().RequestFreeMemoryL(aMessage.Int0(), IsDataPaged(aMessage)); +#endif + break; + + case EOomMonitorCancelRequestFreeMemory: + if (!iRequestFreeRam.IsNull()) + iRequestFreeRam.Complete(KErrCancel); + aMessage.Complete(KErrNone); + break; + + case EOomMonitorThisAppIsNotExiting: + Monitor().AppNotExiting(aMessage.Int0()); + aMessage.Complete(KErrNone); + break; + + case EOomMonitorRequestOptionalRam: + if (!iRequestFreeRam.IsNull()) + PanicClient(aMessage, EPanicRequestActive); + // message will be completed when CloseAppsFinished() is called. + +#ifdef CLIENT_REQUEST_QUEUE + ClientRequestQueue().RequestOptionalRamL(aMessage); +#else + iRequestFreeRam = aMessage; + iMinimumMemoryRequested = aMessage.Int1(); + Monitor().FreeOptionalRamL(aMessage.Int0(), aMessage.Int2(), IsDataPaged(aMessage)); +#endif + break; + + case EOomMonitorSetPriorityBusy: + Monitor().SetPriorityBusy(aMessage.Int0()); + aMessage.Complete(KErrNone); + break; + + case EOomMonitorSetPriorityNormal: + Monitor().SetPriorityNormal(aMessage.Int0()); + aMessage.Complete(KErrNone); + break; + + case EOomMonitorSetPriorityHigh: + Monitor().SetPriorityHigh(aMessage.Int0()); + aMessage.Complete(KErrNone); + break; + + default: + PanicClient(aMessage, EPanicIllegalFunction); + break; + } + } + +#ifndef CLIENT_REQUEST_QUEUE +void CMemoryMonitorSession::CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood) + { + FUNC_LOG; + + if (!iRequestFreeRam.IsNull()) + { + if (iFunction == EOomMonitorRequestOptionalRam) + { + TInt memoryAvailable = aBytesFree - CMemoryMonitor::GlobalConfig().iGoodRamThreshold; + + // If memory available is greater than the requested RAM then complete with the amount of free memory, otherwise complete with KErrNoMemory + if (memoryAvailable >= iMinimumMemoryRequested) + { + iRequestFreeRam.Complete(memoryAvailable); + } + else + { + iRequestFreeRam.Complete(KErrNoMemory); + } + } + else + iRequestFreeRam.Complete(aMemoryGood ? KErrNone : KErrNoMemory); + } + } +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oommonitor.cpp --- a/sysresmonitoring/oommonitor/src/oommonitor.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/src/oommonitor.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -16,41 +16,20 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include "oommonitor.h" -#include "oommonitorplugin.h" -#include "oommonitorplugin.hrh" +#include "oommemorymonitor.h" #include "oommonitorclientserver.h" - -#define OOM_WATCHDOG_STATUS_IDLE -1 +#include "OomTraces.h" -const TInt KPreallocatedSpaceForAppList = 50; -const TInt KPluginFreeMemoryTime = 100000; // 100 milliseconds for plugins to free memory, overridden by LafMemoryWatcher.rss +const TInt KStackSize = 0x2000; -_LIT(KDriveZ, "z:"); -_LIT(KOOMWatcherResourceFileName, "lafmemorywatcher.rsc"); _LIT(KOOMWatcherThreadName, "OOM FW"); -_LIT(KDummyWgName, "20"); // Implements just Error() to avoid panic -class CSimpleScheduler : public CActiveScheduler +NONSHARABLE_CLASS(CSimpleScheduler) : public CActiveScheduler { void Error( TInt ) const{} // From CActiveScheduler }; @@ -58,6 +37,8 @@ // thread function for OOM watcher GLDEF_C TInt WatcherThreadFunction( TAny* ) { + FUNC_LOG; + TInt err( KErrNone ); CTrapCleanup* cleanup = CTrapCleanup::New(); @@ -95,12 +76,14 @@ // Creates thread for OOM watchers EXPORT_C void CreateOOMWatcherThreadL() { + FUNC_LOG; + RThread thread; TInt ret = thread.Create( KOOMWatcherThreadName, WatcherThreadFunction, - 0x2000, // stack size + KStackSize, // stack size NULL, // uses caller thread's heap - (TAny*)NULL ); + NULL ); if ( ret == KErrNone ) { @@ -111,941 +94,10 @@ User::LeaveIfError( ret ); } - -// ====================================================================== -// class CMemoryMonitor -// ====================================================================== - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -CMemoryMonitor* CMemoryMonitor::NewL() - { // static - CMemoryMonitor* self = new(ELeave) CMemoryMonitor(); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - return self; - } - -CMemoryMonitor::CMemoryMonitor() -: iRamPluginRunTime(KPluginFreeMemoryTime), iCurrentTask(iWs), - iMemoryAboveThreshold(ETrue), iPluginMemoryGood(ETrue) - { - SetMemoryMonitorTls(this); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -CMemoryMonitor::~CMemoryMonitor() - { - if (iWatchdogStatusSubscriber) - { - iWatchdogStatusSubscriber->StopSubscribe(); - } - iWatchdogStatusProperty.Close(); - delete iWatchdogStatusSubscriber; - - delete iServer; - delete iWservEventReceiver; - delete iAppCloseTimer; - delete iAppCloseWatcher; - delete iOOMWatcher; - delete iPlugins; - iAppCloseOrderMap.Close(); - iWgIds.Close(); - delete iWgName; - iFs.Close(); - iWs.Close(); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void CMemoryMonitor::ConstructL() - { - User::LeaveIfError(iWs.Connect()); - - // Reserve enough space to build an app list later. - iWgIds.ReserveL(KPreallocatedSpaceForAppList); - // Reserve enough space for CApaWindowGroupName. - iWgName = CApaWindowGroupName::NewL(iWs); - iWgNameBuf = HBufC::NewL(CApaWindowGroupName::EMaxLength); - (*iWgNameBuf) = KDummyWgName; - iWgName->SetWindowGroupName(iWgNameBuf); // iWgName takes ownership of iWgNameBuf - - // Load up threshold & OOM app lists from resource. - User::LeaveIfError(iFs.Connect()); - - RResourceFile resFile; - TFileName filename(KDriveZ); - filename.Append(KDC_RESOURCE_FILES_DIR); - filename.Append(KOOMWatcherResourceFileName); - BaflUtils::NearestLanguageFile(iFs, filename); - resFile.OpenL(iFs, filename); - CleanupClosePushL(resFile); - - HBufC8* thresholds = resFile.AllocReadLC(R_APP_OOM_THRESHOLDS); - RResourceReader theReader; - theReader.OpenLC(*thresholds); - - iLowThreshold = theReader.ReadInt32L(); - iGoodThreshold = theReader.ReadInt32L(); - iMaxExitTime = theReader.ReadInt32L(); - TRAP_IGNORE(iRamPluginRunTime = theReader.ReadInt32L()); // trapped in case lafmemorywatcher.rss does not define this value - - CleanupStack::PopAndDestroy(&theReader); - CleanupStack::PopAndDestroy(thresholds); - - // apps to close first, first app in list gets closed first - ReadAppResourceArrayL(resFile, R_APP_OOM_EXIT_CANDIDATES, ECloseFirst, +1); // +1 means apps later in the list are closed later - // apps to never close, all apps get order ENeverClose - ReadAppResourceArrayL(resFile, R_APP_OOM_EXIT_NEVER, ENeverClose, 0); // 0 means that all apps get ENeverClose - // apps to close last, first app in list gets closed last - ReadAppResourceArrayL(resFile, R_APP_OOM_EXIT_LAST, ECloseLast, -1); // -1 means apps later in the list are closed earlier - - CleanupStack::PopAndDestroy(); // resFile.Close(); - - iPlugins = new(ELeave) COomPlugins; - iPlugins->ConstructL(); - - TInt err = iWatchdogStatusProperty.Attach(KPSUidUikon, KUikOOMWatchdogStatus); -#ifdef _DEBUG - RDebug::Print(_L("xxxx KUikOOMWatchdogStatus err=%d"), err); -#endif - err = iWatchdogStatusProperty.Set(OOM_WATCHDOG_STATUS_IDLE); - - iWatchdogStatusSubscriber = new (ELeave) CSubscribeHelper(TCallBack(WatchdogStatusStatusChanged, this), iWatchdogStatusProperty); - iWatchdogStatusSubscriber->SubscribeL(); - - iOOMWatcher = COutOfMemoryWatcher::NewL(*this, iLowThreshold, iGoodThreshold); - iOOMWatcher->Start(); - - iAppCloseTimer = CAppCloseTimer::NewL(*this); - iAppCloseWatcher = new(ELeave) CAppCloseWatcher(*this); - - iWservEventReceiver = new(ELeave) CWservEventReceiver(*this, iWs); - iWservEventReceiver->ConstructL(); - - iServer = CMemoryMonitorServer::NewL(*this); - } - -void CMemoryMonitor::ReadAppResourceArrayL(RResourceFile& aResFile, TInt aResId, TInt aOrderBase, TInt aOrderInc) - { - // apps in this list will be ordered starting from aOrderBase - TInt order = aOrderBase; - // get the resource and set up the resource reader - HBufC8* apps = aResFile.AllocReadLC(aResId); - TResourceReader theReader; - theReader.SetBuffer(apps); - // go through all apps in the list - TInt appsCount = theReader.ReadUint16(); - for (TInt ii = 0; ii < appsCount; ii++) - { - TInt appUid = theReader.ReadInt32(); - // insert the app UID with the appropriate order - iAppCloseOrderMap.Insert(appUid, order); - // change the order number as appropriate for this list - order += aOrderInc; - } - CleanupStack::PopAndDestroy(apps); - } - -void CMemoryMonitor::CancelAppCloseWatchers() - { - iAppCloserRunning = EFalse; - iCurrentTask.SetWgId(0); - if (iAppCloseTimer) - iAppCloseTimer->Cancel(); - if (iAppCloseWatcher) - iAppCloseWatcher->Cancel(); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void CMemoryMonitor::FreeMemThresholdCrossedL() - { - StartFreeSomeRamL(iGoodThreshold); - } - -void CMemoryMonitor::HandleFocusedWgChangeL() - { - // The focused window group has changed. - if (iAppCloserRunning) - { - // if the app closer is currently running, restart it - RestartAppCloser(); - } - else if (!iMemoryAboveThreshold) - { - // If memory is low, rescan for free memory - StartFreeSomeRamL(iGoodThreshold); - } - } - -void CMemoryMonitor::RestartAppCloser() - { - CancelAppCloseWatchers(); - // StartFreeSomeRamL is trapped so that clients waiting - // for completion will definitely receive it. - TRAPD(err, StartFreeSomeRamL(iCurrentTarget)) - if (err != KErrNone) - CloseAppsFinished(FreeMemoryAboveThreshold()); - } - -// --------------------------------------------------------- -// This function attempts to free enough RAM to leave the target amount of space free. -// This function could take a substantial time to return as it may have to close a number -// of applications, and each will be given a timeout of KAPPEXITTIMEOUT. -// --------------------------------------------------------- -// -void CMemoryMonitor::StartFreeSomeRamL(TInt aTargetFree) - { - // update the target if new target is higher - if (aTargetFree > iCurrentTarget) - iCurrentTarget = aTargetFree; - - // do nothing more if app closer is already running - if (iAppCloserRunning) - return; - - iCurrentTarget = aTargetFree; - - // check if there is enough free memory already. - if (FreeMemoryAboveThreshold()) - { - CloseAppsFinished(ETrue); - return; - } - - // Tell plugins to free memory - bool pluginsToldToFreeMemory = iPluginMemoryGood; - SetPluginMemoryGood(EFalse); - - // get the list of apps to free - GetWgsToCloseL(); - - if (pluginsToldToFreeMemory) - { - // Give the plugins a short time to free memory. - // App close timer will kick off the app closer. - iAppCloseTimer->After(iRamPluginRunTime); - } - else - { - // start closing apps - CloseNextApp(); - } - } - -void CMemoryMonitor::CloseNextApp() - { - if(iNextAppToClose >= 0) - { - // close an app, if there's an app to be closed -#ifdef _DEBUG - RDebug::Print(_L("OOM WATCHER: Target not achieved; continuing... Target:%d"),iCurrentTarget); -#endif - // CloseNextApp() may have been called by one of the event - // watchers, cancel them all to prevent more events from the - // last app before restarting the watchers for the new app to close - CancelAppCloseWatchers(); - iAppCloserRunning = ETrue; - // Set the TApaTask to the app - iCurrentTask.SetWgId(iWgIds[iNextAppToClose].iId); - // Start a timer and the thread watcher - iAppCloseTimer->After(iMaxExitTime); - iAppCloseWatcher->Start(iCurrentTask); - // Tell the app to close - iCurrentTask.EndTask(); - iNextAppToClose--; - } - else - { - // stop if we have no more apps - CloseAppsFinished(EFalse); - } - } - -// handle an app closed event -void CMemoryMonitor::CloseAppEvent() - { - if (FreeMemoryAboveThreshold()) - { - // stop if we have enough memory - CloseAppsFinished(ETrue); - } - else - { - // otherwise try to close another app - CloseNextApp(); - } - } - -// The app closer is finished -void CMemoryMonitor::CloseAppsFinished(TBool aMemoryGood) - { - CancelAppCloseWatchers(); -#ifdef _DEBUG - RDebug::Print(_L("OOM WATCHER: Final result: Target:%d Good?:%d"),iCurrentTarget,aMemoryGood); -#endif - iServer->CloseAppsFinished(aMemoryGood); - // plugins can start using memory if result is good - SetPluginMemoryGood(aMemoryGood); - } - -TBool CMemoryMonitor::FreeMemoryAboveThreshold() - { - // may cause some extra load but allows more precise action - User::CompressAllHeaps(); - - TInt current = 0; - HAL::Get( HALData::EMemoryRAMFree, current ); - -#ifdef _DEBUG - RDebug::Print(_L("OOM WATCHER: Free RAM now:%d "),current); -#endif - - iMemoryAboveThreshold = (current >= iCurrentTarget); - return iMemoryAboveThreshold; - } - -void CMemoryMonitor::GetWgsToCloseL() - { - // get all window groups, with info about parents - TInt numGroups = iWs.NumWindowGroups(0); - iWgIds.ReserveL(numGroups); - User::LeaveIfError(iWs.WindowGroupList(0, &iWgIds)); - - // Remove all child window groups, promote parents to foremost child position - ColapseWindowGroupTree(); - - // now rearange the list so that it only contains apps to close - // first remove the foreground window group - iWgIds.Remove(0); - - // go through the list from start to end. - // this divides the list into two sections. Apps that never - // close move towards the end of the list, apps that will close - // go towards the start. - // apps to close first will be placed further back in the close list. - TInt numAppsToClose = 0; // numAppsToClose marks the boundary between closing and non-closing apps - TInt count = iWgIds.Count(); - for (TInt ii=0; ii= numAppsToClose); // we are always looking at apps after the sorted section - // get the next window group - RWsSession::TWindowGroupChainInfo info = iWgIds[ii]; - // get the close order for the window group - TInt closeOrder = AppCloseOrder(ii, info.iId); - if (closeOrder == ENeverClose) - { - // leave apps which should not be closed in place, - // after the last app to close. - continue; - } - else - { - // We no longer need the parent id. Use it to store the close order, to avoid the need to allocate more array space - info.iParentId = closeOrder; - // remove the app from it's current position - iWgIds.Remove(ii); - // find the right place to insert the app (lower orders are put further back) - TInt insertPos; - for (insertPos = 0; insertPos < numAppsToClose; insertPos++) - { - // compare this close order with window groups already in the list, - // whose close order is stored in iParentId - if (closeOrder > iWgIds[insertPos].iParentId) - break; - } - // Insert the app in the correct place - ASSERT(insertPos <= ii && insertPos <= numAppsToClose); // apps to close are always moved to front, before the close boundary - iWgIds.Insert(info, insertPos); - numAppsToClose++; - } - } - - // start closing apps from the end of the list of apps to close - iNextAppToClose = numAppsToClose - 1; - } - -// Calculate the order number in which this app should be closed -// This is based on the app's UID and its window group Z-order -// Apps given a lower order will be closed before those with a -// higher order. -TInt CMemoryMonitor::AppCloseOrder(TInt aWgIndex, TInt aWgId) - { - // get the app's details - TPtr wgPtr(iWgNameBuf->Des()); - if (iWs.GetWindowGroupNameFromIdentifier(aWgId, wgPtr) != KErrNone) - return ENeverClose; - iWgName->SetWindowGroupName(iWgNameBuf); - TUid uid = iWgName->AppUid(); // This UID comes from the app, not the mmp! - TInt* order = iAppCloseOrderMap.Find(uid.iUid); - - // The default app close order is normal with further - // back apps getting a lower order - TInt closeOrder = ECloseNormal - aWgIndex; - if (order) - { - // Apps with a defined close order get that order. - closeOrder = *order; - } - else if (uid.iUid == 0 || iWgName->IsSystem() || iWgName->Hidden() || iWgName->IsBusy()) - { - // Apps that should never close get the ENeverClose rank - closeOrder = ENeverClose; - } - - return closeOrder; - } - -void CMemoryMonitor::SetPluginMemoryGood(TBool aSetToGood) - { - if (aSetToGood && !iPluginMemoryGood) - iPlugins->MemoryGood(); - else if (!aSetToGood && iPluginMemoryGood) - iPlugins->FreeRam(); - iPluginMemoryGood = aSetToGood; - } - - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -TInt CMemoryMonitor::WatchdogStatusStatusChanged(TAny* aPtr) - { - CMemoryMonitor* self = STATIC_CAST(CMemoryMonitor*,aPtr); - if (self) - self->HandleWatchdogStatusCallBackL(); - return KErrNone; - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void CMemoryMonitor::HandleWatchdogStatusCallBackL() - { - // Someone has set the key to request some free memory. - TInt target = 0; - iWatchdogStatusProperty.Get(target); - - // Try to free the RAM. - if (target >= 1) - { - iOOMWatcher->Cancel(); // Pause memory notifys. - TRAP_IGNORE(StartFreeSomeRamL(target)); // This call could take a few seconds to do its stuff. - iOOMWatcher->Start(); // Restarts memory monitoring. - } - // Set the key back to OOM_WATCHDOG_STATUS_IDLE to indicate we're done. - iWatchdogStatusProperty.Set(OOM_WATCHDOG_STATUS_IDLE); - } - -// --------------------------------------------------------- -// Remove child window groups. Promote parent window groups forward to child position -// --------------------------------------------------------- -// -void CMemoryMonitor::ColapseWindowGroupTree() - { - // start from the front, wg count can reduce as loop runs - for (TInt ii=0; ii 0) // wg has a parent - { - // Look for the parent position - TInt parentPos = ii; // use child pos as not-found signal - TInt count = iWgIds.Count(); - for (TInt jj=0; jj ii) // parent should be moved forward - { - iWgIds[ii] = iWgIds[parentPos]; - iWgIds.Remove(parentPos); - } - else if (parentPos < ii) // parent is already ahead of child, remove child - iWgIds.Remove(ii); - else // parent not found, skip - ii++; - } - else // wg does not have a parent, skip - ii++; - } - } - -void CMemoryMonitor::AppNotExiting(TInt aWgId) - { - if (aWgId == iCurrentTask.WgId()) - CloseAppEvent(); - } - - -// ====================================================================== -// class COutOfMemoryWatcher -// - notifies when free memory crosses preset thresholds -// ====================================================================== - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -COutOfMemoryWatcher* COutOfMemoryWatcher::NewL(CMemoryMonitor& aMonitor, TInt aLowThreshold, TInt aGoodThreshold) - { - COutOfMemoryWatcher* self = new (ELeave) COutOfMemoryWatcher(aMonitor); - CleanupStack::PushL(self); - self->ConstructL(aLowThreshold, aGoodThreshold); - CleanupStack::Pop(self); - return self; - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -COutOfMemoryWatcher::~COutOfMemoryWatcher() - { - Cancel(); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -COutOfMemoryWatcher::COutOfMemoryWatcher(CMemoryMonitor& aMonitor) -: CActive(CActive::EPriorityStandard), - iLafShutdown(aMonitor) - { - CActiveScheduler::Add(this); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void COutOfMemoryWatcher::ConstructL(TInt aLowThreshold, TInt aGoodThreshold) - { - UserSvr::SetMemoryThresholds(aLowThreshold,aGoodThreshold); - User::LeaveIfError(iChangeNotifier.Create()); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void COutOfMemoryWatcher::Start() - { - if (!IsActive()) - { - iChangeNotifier.Logon(iStatus); - SetActive(); - } - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void COutOfMemoryWatcher::DoCancel() - { - iChangeNotifier.LogonCancel(); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void COutOfMemoryWatcher::RunL() - { - TInt status = iStatus.Int(); - - if (status < 0) - { - User::Leave(status); - } - - // Check for memory status change. - if (status & EChangesFreeMemory) - { - iLafShutdown.FreeMemThresholdCrossedL(); - } - - // We are not active until FreeMemThresholdCrossedL returns. - Start(); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -CSubscribeHelper::CSubscribeHelper(TCallBack aCallBack, RProperty& aProperty) - : CActive(EPriorityNormal), iCallBack(aCallBack), iProperty(aProperty) - { - CActiveScheduler::Add(this); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -CSubscribeHelper::~CSubscribeHelper() - { - Cancel(); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void CSubscribeHelper::SubscribeL() - { - if (!IsActive()) - { - iProperty.Subscribe(iStatus); - SetActive(); - } - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void CSubscribeHelper::StopSubscribe() - { - Cancel(); - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void CSubscribeHelper::RunL() - { - if (iStatus.Int() == KErrNone) - { - iCallBack.CallBack(); - SubscribeL(); - } - } - -// --------------------------------------------------------- -// -// --------------------------------------------------------- -// -void CSubscribeHelper::DoCancel() - { - iProperty.Cancel(); - } - - -COomPlugins::COomPlugins() - { - } - -COomPlugins::~COomPlugins() - { - TInt count = iPlugins.Count(); - for (TInt ii=0; iiImplementationUid()); - plugin.iImpl = static_cast(REComSession::CreateImplementationL(uid, plugin.iDtorUid, NULL)); - } - - CleanupStack::PopAndDestroy(&implArray); - } - -void COomPlugins::FreeRam() - { - TInt count = iPlugins.Count(); - for (TInt ii=0; iiFreeRam(); - } - } - -void COomPlugins::MemoryGood() - { - TInt count = iPlugins.Count(); - for (TInt ii=0; iiMemoryGood(); - } - } - -COomPlugins::TPlugin::TPlugin() -: iImpl(0) - { - } - - -CAppCloseTimer* CAppCloseTimer::NewL(CMemoryMonitor& aMonitor) - { - CAppCloseTimer* self = new(ELeave)CAppCloseTimer(aMonitor); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - return self; - } - -CAppCloseTimer::CAppCloseTimer(CMemoryMonitor& aMonitor) -: CTimer(CActive::EPriorityStandard), iMonitor(aMonitor) - { - CActiveScheduler::Add(this); - } - -void CAppCloseTimer::RunL() - { - iMonitor.CloseAppEvent(); - } - - - -CAppCloseWatcher::CAppCloseWatcher(CMemoryMonitor& aMonitor) -: CActive(CActive::EPriorityStandard), iMonitor(aMonitor) - { - CActiveScheduler::Add(this); - } - -CAppCloseWatcher::~CAppCloseWatcher() - { - Cancel(); - } - -void CAppCloseWatcher::Start(const TApaTask& aTask) - { - TInt err = iThread.Open(aTask.ThreadId()); - if (err == KErrNone) - { - iOriginalProcessPriority = iThread.ProcessPriority(); - iThread.SetProcessPriority(EPriorityForeground); - iThread.Logon(iStatus); - SetActive(); - } - else - { - iStatus = KRequestPending; - TRequestStatus* s = &iStatus; - User::RequestComplete(s, err); - SetActive(); - } - } - -void CAppCloseWatcher::DoCancel() - { - iThread.LogonCancel(iStatus); - iThread.SetProcessPriority(iOriginalProcessPriority); - iThread.Close(); - } - -void CAppCloseWatcher::RunL() - { - if (iThread.Handle()) - iThread.SetProcessPriority(iOriginalProcessPriority); - iThread.Close(); - // Experimentation shows that memory may take up to 40ms - // to be released back to the system after app thread close. - // Using this delay should minimise the number of apps that - // need to be closed to recover the necessary memory. - const TInt KAppTidyUpDelay = 40000; - User::After(KAppTidyUpDelay); - iMonitor.CloseAppEvent(); - } - - - -CWservEventReceiver::CWservEventReceiver(CMemoryMonitor& aMonitor, RWsSession& aWs) -: CActive(CActive::EPriorityStandard), iMonitor(aMonitor), iWs(aWs), iWg(aWs) - { - CActiveScheduler::Add(this); - } - -CWservEventReceiver::~CWservEventReceiver() - { - Cancel(); - iWg.Close(); - } - -void CWservEventReceiver::ConstructL() - { - User::LeaveIfError(iWg.Construct((TUint32)this, EFalse)); - iWg.SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront); - iWg.EnableFocusChangeEvents(); - Queue(); - } - -void CWservEventReceiver::Queue() - { - iWs.EventReady(&iStatus); - SetActive(); - } - -void CWservEventReceiver::DoCancel() - { - iWs.EventReadyCancel(); - } - -void CWservEventReceiver::RunL() - { - TWsEvent event; - iWs.GetEvent(event); - if (event.Type() == EEventFocusGroupChanged) - iMonitor.HandleFocusedWgChangeL(); - Queue(); - } - - - -CMemoryMonitorServer* CMemoryMonitorServer::NewL(CMemoryMonitor& aMonitor) - { - CMemoryMonitorServer* self=new(ELeave) CMemoryMonitorServer(aMonitor); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - return self; - } - -CMemoryMonitorServer::~CMemoryMonitorServer() - { - } - -CMemoryMonitorServer::CMemoryMonitorServer(CMemoryMonitor& aMonitor) -:CServer2(CActive::EPriorityStandard), iMonitor(aMonitor) - { - } - -void CMemoryMonitorServer::ConstructL() - { - StartL(KMemoryMonitorServerName); - } - -CSession2* CMemoryMonitorServer::NewSessionL(const TVersion& /*aVersion*/, const RMessage2& /*aMessage*/) const - { - return new(ELeave) CMemoryMonitorSession(); - } - -TInt CMemoryMonitorServer::RunError(TInt aError) - { - Message().Complete(aError); - // - // The leave will result in an early return from CServer::RunL(), skipping - // the call to request another message. So do that now in order to keep the - // server running. - ReStart(); - return KErrNone; // handled the error fully - } - -CMemoryMonitor& CMemoryMonitorServer::Monitor() - { - return iMonitor; - } - -void CMemoryMonitorServer::CloseAppsFinished(TBool aMemoryGood) - { - iSessionIter.SetToFirst(); - CSession2* s; - while ((s = iSessionIter++) != 0) - static_cast(s)->CloseAppsFinished(aMemoryGood); - } - - -CMemoryMonitorSession::CMemoryMonitorSession() - { - } - -void CMemoryMonitorSession::CreateL() - { - } - -CMemoryMonitorSession::~CMemoryMonitorSession() - { - } - -CMemoryMonitorServer& CMemoryMonitorSession::Server() - { - return *static_cast(const_cast(CSession2::Server())); - } - -CMemoryMonitor& CMemoryMonitorSession::Monitor() - { - return Server().Monitor(); - } - -void CMemoryMonitorSession::ServiceL(const RMessage2& aMessage) - { - aMessage.HasCapabilityL(ECapabilityWriteDeviceData); //Leaves if client has not correct capability - switch (aMessage.Function()) - { - case EOomMonitorRequestFreeMemory: - if (!iRequestFreeRam.IsNull()) - PanicClient(aMessage, EPanicRequestActive); - // message will be completed when CloseAppsFinished() is called. - iRequestFreeRam = aMessage; - Monitor().StartFreeSomeRamL(aMessage.Int0()); - break; - - case EOomMonitorCancelRequestFreeMemory: - if (!iRequestFreeRam.IsNull()) - iRequestFreeRam.Complete(KErrCancel); - aMessage.Complete(KErrNone); - break; - - case EOomMonitorThisAppIsNotExiting: - Monitor().AppNotExiting(aMessage.Int0()); - aMessage.Complete(KErrNone); - break; - - default: - PanicClient(aMessage, EPanicIllegalFunction); - break; - } - } - -void CMemoryMonitorSession::CloseAppsFinished(TBool aMemoryGood) - { - if (!iRequestFreeRam.IsNull()) - iRequestFreeRam.Complete(aMemoryGood ? KErrNone : KErrNoMemory); - } - - void PanicClient(const RMessagePtr2& aMessage,TOomMonitorClientPanic aPanic) { + FUNC_LOG; + aMessage.Panic(KMemoryMonitorServerName, aPanic); } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oommonitorplugin.cpp --- a/sysresmonitoring/oommonitor/src/oommonitorplugin.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/src/oommonitorplugin.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -16,26 +16,33 @@ */ +#include #include "oommonitorplugin.h" -#include "oommonitor.h" -#include +#include "oommemorymonitor.h" +#include "OomTraces.h" // TLS is used to store the CMemoryMonitor pointer, CMemoryMonitor // being the main object in the OOM monitor thread. This allows // plugins to access the CMemoryMonitor object easily. EXPORT_C void SetMemoryMonitorTls(CMemoryMonitor* aMonitor) { + FUNC_LOG; + Dll::SetTls(aMonitor); } CMemoryMonitor* MemoryMonitorTls() { + FUNC_LOG; + return static_cast(Dll::Tls()); } void OomMonitorPluginPanic(TOomMonitorPluginPanic aReason) { + FUNC_LOG; + _LIT(KCat, "OomMonitorPlugin"); User::Panic(KCat, aReason); } @@ -43,34 +50,53 @@ EXPORT_C COomMonitorPlugin::COomMonitorPlugin() : iMemoryMonitor(MemoryMonitorTls()) - { - __ASSERT_ALWAYS(iMemoryMonitor, OomMonitorPluginPanic(EOomMonitorPluginPanic_PluginConstructedOutsideOomMonitorThread)); - } + { + FUNC_LOG; + + __ASSERT_ALWAYS(iMemoryMonitor, OomMonitorPluginPanic(EOomMonitorPluginPanic_PluginConstructedOutsideOomMonitorThread)); + } EXPORT_C COomMonitorPlugin::~COomMonitorPlugin() - { - } + { + FUNC_LOG; + } EXPORT_C void COomMonitorPlugin::ConstructL() - { - // CAppOomMonitorPlugin assumes ConstructL is empty - } + { + FUNC_LOG; + + // CAppOomMonitorPlugin assumes ConstructL is empty + } EXPORT_C void COomMonitorPlugin::ExtensionInterface(TUid /*aInterfaceId*/, TAny*& /*aImplementaion*/) - { - } + { + FUNC_LOG; + } EXPORT_C RFs& COomMonitorPlugin::FsSession() { + FUNC_LOG; + return iMemoryMonitor->iFs; } EXPORT_C RWsSession& COomMonitorPlugin::WsSession() { + FUNC_LOG; + return iMemoryMonitor->iWs; } + +EXPORT_C void COomMonitorPluginV2::FreeRam() + { + // Note that OomMonitorV2 will not call this version of the function + // so it does not need to be implemented in derived classes. + } + + + EXPORT_C CAppOomMonitorPlugin* CAppOomMonitorPlugin::NewL(TUid aAppUid) { CAppOomMonitorPlugin* self = new(ELeave) CAppOomMonitorPlugin(aAppUid); @@ -96,18 +122,18 @@ void CAppOomMonitorPlugin::SendMessageToApp(TInt aMessage) { RWsSession& ws = WsSession(); - TInt wgId = 0; + TInt wgId = 0; do { - CApaWindowGroupName::FindByAppUid(iAppUid, ws, wgId); - if (wgId>0) - { - TWsEvent event; - event.SetType(aMessage); - event.SetTimeNow(); - ws.SendEventToWindowGroup(wgId, event); - } + CApaWindowGroupName::FindByAppUid(iAppUid, ws, wgId); + if (wgId>0) + { + TWsEvent event; + event.SetType(aMessage); + event.SetTimeNow(); + ws.SendEventToWindowGroup(wgId, event); + } } - while (wgId>0); + while (wgId>0); } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oommonitorsession.cpp --- a/sysresmonitoring/oommonitor/src/oommonitorsession.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/sysresmonitoring/oommonitor/src/oommonitorsession.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -16,33 +16,104 @@ */ -#include "oommonitorsession.h" +#include +#include #include "oommonitorclientserver.h" +#include "oompanic.h" +#include "OomTraces.h" EXPORT_C TInt ROomMonitorSession::Connect() - { - return CreateSession(KMemoryMonitorServerName, TVersion(0,0,0)); - } + { + FUNC_LOG; + + return CreateSession(KMemoryMonitorServerName, TVersion(0,0,0)); + } EXPORT_C TInt ROomMonitorSession::RequestFreeMemory(TInt aBytesRequested) - { - TIpcArgs p(aBytesRequested); - return SendReceive(EOomMonitorRequestFreeMemory, p); - } + { + FUNC_LOG; + + TIpcArgs p(aBytesRequested); + return SendReceive(EOomMonitorRequestFreeMemory, p); + } + +EXPORT_C TInt ROomMonitorSession::RequestOptionalRam(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable) + { + FUNC_LOG; + + TIpcArgs p(aBytesRequested, aMinimumBytesNeeded, aPluginId, aBytesAvailable); + TInt ret = SendReceive(EOomMonitorRequestOptionalRam, p); + if (ret >= 0) + { + aBytesAvailable = ret; + ret = KErrNone; + } + + return ret; + } + + + +EXPORT_C void ROomMonitorSession::RequestOptionalRam(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TRequestStatus& aStatus) + { + FUNC_LOG; + + TIpcArgs p(aBytesRequested, aMinimumBytesNeeded, aPluginId); + SendReceive(EOomMonitorRequestOptionalRam, p, aStatus); + } EXPORT_C void ROomMonitorSession::RequestFreeMemory(TInt aBytesRequested, TRequestStatus& aStatus) - { - TIpcArgs p(aBytesRequested); - SendReceive(EOomMonitorRequestFreeMemory, p, aStatus); - } + { + FUNC_LOG; + + TIpcArgs p(aBytesRequested); + SendReceive(EOomMonitorRequestFreeMemory, p, aStatus); + } EXPORT_C void ROomMonitorSession::CancelRequestFreeMemory() - { - SendReceive(EOomMonitorCancelRequestFreeMemory, TIpcArgs()); - } + { + FUNC_LOG; + + SendReceive(EOomMonitorCancelRequestFreeMemory, TIpcArgs()); + } EXPORT_C void ROomMonitorSession::ThisAppIsNotExiting(TInt aWgId) - { - TIpcArgs p(aWgId); - SendReceive(EOomMonitorThisAppIsNotExiting, p); - } + { + FUNC_LOG; + + TIpcArgs p(aWgId); + SendReceive(EOomMonitorThisAppIsNotExiting, p); + } + + +EXPORT_C void ROomMonitorSession::SetOomPriority(TOomPriority aPriority) + { + FUNC_LOG; + + CCoeEnv* coeEnv = CCoeEnv::Static(); + + __ASSERT_DEBUG(coeEnv, OomMonitorPanic(KNoCoeEnvFound)); + + if (coeEnv) + { + TInt wgId = coeEnv->RootWin().Identifier(); + TIpcArgs p(wgId); + switch (aPriority) + { + case EOomPriorityNormal: + SendReceive(EOomMonitorSetPriorityNormal, p); + break; + case EOomPriorityHigh: + SendReceive(EOomMonitorSetPriorityHigh, p); + break; + case EOomPriorityBusy: + SendReceive(EOomMonitorSetPriorityBusy, p); + break; + default: + OomMonitorPanic(KOomInvalidPriority); + break; + } + } + } + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomoutofmemorywatcher.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomoutofmemorywatcher.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,152 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + + + +#include "oomoutofmemorywatcher.h" +#include "oommemorymonitor.h" +#include "OomTraces.h" +#include + +// ====================================================================== +// class COutOfMemoryWatcher +// - notifies when free memory crosses preset thresholds +// ====================================================================== + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +COutOfMemoryWatcher* COutOfMemoryWatcher::NewL(CMemoryMonitor& aMonitor, TInt aLowRamThreshold, TInt aGoodRamThreshold, TBool aSwapUsageMonitored, TInt aLowSwapThreshold, TInt aGoodSwapThreshold) + { + FUNC_LOG; + + COutOfMemoryWatcher* self = new (ELeave) COutOfMemoryWatcher(aMonitor, aSwapUsageMonitored); + CleanupStack::PushL(self); + self->ConstructL(aLowRamThreshold, aGoodRamThreshold, aLowSwapThreshold, aGoodSwapThreshold); + CleanupStack::Pop(self); + return self; + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +COutOfMemoryWatcher::~COutOfMemoryWatcher() + { + FUNC_LOG; + + Cancel(); + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +COutOfMemoryWatcher::COutOfMemoryWatcher(CMemoryMonitor& aMonitor, TBool aSwapUsageMonitored) +: CActive(CActive::EPriorityStandard), + iMemoryMonitor(aMonitor), + iSwapUsageMonitored(aSwapUsageMonitored) + { + FUNC_LOG; + + CActiveScheduler::Add(this); + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void COutOfMemoryWatcher::ConstructL(TInt aLowRamThreshold, TInt aGoodRamThreshold, TInt aLowSwapThreshold, TInt aGoodSwapThreshold) + { + FUNC_LOG; + + UserSvr::SetMemoryThresholds(aLowRamThreshold,aGoodRamThreshold); + if (iSwapUsageMonitored) + { + SVMSwapThresholds thresholds; + thresholds.iLowThreshold = aLowSwapThreshold; + thresholds.iGoodThreshold = aGoodSwapThreshold; + UserSvr::HalFunction(EHalGroupVM, EVMHalSetSwapThresholds, &thresholds, 0); + } + User::LeaveIfError(iChangeNotifier.Create()); + } + +void COutOfMemoryWatcher::UpdateThresholds(TInt aLowRamThreshold, TInt aGoodRamThreshold, TInt aLowSwapThreshold, TInt aGoodSwapThreshold) + { + FUNC_LOG; + + UserSvr::SetMemoryThresholds(aLowRamThreshold,aGoodRamThreshold); + if (iSwapUsageMonitored) + { + SVMSwapThresholds thresholds; + thresholds.iLowThreshold = aLowSwapThreshold; + thresholds.iGoodThreshold = aGoodSwapThreshold; + UserSvr::HalFunction(EHalGroupVM, EVMHalSetSwapThresholds, &thresholds, 0); + } + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void COutOfMemoryWatcher::Start() + { + FUNC_LOG; + + if (!IsActive()) + { + iChangeNotifier.Logon(iStatus); + SetActive(); + } + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void COutOfMemoryWatcher::DoCancel() + { + FUNC_LOG; + + iChangeNotifier.LogonCancel(); + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void COutOfMemoryWatcher::RunL() + { + FUNC_LOG; + + TInt status = iStatus.Int(); + + if (status < 0) + { + User::Leave(status); + } + + // Check for memory status change. + if (status & EChangesFreeMemory) + { + iMemoryMonitor.FreeMemThresholdCrossedL(); + } + + // We are not active until FreeMemThresholdCrossedL returns. + Start(); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oompanic.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oompanic.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Panic codes for OOM monitor. +* +*/ + +#include "oompanic.h" + +#include + +void OomMonitorPanic(TOomMonitorPanic aReason) + { + _LIT(KCat, "OomMonitor"); + User::Panic(KCat, aReason); + } + +void OomConfigParserPanic(TInt aReason) + { + _LIT(KParserCat, "OomParser"); + User::Panic(KParserCat, aReason); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oompluginwaiter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oompluginwaiter.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,55 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + + +#include "oompluginwaiter.h" +#include "oomrunplugin.h" +#include "OomTraces.h" +#include "oomconstants.hrh" + +COomPluginWaiter* COomPluginWaiter::NewL(TInt aMillisecondsToWait, COomRunPlugin& aCallbackClass) + { + FUNC_LOG; + + COomPluginWaiter* self = new (ELeave) COomPluginWaiter(aMillisecondsToWait, aCallbackClass); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +COomPluginWaiter::COomPluginWaiter(TInt aMillisecondsToWait, COomRunPlugin& aCallbackClass) : CTimer(EPriorityStandard), iMillisecondsToWait(aMillisecondsToWait), iCallbackClass(aCallbackClass) + { + FUNC_LOG; + + CActiveScheduler::Add(this); + } + +// Start the timer, it will call the plugin back when it expires +void COomPluginWaiter::Start() + { + FUNC_LOG; + + HighRes(iMillisecondsToWait * KMicrosecondsInMillisecond); + } + +void COomPluginWaiter::RunL() + { + FUNC_LOG; + + iCallbackClass.WaitCompleted(); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomrunplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomrunplugin.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,96 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Classes for executing OOM actions (e.g. closing applications and running plugins). +* +*/ + +#include "oomrunplugin.h" +#include "OomTraces.h" +#include "oommemorymonitor.h" +#include "oommonitorplugin.h" +#include "oompanic.h" + +COomRunPlugin* COomRunPlugin::NewL(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin) + { + FUNC_LOG; + + COomRunPlugin* self = new (ELeave) COomRunPlugin(aPluginId, aConfig, aStateChangeObserver, aPlugin, aV2Plugin); + CleanupStack::PushL(self); + self->ConstructL(aConfig); + CleanupStack::Pop(self); + return self; + } + +// Run the OOM plugin in order to free memory +// Call the COomAction::MemoryFreed when it is done +void COomRunPlugin::FreeMemory(TInt aBytesRequested, TBool) + { + FUNC_LOG; + TRACES1("COomRunPlugin::FreeMemory: iPluginId = %x", iPluginId); + + // Ask the plugin to free some memory + + // Do we have a V2 plugin, if so then use it + if (iV2Plugin) + iV2Plugin->FreeRam(aBytesRequested); + else + // If we only have a V1 plugin then use that + iPlugin.FreeRam(); + + iFreeMemoryCalled = ETrue; + + // Wait for the required time before we signal completion. + __ASSERT_DEBUG(!iPluginWaiter->IsActive(), OomMonitorPanic(KStartingActivePluginWaiter)); + iPluginWaiter->Start(); + } + +// Call the memory good function on the plugin but... +// only if there is an outstanding FreeMemory request +void COomRunPlugin::MemoryGood() + { + FUNC_LOG; + + if (iFreeMemoryCalled) + { + iPlugin.MemoryGood(); + iFreeMemoryCalled = EFalse; + } + } + +COomRunPlugin::~COomRunPlugin() + { + FUNC_LOG; + + delete iPluginWaiter; + } + +COomRunPlugin::COomRunPlugin(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin) : COomAction(aStateChangeObserver), iPluginId(aPluginId), iPlugin(aPlugin), iConfig(aConfig), iV2Plugin(aV2Plugin) + { + FUNC_LOG; + } + +void COomRunPlugin::ConstructL(COomRunPluginConfig& aPluginConfig) + { + FUNC_LOG; + + TInt waitDuration = CMemoryMonitor::GlobalConfig().iDefaultWaitAfterPlugin; + + if (aPluginConfig.WaitAfterPluginDefined()) + { + // If the wait duration for this plugin is overridden then use the overridden value + waitDuration = aPluginConfig.WaitAfterPlugin(); + } + + iPluginWaiter = COomPluginWaiter::NewL(waitDuration, *this); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomrunpluginconfig.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomrunpluginconfig.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,54 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Configuration representation classes for Out of Memory Monitor. +* +*/ + + +#include "oomrunpluginconfig.h" +#include "oomwindowgrouplist.h" +#include "OomTraces.h" + +COomRunPluginConfig* COomRunPluginConfig::NewL(TUint aPluginId, TOomPluginType aPluginType) + { + FUNC_LOG; + + COomRunPluginConfig* self = new (ELeave) COomRunPluginConfig(aPluginId, aPluginType); + return self; + } + +TUint COomRunPluginConfig::CalculatePluginPriority(const COomWindowGroupList& aWindowGroupList) + { + FUNC_LOG; + + // Call the Priority function on the CActionConfig base class + // This function will check if any rules match the current system state and then adjust the priority if they do + // Rules may apply to system plugins or application plugins + return Priority(aWindowGroupList, aWindowGroupList.GetIndexFromAppId(iTargetAppId)); + } + + +COomRunPluginConfig::~COomRunPluginConfig() + { + FUNC_LOG; + } + + +COomRunPluginConfig::COomRunPluginConfig(TUint aPluginId, TOomPluginType aPluginType) : COomActionConfig(aPluginId), iPluginId(aPluginId), iPluginType(aPluginType) + { + FUNC_LOG; + + iSyncMode = EContinueIgnoreMaxBatchSize; + iCallIfTargetAppNotRunning = ETrue; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomsubscribehelper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomsubscribehelper.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,96 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + +#include +#include "oomsubscribehelper.h" +#include "OomTraces.h" + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +CSubscribeHelper::CSubscribeHelper(TCallBack aCallBack, RProperty& aProperty) + : CActive(EPriorityNormal), iCallBack(aCallBack), iProperty(aProperty) + { + FUNC_LOG; + + CActiveScheduler::Add(this); + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +CSubscribeHelper::~CSubscribeHelper() + { + FUNC_LOG; + + Cancel(); + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void CSubscribeHelper::Subscribe() + { + FUNC_LOG; + + if (!IsActive()) + { + iProperty.Subscribe(iStatus); + SetActive(); + } + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void CSubscribeHelper::StopSubscribe() + { + FUNC_LOG; + + Cancel(); + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void CSubscribeHelper::RunL() + { + FUNC_LOG; + + if (iStatus.Int() == KErrNone) + { + iCallBack.CallBack(); + Subscribe(); + } + } + +// --------------------------------------------------------- +// +// --------------------------------------------------------- +// +void CSubscribeHelper::DoCancel() + { + FUNC_LOG; + + iProperty.Cancel(); + } + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomwindowgrouplist.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomwindowgrouplist.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,480 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: A wrapper for the window group list, adding additional functionality required by OOM Monitor v2. +* +*/ + +#include +#include +#include +#include + +#include "oomwindowgrouplist.h" +#include "OomTraces.h" +#include "oomconstants.hrh" +#include "oompanic.h" + +_LIT(KDummyWgName, "20"); +const TInt KPreallocatedSpaceForAppList = 50; + +const TUint KOomTicksPerSecond = 1000; + +COomWindowGroupList::TOomWindowGroupProperties::TOomWindowGroupProperties() : iIdleTickTime(0), iDynamicPriority(EOomPriorityNormal) + { + FUNC_LOG; + } + +// Update the list of window groups +void COomWindowGroupList::Refresh() + { + FUNC_LOG; + +#ifdef _DEBUG + TRAPD(err, RefreshL()); + if (err) + { + TRACES1("COomWindowGroupList::Refresh(): RefreshL leave %d", err); + } +#else + TRAP_IGNORE(RefreshL()); + // Ignore any error + // Errors are very unlikely, the only possibility is OOM errors (which should be very unlikely due to pre-created, re-reserved lists) + // The outcome of any error is that the most foreground operations will be missing from the list + // meaning that they will not be considered candidates for closing +#endif + } + +// Update the list of window groups +// Should be called whenever the +void COomWindowGroupList::RefreshL() + { + FUNC_LOG; + + // Refresh window group list + // get all window groups, with info about parents + TInt numGroups = iWs.NumWindowGroups(0); + iWgIds.ReserveL(numGroups); + User::LeaveIfError(iWs.WindowGroupList(0, &iWgIds)); + + // Remove all child window groups, promote parents to foremost child position + CollapseWindowGroupTree(); + + // Note the current foreground window ID (if there is one) + TBool oldForegroundWindowExists = EFalse; + + TInt oldForegroundWindowId; + if (iWgIds.Count() > 0) + { + oldForegroundWindowId = iWgIds[0].iId; + oldForegroundWindowExists = ETrue; + } + + // Cleanup the idletime hash map to remove idle times for any windows that have closed + RemovePropertiesForClosedWindowsL(); + + // Update the idle tick on the old foreground application (which might now be in the background) + // This will be set to the current system tick count and will be used later to determine the idle time + if (oldForegroundWindowExists) + { + TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(oldForegroundWindowId); + if (wgProperties) + { + wgProperties->iIdleTickTime = User::NTickCount(); + } + + // If there is no idle tick entry for this window ID then it will be created in the next step... + } + + TInt index = iWgIds.Count(); + + while (index--) + { + // See if there is a tick count entry for each window in the list + TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(iWgIds[index].iId); + + if (!wgProperties) + { + TOomWindowGroupProperties wgProperties; + wgProperties.iIdleTickTime = User::NTickCount(); + // If there is no idle tick entry for this window then add one + iWgToPropertiesMapping.InsertL(iWgIds[index].iId, wgProperties); + } + } + } + + + +void COomWindowGroupList::RemovePropertiesForClosedWindowsL() + { + FUNC_LOG; + + // First, clear the existing set of window IDs (it would be quicker to delete it BUT we have reserved memory for it and don't want to be allocating in low memory conditions) + RHashSet::TIter windowIdSetIter(iExistingWindowIds); + while (windowIdSetIter.Next()) + { + windowIdSetIter.RemoveCurrent(); + } + + // Create the set of existing window IDs (this saves expensive/repeated searching later on) + TInt index = iWgIds.Count(); + while (index--) + { + iExistingWindowIds.InsertL(iWgIds[index].iId); + } + + // Iterate the idle-time hash map - remove any items where the window no longer exists + RHashMap::TIter wgToIdleIterator(iWgToPropertiesMapping); + while (wgToIdleIterator.NextKey()) + { + // If the current key (window ID) does not exist in the set then remove the idle-time as it is no longer relevant + if (!iExistingWindowIds.Find(*(wgToIdleIterator.CurrentKey()))) + wgToIdleIterator.RemoveCurrent(); + } + } + + +TUint COomWindowGroupList::AppId(TInt aIndex, TBool aResolveFromThread) const + { + FUNC_LOG; + + // get the app's details + TPtr wgPtr(iWgNameBuf->Des()); + + TUid uid; + + __ASSERT_DEBUG(aIndex < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds)); + TInt wgId = iWgIds[aIndex].iId; + + TInt err = iWs.GetWindowGroupNameFromIdentifier(wgId, wgPtr); + + if (KErrNone != err) + // If there is an error then set the UID to 0; + { + uid.iUid = 0; + } + else + { + iWgName->SetWindowGroupName(iWgNameBuf); // iWgName takes ownership of iWgNameBuf + uid = iWgName->AppUid(); // This UID comes from the app, not the mmp! + if (aResolveFromThread && uid.iUid == 0) + { + TApaTask task(iWs); + task.SetWgId(wgId); + TThreadId threadId = task.ThreadId(); + + TUint resolvedUid = 0; + RThread appThread; + TInt err = appThread.Open( threadId ); + if ( err == KErrNone ) + { + resolvedUid = appThread.SecureId().iId; + } + appThread.Close(); + TRACES2("COomWindowGroupList::AppId: NULL wg UID, taking from thread; resolvedUid = %x aIndex = %d", resolvedUid, aIndex); + return resolvedUid; + } + } + + return uid.iUid; + } + + +TTimeIntervalSeconds COomWindowGroupList::IdleTime(TInt aIndex) const + { + FUNC_LOG; + + TUint32 currentTickCount = User::NTickCount(); + + __ASSERT_DEBUG(aIndex < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds)); + const TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(iWgIds[aIndex].iId); + + TTimeIntervalSeconds idleTime = 0; + + if (wgProperties) + { + // This should also handle the case where the current tick count has wrapped to a lower value than the idle tick time + // It will only work if it has wrapped once, but + TUint32 differenceBetweenTickCounts = currentTickCount - wgProperties->iIdleTickTime; + idleTime = differenceBetweenTickCounts / KOomTicksPerSecond; + } + + return idleTime; + } + + + +void COomWindowGroupList::CollapseWindowGroupTree() + { + FUNC_LOG; + + // start from the front, wg count can reduce as loop runs + for (TInt ii=0; ii 0) // wg has a parent + { + // Look for the parent position + TInt parentPos = ii; // use child pos as not-found signal + TInt count = iWgIds.Count(); + for (TInt jj=0; jj ii) // parent should be moved forward + { + iWgIds[ii] = iWgIds[parentPos]; + iWgIds.Remove(parentPos); + } + else if (parentPos < ii) // parent is already ahead of child, remove child + iWgIds.Remove(ii); + else // parent not found, skip + ii++; + } + else // wg does not have a parent, skip + ii++; + } + } + + + +COomWindowGroupList::COomWindowGroupList(RWsSession& aWs) : iWs(aWs) + { + FUNC_LOG; + } + + + +void COomWindowGroupList::ConstructL() + { + FUNC_LOG; + + // Reserve enough space to build an app list later. + iWgIds.ReserveL(KPreallocatedSpaceForAppList); + iUncollapsedWgIds.ReserveL(KPreallocatedSpaceForAppList); + + // Reserve enough space for the WG to idle tick mapping + iWgToPropertiesMapping.ReserveL(KPreallocatedSpaceForAppList); + + // Reserve enough space for CApaWindowGroupName. + iWgName = CApaWindowGroupName::NewL(iWs); + iWgNameBuf = HBufC::NewL(CApaWindowGroupName::EMaxLength); + (*iWgNameBuf) = KDummyWgName; + iWgName->SetWindowGroupName(iWgNameBuf); // iWgName takes ownership of iWgNameBuf + + RefreshL(); + } + + + +COomWindowGroupList* COomWindowGroupList::NewL(RWsSession& aWs) + { + FUNC_LOG; + + COomWindowGroupList* self = new (ELeave) COomWindowGroupList(aWs); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + + + +COomWindowGroupList::~COomWindowGroupList() + { + FUNC_LOG; + + iWgIds.Close(); + iUncollapsedWgIds.Close(); + iWgToPropertiesMapping.Close(); + iExistingWindowIds.Close(); + delete iWgName; + } + + +void COomWindowGroupList::SetPriorityBusy(TInt aWgId) + { + FUNC_LOG; + + Refresh(); + + TInt parentId; + TRAPD(err, parentId = FindParentIdL(aWgId)); + if (err) + { + parentId = aWgId; + } + + TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(parentId); + if (wgProperties) + { + wgProperties->iDynamicPriority = EOomPriorityBusy; + } + + // If we can't find the window group then ignore it + } + + +TInt COomWindowGroupList::FindParentIdL(TInt aWgId) + { + TInt numGroups = iWs.NumWindowGroups(0); + iUncollapsedWgIds.ReserveL(numGroups); + User::LeaveIfError(iWs.WindowGroupList(0, &iUncollapsedWgIds)); + + TInt parentPos = KErrNotFound; + + //loop through the window group list + for (TInt i=0; i=0 ) + { + __ASSERT_DEBUG(parentPos < iUncollapsedWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds)); + while (iUncollapsedWgIds[parentPos].iParentId > 0) + { + // find the index for the parent + for (TInt j=0; jiDynamicPriority == EOomPriorityBusy); + } + + return isBusy; + } + +// Returns ETrue if an application has registered itself as high priority at runtime +TBool COomWindowGroupList::IsDynamicHighPriority(TInt aWgIndex) + { + FUNC_LOG; + + TBool isHighPriority = EFalse; + __ASSERT_DEBUG(aWgIndex < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds)); + TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(iWgIds[aWgIndex].iId); + if (wgProperties) + { + isHighPriority = (wgProperties->iDynamicPriority == EOomPriorityHigh); + } + + return isHighPriority; + } + +CApaWindowGroupName* COomWindowGroupList::WgName() const + { + return iWgName; + } + +void COomWindowGroupList::SetPriorityNormal(TInt aWgId) + { + FUNC_LOG; + + Refresh(); + + TInt parentId; + TRAPD(err, parentId = FindParentIdL(aWgId)); + if (err) + { + parentId = aWgId; + } + + TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(parentId); + if (wgProperties) + { + wgProperties->iDynamicPriority = EOomPriorityNormal; + } + + // If we can't find the window group then ignore it + } + + +void COomWindowGroupList::SetPriorityHigh(TInt aWgId) + { + FUNC_LOG; + + Refresh(); + + TInt parentId; + TRAPD(err, parentId = FindParentIdL(aWgId)); + if (err) + { + parentId = aWgId; + } + + TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(parentId); + if (wgProperties) + { + wgProperties->iDynamicPriority = EOomPriorityHigh; + } + + // If we can't find the window group then ignore it + } + +// Find the specificed application in the window group list and return the index +TInt COomWindowGroupList::GetIndexFromAppId(TUint aAppId) const + { + FUNC_LOG; + + TInt indexInGroupList = Count(); + TBool appFoundInWindowGroupList = EFalse; + + while (indexInGroupList--) + { + if (AppId(indexInGroupList, ETrue) == aAppId) + { + appFoundInWindowGroupList = ETrue; + break; + } + } + + if (!appFoundInWindowGroupList) + indexInGroupList = KAppNotInWindowGroupList; + + return indexInGroupList; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/src/oomwserveventreceiver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/src/oomwserveventreceiver.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,90 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Main classes for Out of Memory Monitor. +* +*/ + +#include +#include +#include "oomwserveventreceiver.h" +#include "oommemorymonitor.h" +#include "OomTraces.h" +#include "oomconstants.hrh" + +#include "apgwgnam.h" + +CWservEventReceiver::CWservEventReceiver(CMemoryMonitor& aMonitor, RWsSession& aWs) +: CActive(CActive::EPriorityStandard), iMonitor(aMonitor), iWs(aWs), iWg(aWs) + { + FUNC_LOG; + + CActiveScheduler::Add(this); + } + +CWservEventReceiver::~CWservEventReceiver() + { + FUNC_LOG; + + Cancel(); + iWg.Close(); + } + +void CWservEventReceiver::ConstructL() + { + FUNC_LOG; + + User::LeaveIfError(iWg.Construct((TUint32)this, EFalse)); + iWg.SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront); + iWg.EnableFocusChangeEvents(); + Queue(); + } + +void CWservEventReceiver::Queue() + { + FUNC_LOG; + + iWs.EventReady(&iStatus); + SetActive(); + } + +void CWservEventReceiver::DoCancel() + { + FUNC_LOG; + + iWs.EventReadyCancel(); + } + +void CWservEventReceiver::RunL() + { + FUNC_LOG; + + TWsEvent event; + iWs.GetEvent(event); + if (event.Type() == EEventFocusGroupChanged) + { + // The following is done in order to avoid changing application threshholds when fastswap is activated + // 1) get the new focused app's details + // 2) we check to see if the fastswap uid caused the change + // 3a) If it didn't we proceed as normal: handleFocusedWgChangeL is called + // 3b) If not, we skip handleFocusedWgChangeL + CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(iWs, iWs.GetFocusWindowGroup()); + if(wgName->AppUid() != KUidFastSwap) + { + iMonitor.HandleFocusedWgChangeL(); + } + CleanupStack::PopAndDestroy(wgName); + } + + Queue(); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/conf/oomtest.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/conf/oomtest.cfg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,3 @@ +[StifSettings] +CheckHeapBalance= on +[EndStifSettings] diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/data/oomconfig.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/data/oomconfig.xml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,40 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +PRJ_PLATFORMS +DEFAULT + +PRJ_TESTEXPORTS +../init/oomtest.ini /epoc32/winscw/c/testframework/testframework.ini +../conf/oomtest.cfg /epoc32/winscw/c/testframework/oomtest.cfg +../data/oomconfig.xml /epoc32/release/winscw/udeb/z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/release/winscw/urel/z/private/10207218/oomconfig.xml + +PRJ_TESTMMPFILES +#include "../t_oomallocserver/group/bld.inf" +#include "../t_oomdummyapp/group/bld.inf" +#include "../t_oomdummyplugin/group/bld.inf" +#include "../t_oomdummyplugin2/group/bld.inf" +//#include "../t_oomharness/group/bld.inf" +#include "../t_oomtestapp/group/bld.inf" +#include "../t_oomharness_stif/group/bld.inf" + +// End of File + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,68 @@ +;Languages +&EN + +#{"t_oomharness_stif"},(0x101FB3E7),1,0,0,TYPE=SA + +;Localised Vendor name +%{"t_oomharness_stif EN"} + +; Vendor name +: "t_oomharness_stif" + +"\epoc32\release\armv5\urel\t_oomharness_stif.dll"-"c:\sys\bin\t_oomharness_stif.dll" +"..\init\oomtest.ini"-"c:\testframework\oomtest.ini" +"..\conf\oomtest.cfg"-"c:\testframework\oomtest.cfg" +;"..\data\oomconfig.xml"-"c:\private\10207218\oomconfig.xml" + +"\epoc32\release\armv5\urel\t_oomclient.dll"-"c:\sys\bin\t_oomclient.dll" +"\epoc32\release\armv5\urel\t_oomallocserver.exe"-"c:\sys\bin\t_oomallocserver.exe" + +"\epoc32\release\armv5\urel\t_oomdummyapp_0xE6CFBA00.exe"-"c:\sys\bin\t_oomdummyapp_0xE6CFBA00.exe" +"\epoc32\data\z\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc"-"c:\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomdummyplugin.dll"-"c:\sys\bin\t_oomdummyplugin.dll" +"\epoc32\data\z\resource\plugins\t_oomdummyplugin.rsc"-"c:\resource\plugins\t_oomdummyplugin.rsc" + +"\epoc32\release\armv5\urel\t_oomdummyplugin2.dll"-"c:\sys\bin\t_oomdummyplugin2.dll" +"\epoc32\data\z\resource\plugins\t_oomdummyplugin2.rsc"-"c:\resource\plugins\t_oomdummyplugin2.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp.exe"-"c:\sys\bin\t_oomtestapp.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp.rsc"-"c:\resource\apps\t_oomtestapp.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp2.exe"-"c:\sys\bin\t_oomtestapp2.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp2.rsc"-"c:\resource\apps\t_oomtestapp2.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp2_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp2_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp3.exe"-"c:\sys\bin\t_oomtestapp3.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp3.rsc"-"c:\resource\apps\t_oomtestapp3.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp3_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp3_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp4.exe"-"c:\sys\bin\t_oomtestapp4.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp4.rsc"-"c:\resource\apps\t_oomtestapp4.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp4_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp4_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp5.exe"-"c:\sys\bin\t_oomtestapp5.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp5.rsc"-"c:\resource\apps\t_oomtestapp5.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp5_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp5_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp6.exe"-"c:\sys\bin\t_oomtestapp6.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp6.rsc"-"c:\resource\apps\t_oomtestapp6.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp6_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp6_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp7.exe"-"c:\sys\bin\t_oomtestapp7.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp7.rsc"-"c:\resource\apps\t_oomtestapp7.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp7_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp7_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp8.exe"-"c:\sys\bin\t_oomtestapp8.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp8.rsc"-"c:\resource\apps\t_oomtestapp8.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp8_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp8_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp9.exe"-"c:\sys\bin\t_oomtestapp9.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp9.rsc"-"c:\resource\apps\t_oomtestapp9.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp9_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp9_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp10.exe"-"c:\sys\bin\t_oomtestapp10.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp10.rsc"-"c:\resource\apps\t_oomtestapp10.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp10_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp10_reg.rsc" diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,68 @@ +;Languages +&EN + +#{"t_oomharness_stif"},(0x101FB3E7),1,0,0,TYPE=SA + +;Localised Vendor name +%{"t_oomharness_stif EN"} + +; Vendor name +: "t_oomharness_stif" + +"\epoc32\release\armv5\urel\t_oomharness_stif.dll"-"c:\sys\bin\t_oomharness_stif.dll" +"..\init\oomtest.ini"-"c:\testframework\oomtest.ini" +"..\conf\oomtest.cfg"-"c:\testframework\oomtest.cfg" +"..\data\oomconfig.xml"-"c:\data\oomconfig.xml" + +"\epoc32\release\armv5\urel\t_oomclient.dll"-"c:\sys\bin\t_oomclient.dll" +"\epoc32\release\armv5\urel\t_oomallocserver.exe"-"c:\sys\bin\t_oomallocserver.exe" + +"\epoc32\release\armv5\urel\t_oomdummyapp_0xE6CFBA00.exe"-"c:\sys\bin\t_oomdummyapp_0xE6CFBA00.exe" +"\epoc32\data\z\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc"-"c:\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomdummyplugin.dll"-"c:\sys\bin\t_oomdummyplugin.dll" +"\epoc32\data\z\resource\plugins\t_oomdummyplugin.rsc"-"c:\resource\plugins\t_oomdummyplugin.rsc" + +"\epoc32\release\armv5\urel\t_oomdummyplugin2.dll"-"c:\sys\bin\t_oomdummyplugin2.dll" +"\epoc32\data\z\resource\plugins\t_oomdummyplugin2.rsc"-"c:\resource\plugins\t_oomdummyplugin2.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp.exe"-"c:\sys\bin\t_oomtestapp.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp.rsc"-"c:\resource\apps\t_oomtestapp.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp2.exe"-"c:\sys\bin\t_oomtestapp2.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp2.rsc"-"c:\resource\apps\t_oomtestapp2.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp2_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp2_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp3.exe"-"c:\sys\bin\t_oomtestapp3.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp3.rsc"-"c:\resource\apps\t_oomtestapp3.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp3_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp3_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp4.exe"-"c:\sys\bin\t_oomtestapp4.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp4.rsc"-"c:\resource\apps\t_oomtestapp4.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp4_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp4_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp5.exe"-"c:\sys\bin\t_oomtestapp5.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp5.rsc"-"c:\resource\apps\t_oomtestapp5.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp5_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp5_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp6.exe"-"c:\sys\bin\t_oomtestapp6.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp6.rsc"-"c:\resource\apps\t_oomtestapp6.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp6_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp6_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp7.exe"-"c:\sys\bin\t_oomtestapp7.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp7.rsc"-"c:\resource\apps\t_oomtestapp7.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp7_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp7_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp8.exe"-"c:\sys\bin\t_oomtestapp8.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp8.rsc"-"c:\resource\apps\t_oomtestapp8.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp8_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp8_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp9.exe"-"c:\sys\bin\t_oomtestapp9.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp9.rsc"-"c:\resource\apps\t_oomtestapp9.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp9_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp9_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp10.exe"-"c:\sys\bin\t_oomtestapp10.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp10.rsc"-"c:\resource\apps\t_oomtestapp10.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp10_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp10_reg.rsc" diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.sis Binary file sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.sis has changed diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.sisx Binary file sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.sisx has changed diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/group/readme.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/readme.txt Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,13 @@ +To test in emulator: + 1) bldmake bldfiles + abld test build + 2) start emulator + 3) run "consoleui" from "eshell" + +To test (manually) in HW: + 1) bldmake bldfiles + abld test build + 2) create and sign sis from oomtest_manualtestrun.pkg (note that oomtest.pkg is for automated testing) + 3) install sis into phone + 4) select OOM test config xml from c:\data\ (use t_oomtestapp -> Options -> Select...) + 5) reboot phone (config xml is taken in use) + 6) rename oomtest.ini in c:\testframework to testframework.ini (use FileBrowse) + 7) run "consoleui" from "eshell" diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/init/oomtest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/init/oomtest.ini Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,173 @@ +# +# This is STIFTestFramework initialization file +# Comment lines start with '#'-character. +# See STIF TestFramework users guide.doc for instructions + +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +# Set following test engine settings: +# - Set Test Reporting mode. TestReportMode's possible values are: +# + 'Summary': Summary of the tested test cases. +# + 'Environment': Hardware and software info. +# + 'TestCases': Test case report. +# + 'FullReport': Set of all above ones. +# + Example 'TestReportMode= Summary TestCases' +# +# - CreateTestReport setting controls report creation mode +# + YES, Test report will created. +# + NO, No Test report. +# +# - File path indicates the base path of the test report. +# - File name indicates the name of the test report. +# +# - File format indicates the type of the test report. +# + TXT, Test report file will be txt type, for example 'TestReport.txt'. +# + HTML, Test report will be html type, for example 'TestReport.html'. +# +# - File output indicates output source of the test report. +# + FILE, Test report logging to file. +# + RDEBUG, Test report logging to using rdebug. +# +# - File Creation Mode indicates test report overwriting if file exist. +# + OVERWRITE, Overwrites if the Test report file exist. +# + APPEND, Continue logging after the old Test report information if +# report exist. + +[Engine_Defaults] + +TestReportMode= FullReport # Possible values are: + # 'Summary', 'Environment', 'TestCases' or 'FullReport' + +CreateTestReport= YES # Possible values: YES or NO + +TestReportFilePath= C:\LOGS\TestFramework\ +TestReportFileName= TestReport + +TestReportFormat= TXT # Possible values: TXT or HTML +TestReportOutput= FILE # Possible values: FILE or RDEBUG +TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND + +[End_Defaults] +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + + + +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +# Module configurations start +# Modules are added between module tags +# tags. Module name is specified after ModuleName= tag, like +# ModuleName= XXXXXXXXX +# Modules might have initialisation file, specified as +# IniFile= YYYYYY +# Modules might have several configuration files, like +# TestCaseFile= NormalCases.txt +# TestCaseFile= SmokeCases.txt +# TestCaseFile= ManualCases.txt + +# (TestCaseFile is synonym for old term ConfigFile) + +# Following case specifies demo module settings. Demo module +# does not read any settings from file, so tags +# IniFile and TestCaseFile are not used. +# In the simplest case it is enough to specify only the +# name of the test module when adding new test module + +[New_Module] +ModuleName= t_oomharness_stif +TestCaseFile= c:\testframework\oomtest.cfg +[End_Module] + + +#Load testmoduleXXX, optionally with initialization file and/or test case files +#[New_Module] +#ModuleName= testmodulexxx + +#TestModuleXXX used initialization file +#IniFile= init.txt + +#TestModuleXXX used configuration file(s) +#TestCaseFile= testcases1.cfg +#TestCaseFile= testcases2.cfg +#TestCaseFile= manualtestcases.cfg + +#[End_Module] +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + + + +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +# Set STIFTestFramework logging overwrite parameters for Logger. +# Hardware and emulator environment logging path and styles can +# be configured from here to overwrite the Logger's implemented values. +# +# Settings description: +# - Indicates option for creation log directory/directories. If log directory/directories +# is/are not created by user they will make by software. +# + YES, Create log directory/directories if not allready exist. +# + NO, Log directory/directories not created. Only created one is used. +# +# - Overwrite emulator path setting. +# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined +# Logger's path 'D:\\LOGS\\Module\\' with those definition the path +# will be 'C:\LOGS\TestFramework\LOGS\Module\' +# +# - Overwrite emulator's logging format. +# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'. +# + HTML, Log file(s) will be html type(s), for example 'Module.html'. +# +# - Overwrited emulator logging output source. +# + FILE, Logging to file(s). +# + RDEBUG, Logging to using rdebug(s). +# +# - Overwrite hardware path setting (Same description as above in emulator path). +# - Overwrite hardware's logging format(Same description as above in emulator format). +# - Overwrite hardware's logging output source(Same description as above in emulator output). +# +# - File Creation Mode indicates file overwriting if file exist. +# + OVERWRITE, Overwrites if file(s) exist. +# + APPEND, Continue logging after the old logging information if file(s) exist. +# +# - Will thread id include to the log filename. +# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'. +# + NO, No thread id to log file(s), Example filename 'Module.txt'. +# +# - Will time stamps include the to log file. +# + YES, Time stamp added to each line in log file(s). Time stamp is +# for example'12.Nov.2003 115958 LOGGING INFO' +# + NO, No time stamp(s). +# +# - Will line breaks include to the log file. +# + YES, Each logging event includes line break and next log event is in own line. +# + NO, No line break(s). +# +# - Will event ranking include to the log file. +# + YES, Event ranking number added to each line in log file(s). Ranking number +# depends on environment's tics, for example(includes time stamp also) +# '012 12.Nov.2003 115958 LOGGING INFO' +# + NO, No event ranking. +# + +[Logger_Defaults] + +#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' + +#CreateLogDirectories= YES # Possible values: YES or NO + +#EmulatorBasePath= C:\LOGS\TestFramework\ +#EmulatorFormat= HTML # Possible values: TXT or HTML +#EmulatorOutput= FILE # Possible values: FILE or RDEBUG + +#HardwareBasePath= D:\LOGS\TestFramework\ +#HardwareFormat= HTML # Possible values: TXT or HTML +#HardwareOutput= FILE # Possible values: FILE or RDEBUG + +#FileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND + +#ThreadIdToLogFile= YES # Possible values: YES or NO +#WithTimeStamp= YES # Possible values: YES or NO +#WithLineBreak= YES # Possible values: YES or NO +#WithEventRanking= YES # Possible values: YES or NO + +[End_Logger_Defaults] +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + +# End of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +PRJ_PLATFORMS +DEFAULT + +PRJ_TESTEXPORTS +../../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml + +PRJ_TESTMMPFILES + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/bwins/t_oomclientu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/bwins/t_oomclientu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,9 @@ +EXPORTS + ?Configure@ROOMAllocSession@@QAEHVTUid@@III@Z @ 1 NONAME ; int ROOMAllocSession::Configure(class TUid, unsigned int, unsigned int, unsigned int) + ?Connect@ROOMAllocSession@@QAEHXZ @ 2 NONAME ; int ROOMAllocSession::Connect(void) + ?MemoryGood@ROOMAllocSession@@QAEHVTUid@@@Z @ 3 NONAME ; int ROOMAllocSession::MemoryGood(class TUid) + ?MemoryLow@ROOMAllocSession@@QAEHVTUid@@@Z @ 4 NONAME ; int ROOMAllocSession::MemoryLow(class TUid) + ?Reset@ROOMAllocSession@@QAEHXZ @ 5 NONAME ; int ROOMAllocSession::Reset(void) + ?StartAllocating@ROOMAllocSession@@QAEHXZ @ 6 NONAME ; int ROOMAllocSession::StartAllocating(void) + ?StopAllocating@ROOMAllocSession@@QAEHXZ @ 7 NONAME ; int ROOMAllocSession::StopAllocating(void) + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/clisrc/client.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/clisrc/client.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,101 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include "t_oomclient.h" +#include "../inc/clientserver.h" + +const TInt KServerDefaultMessageSlots = 1; //Number of message slots available per session. +const TInt KServerRetryCount = 2; + +static TInt StartServer() +// +// Start the server process. Simultaneous launching +// of two such processes should be detected when the second one attempts to +// create the server object, failing with KErrAlreadyExists. +// + { + const TUidType serverUid(KNullUid,KNullUid,KServerUid3); + RProcess server; + TInt r=server.Create(KAllocServerImg,KNullDesC,serverUid); + if (r!=KErrNone) + return r; + TRequestStatus stat; + server.Rendezvous(stat); + if (stat!=KRequestPending) + server.Kill(0); // abort startup + else + server.Resume(); // logon OK - start the server + User::WaitForRequest(stat); // wait for start or death + // we can't use the 'exit reason' if the server panicked as this + // is the panic 'reason' and may be '0' which cannot be distinguished + // from KErrNone + r=(server.ExitType()==EExitPanic) ? KErrGeneral : stat.Int(); + server.Close(); + return r; + } + +EXPORT_C TInt ROOMAllocSession::Connect() +// +// Connect to the server, attempting to start it if necessary +// + { + TInt retry=KServerRetryCount; + for (;;) + { + TInt r=CreateSession(KAllocServerName,TVersion(0,0,0),KServerDefaultMessageSlots); + if (r!=KErrNotFound && r!=KErrServerTerminated) + return r; + if (--retry==0) + return r; + r=StartServer(); + if (r!=KErrNone && r!=KErrAlreadyExists) + return r; + } + } + +EXPORT_C TInt ROOMAllocSession::Reset() + { + return SendReceive(EAllocServReset); + } + +EXPORT_C TInt ROOMAllocSession::StartAllocating() + { + return SendReceive(EAllocServStart); + } + +EXPORT_C TInt ROOMAllocSession::StopAllocating() + { + return SendReceive(EAllocServStop); + } + +EXPORT_C TInt ROOMAllocSession::MemoryLow(TUid aPlugin) + { + return SendReceive(EAllocServMemoryLow, TIpcArgs(aPlugin.iUid)); + } + +EXPORT_C TInt ROOMAllocSession::MemoryGood(TUid aPlugin) + { + return SendReceive(EAllocServMemoryGood, TIpcArgs(aPlugin.iUid)); + } + +EXPORT_C TInt ROOMAllocSession::Configure(TUid aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit) + { + return SendReceive(EAllocServConfig,TIpcArgs(aPlugin.iUid, aAllocRate, aAllocInitial, aAllocLimit)); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/eabi/t_oomclientu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/eabi/t_oomclientu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,9 @@ +EXPORTS + _ZN16ROOMAllocSession10MemoryGoodE4TUid @ 1 NONAME + _ZN16ROOMAllocSession14StopAllocatingEv @ 2 NONAME + _ZN16ROOMAllocSession15StartAllocatingEv @ 3 NONAME + _ZN16ROOMAllocSession5ResetEv @ 4 NONAME + _ZN16ROOMAllocSession7ConnectEv @ 5 NONAME + _ZN16ROOMAllocSession9ConfigureE4TUidjjj @ 6 NONAME + _ZN16ROOMAllocSession9MemoryLowE4TUid @ 7 NONAME + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,29 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +PRJ_PLATFORMS +DEFAULT + +PRJ_TESTMMPFILES +t_oomallocserver.mmp +t_oomallocclient.mmp + +PRJ_TESTEXPORTS +../inc/t_oomclient.h ../../inc/t_oomclient.h diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocclient.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocclient.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,40 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include + +target t_oomclient.dll +targettype dll + +capability ALL -TCB + +// This is a SYSTEMINCLUDE macro containing the middleware +// layer specific include directories +MW_LAYER_SYSTEMINCLUDE + +USERINCLUDE ../inc +USERINCLUDE ../../inc + +//project server +sourcepath ../clisrc/ + +source client.cpp + +library euser.lib diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocserver.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocserver.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,42 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include + +TARGET t_oomallocserver.exe +TARGETTYPE exe +UID 0 0x10286A3E + +// This is a SYSTEMINCLUDE macro containing the middleware +// layer specific include directories +MW_LAYER_SYSTEMINCLUDE + +USERINCLUDE ../inc +USERINCLUDE ../../inc + + +#ifdef ENABLE_ABIV2_MODE +DEBUGGABLE_UDEBONLY +#endif +SOURCEPATH ../srvsrc +SOURCE server.cpp +SOURCE CAllocManager.cpp + +library euser.lib diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/CAllocManager.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/CAllocManager.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,131 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +#ifndef CALLOCMANAGER_H +#define CALLOCMANAGER_H + +// INCLUDES +#include +#include + +// CLASS DECLARATION + +class CAllocSimulation : public CBase + { +public: + // Constructors and destructor + + /** + * Destructor. + */ + ~CAllocSimulation(); + + /** + * Two-phased constructor. + */ + static CAllocSimulation* NewL(TInt aAllocLimit, TInt aAllocInitial, + TInt aAllocRate, TUint aUid); + + /** + * Two-phased constructor. + */ + static CAllocSimulation* NewLC(TInt aAllocLimit, TInt aAllocInitial, + TInt aAllocRate, TUint aUid); + + void SimulationTick(); + void SetPaused(TBool aPaused); + void FreeMemory(); + + static TBool CompareTo(const TUint *aUid, const CAllocSimulation& aSelf); +private: + + /** + * Constructor for performing 1st stage construction + */ + CAllocSimulation(TInt aAllocLimit, TInt aAllocInitial, + TInt aAllocRate, TUint aUid); + + /** + * EPOC default constructor for performing 2nd stage construction + */ + void ConstructL(); + + TInt iAllocLimit; + TInt iAllocInitial; + TInt iAllocRate; + TUint iUid; + RChunk iChunk; + TBool iPaused; + TUint iAllocCurrent; + }; + +/** + * CCAllocManager + * + */ +class CAllocManager : public CBase + { +public: + // Constructors and destructor + + /** + * Destructor. + */ + ~CAllocManager(); + + /** + * Two-phased constructor. + */ + static CAllocManager* NewL(); + + /** + * Two-phased constructor. + */ + static CAllocManager* NewLC(); + + TInt Reset(); + TInt StartAllocating(); + TInt StopAllocating(); + void ConfigureL(TUint aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit); + TInt MemoryLow(TUint aPlugin); + TInt MemoryGood(TUint aPlugin); +private: + + /** + * Constructor for performing 1st stage construction + */ + CAllocManager(); + + /** + * EPOC default constructor for performing 2nd stage construction + */ + void ConstructL(); + + static TInt SimulationTickStatic(TAny *aPtr); + void SimulationTick(); + + TInt FindSimulation(TUint aUid); + + CPeriodic *iAllocationTimer; + RPointerArray iSimulations; + }; + +#endif // CALLOCMANAGER_H diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/clientserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/clientserver.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,52 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +#include + + +// server name + +_LIT(KAllocServerName,"t_oomAllocServer"); +_LIT(KAllocServerImg,"t_oomAllocServer"); +const TUid KServerUid3={0x10286A3E}; + +// A version must be specifyed when creating a session with the server + +const TUint KCountServMajorVersionNumber=0; +const TUint KCountServMinorVersionNumber=1; +const TUint KCountServBuildVersionNumber=1; + +IMPORT_C TInt StartThread(RThread& aServerThread); + + +// Function codes (opcodes) used in message passing between client and server +enum TAllocServRqst + { + EAllocServReset, + EAllocServConfig, + EAllocServStart, + EAllocServStop, + EAllocServMemoryLow, + EAllocServMemoryGood + }; + +enum TAllocServLeave +{ + ENonNumericString = 99 +}; diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/server.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/server.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,81 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include +#include "clientserver.h" +#include "callocmanager.h" + +enum TMyPanic + { + EPanicBadDescriptor, + EPanicIllegalFunction, + EPanicAlreadyReceiving + }; + +void PanicClient(const RMessagePtr2& aMessage,TMyPanic TMyPanic); + +class CShutdown : public CTimer + { + enum {KMyShutdownDelay=0x200000}; // approx 2s +public: + inline CShutdown(); + inline void ConstructL(); + inline void Start(); +private: + void RunL(); + }; + +class CMyServer : public CServer2 + { +public: + static CServer2* NewLC(); + void AddSession(); + void DropSession(); + void Send(const TDesC& aMessage); + CAllocManager& AllocManager(); + ~CMyServer(); +private: + CMyServer(); + void ConstructL(); + void DefinePropertiesL(); + CSession2* NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const; +private: + TInt iSessionCount; + CShutdown iShutdown; + CAllocManager *iAllocManager; + }; + +class CMySession : public CSession2 + { +public: + CMySession(); + void CreateL(); + void Send(const TDesC& aMessage); +private: + ~CMySession(); + inline CMyServer& Server(); + void ServiceL(const RMessage2& aMessage); + void ServiceError(const RMessage2& aMessage,TInt aError); + inline TBool ReceivePending() const; +private: + RMessagePtr2 iReceiveMsg; + TInt iReceiveLen; + }; + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/t_oomclient.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/t_oomclient.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,38 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef __T_CLIENT_H__ +#define __T_CLIENT_H__ + +#include + +class ROOMAllocSession : public RSessionBase + { +public: + IMPORT_C TInt Connect(); + IMPORT_C TInt Reset(); + IMPORT_C TInt StartAllocating(); + IMPORT_C TInt StopAllocating(); + IMPORT_C TInt Configure(TUid aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit); + IMPORT_C TInt MemoryLow(TUid aPlugin); + IMPORT_C TInt MemoryGood(TUid aPlugin); + }; + +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/CAllocManager.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/CAllocManager.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,203 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include "CAllocManager.h" +#include +#include "t_oomdummyplugin_properties.h" + +const TInt KOneSecond = 1000000; + +CAllocManager::CAllocManager() + { + // No implementation required + } + +CAllocManager::~CAllocManager() + { + delete iAllocationTimer; + iSimulations.ResetAndDestroy(); + } + +CAllocManager* CAllocManager::NewLC() + { + CAllocManager* self = new (ELeave) CAllocManager(); + CleanupStack::PushL(self); + self->ConstructL(); + return self; + } + +CAllocManager* CAllocManager::NewL() + { + CAllocManager* self = CAllocManager::NewLC(); + CleanupStack::Pop(); // self; + return self; + } + +void CAllocManager::ConstructL() + { + iAllocationTimer = CPeriodic::NewL(CActive::EPriorityStandard); + } + +TInt CAllocManager::SimulationTickStatic(TAny *aPtr) + { + ((CAllocManager*)aPtr)->SimulationTick(); + return KErrNone; + } + +void CAllocManager::SimulationTick() + { + for(TInt i=iSimulations.Count()-1; i>=0; i--) + { + iSimulations[i]->SimulationTick(); + } + } + +TInt CAllocManager::Reset() + { + StopAllocating(); + iSimulations.ResetAndDestroy(); + return KErrNone; + } + +TInt CAllocManager::StartAllocating() + { + iAllocationTimer->Cancel(); + iAllocationTimer->Start(KOneSecond, KOneSecond, TCallBack(SimulationTickStatic, this)); + return KErrNone; + } + +TInt CAllocManager::StopAllocating() + { + iAllocationTimer->Cancel(); + return KErrNone; + } + +void CAllocManager::ConfigureL(TUint aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit) + { + TInt sim = FindSimulation(aPlugin); + if(sim>=0) + { + delete iSimulations[sim]; + iSimulations.Remove(sim); + } + CAllocSimulation* newsim = CAllocSimulation::NewLC(aAllocLimit, aAllocInitial, aAllocRate, aPlugin); + iSimulations.AppendL(newsim); + CleanupStack::Pop(newsim); + } + +TInt CAllocManager::MemoryLow(TUint aPlugin) + { + TInt sim = FindSimulation(aPlugin); + if(sim>=0) + { + iSimulations[sim]->SetPaused(ETrue); + iSimulations[sim]->FreeMemory(); + return KErrNone; + } + else return KErrNotFound; + } + +TInt CAllocManager::MemoryGood(TUint aPlugin) + { + TInt sim = FindSimulation(aPlugin); + if(sim>=0) + { + iSimulations[sim]->SetPaused(EFalse); + return KErrNone; + } + else return KErrNotFound; + } + +TInt CAllocManager::FindSimulation(TUint aUid) + { + return iSimulations.Find(aUid, CAllocSimulation::CompareTo); + } + +CAllocSimulation::CAllocSimulation(TInt aAllocLimit, TInt aAllocInitial, + TInt aAllocRate, TUint aUid) : + iAllocLimit(aAllocLimit), + iAllocInitial(aAllocInitial), + iAllocRate(aAllocRate), + iUid(aUid) + { + // No implementation required + } + +CAllocSimulation::~CAllocSimulation() + { + iChunk.Close(); + } + +CAllocSimulation* CAllocSimulation::NewLC(TInt aAllocLimit, TInt aAllocInitial, + TInt aAllocRate, TUint aUid) + { + CAllocSimulation* self = new (ELeave) CAllocSimulation(aAllocLimit, aAllocInitial, + aAllocRate, aUid); + CleanupStack::PushL(self); + self->ConstructL(); + return self; + } + +CAllocSimulation* CAllocSimulation::NewL(TInt aAllocLimit, TInt aAllocInitial, + TInt aAllocRate, TUint aUid) + { + CAllocSimulation* self = CAllocSimulation::NewLC(aAllocLimit, aAllocInitial, + aAllocRate, aUid); + CleanupStack::Pop(); // self; + return self; + } + +void CAllocSimulation::ConstructL() + { + User::LeaveIfError(iChunk.CreateLocal(iAllocInitial, iAllocLimit)); + } + +void CAllocSimulation::SimulationTick() + { + if(!iPaused) + { + TUint allocnext = iAllocCurrent + iAllocRate; + if(allocnext < iAllocInitial) allocnext = iAllocInitial; + else if(allocnext > iAllocLimit) allocnext = iAllocLimit; + if(iAllocCurrent != allocnext && KErrNone == iChunk.Adjust(iAllocCurrent)) + { + iAllocCurrent = allocnext; + RProperty::Set(KUidOomPropertyCategory, iUid + KOOMDummyPluginCurrentAllocationBytes, iAllocCurrent); + } + } + } + +void CAllocSimulation::SetPaused(TBool aPaused) + { + iPaused = aPaused; + } + +void CAllocSimulation::FreeMemory() + { + iChunk.Adjust(0); + iAllocCurrent = 0; + RProperty::Set(KUidOomPropertyCategory, iUid + KOOMDummyPluginCurrentAllocationBytes, iAllocCurrent); + } + +TBool CAllocSimulation::CompareTo(const TUint* aUid, const CAllocSimulation& aSelf) + { + return *aUid==aSelf.iUid; + } + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/server.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/server.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,277 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include "server.h" +#include +#include "t_oomdummyplugin_properties.h" + +inline CShutdown::CShutdown() + :CTimer(-1) + {CActiveScheduler::Add(this);} +inline void CShutdown::ConstructL() + {CTimer::ConstructL();} +inline void CShutdown::Start() + {After(KMyShutdownDelay);} + +inline CMyServer::CMyServer() + :CServer2(CActive::EPriorityStandard, ESharableSessions) + {} + +inline CMySession::CMySession() + {} +inline CMyServer& CMySession::Server() + {return *static_cast(const_cast(CSession2::Server()));} +inline TBool CMySession::ReceivePending() const + {return !iReceiveMsg.IsNull();} + + +/////////////////////// + +void CMySession::CreateL() +// +// 2nd phase construct for sessions - called by the CServer framework +// + { + Server().AddSession(); + } + +CMySession::~CMySession() + { + Server().DropSession(); + } + +void CMySession::Send(const TDesC& aMessage) +// +// Deliver the message to the client, truncating if required +// If the write fails, panic the client, not the sender +// + { + if (ReceivePending()) + { + TPtrC m(aMessage); + if (iReceiveLenConstructL(); + return self; + } + +void CMyServer::ConstructL() +// +// 2nd phase construction - ensure the timer and server objects are running +// + { + StartL(KAllocServerName); + iShutdown.ConstructL(); + // ensure that the server still exits even if the 1st client fails to connect + iShutdown.Start(); + DefinePropertiesL(); + iAllocManager = CAllocManager::NewL(); + } + +_LIT_SECURITY_POLICY_PASS(KAlwaysPass); + +void CMyServer::DefinePropertiesL() + { + TInt err; + for(TUint i=KUidOOMDummyPluginFirstImplementation;i<=KUidOOMDummyPluginLastImplementation;i++) + { + err = RProperty::Define(KUidOomPropertyCategory, i + KOOMDummyPluginLowMemoryCount, RProperty::EInt, KAlwaysPass, KAlwaysPass); + if(err != KErrNone && err != KErrAlreadyExists) User::Leave(err); + err = RProperty::Define(KUidOomPropertyCategory, i + KOOMDummyPluginGoodMemoryCount, RProperty::EInt, KAlwaysPass, KAlwaysPass); + if(err != KErrNone && err != KErrAlreadyExists) User::Leave(err); + err = RProperty::Define(KUidOomPropertyCategory, i + KOOMDummyPluginCurrentAllocationBytes, RProperty::EInt, KAlwaysPass, KAlwaysPass); + if(err != KErrNone && err != KErrAlreadyExists) User::Leave(err); + err = RProperty::Define(KUidOomPropertyCategory, i + KOOMDummyPluginBytesRequested, RProperty::EInt, KAlwaysPass, KAlwaysPass); + if(err != KErrNone && err != KErrAlreadyExists) User::Leave(err); + } + } + +CSession2* CMyServer::NewSessionL(const TVersion&,const RMessage2&) const +// +// Cretae a new client session. This should really check the version number. +// + { + return new(ELeave) CMySession(); + } + +void CMyServer::AddSession() +// +// A new session is being created +// Cancel the shutdown timer if it was running +// + { + ++iSessionCount; + iShutdown.Cancel(); + } + +void CMyServer::DropSession() +// +// A session is being destroyed +// Start the shutdown timer if it is the last session. +// + { + if (--iSessionCount==0) + iShutdown.Start(); + } + +void CMyServer::Send(const TDesC& aMessage) +// +// Pass on the signal to all clients +// + { + iSessionIter.SetToFirst(); + CSession2* s; + while ((s=iSessionIter++)!=0) + static_cast(s)->Send(aMessage); + } + +CMyServer::~CMyServer() + { + delete iAllocManager; + } + +CAllocManager& CMyServer::AllocManager() + { + return *iAllocManager; + } + +void PanicClient(const RMessagePtr2& aMessage,TMyPanic aPanic) +// +// RMessage::Panic() also completes the message. This is: +// (a) important for efficient cleanup within the kernel +// (b) a problem if the message is completed a second time +// + { + _LIT(KPanic,"MyServer"); + aMessage.Panic(KPanic,aPanic); + } + +static void RunServerL() +// +// Perform all server initialisation, in particular creation of the +// scheduler and server and then run the scheduler +// + { + // naming the server thread after the server helps to debug panics + User::LeaveIfError(RThread::RenameMe(KAllocServerName)); + // + // create and install the active scheduler we need + CActiveScheduler* s=new(ELeave) CActiveScheduler; + CleanupStack::PushL(s); + CActiveScheduler::Install(s); + // + // create the server (leave it on the cleanup stack) + CMyServer::NewLC(); + // + // Initialisation complete, now signal the client + RProcess::Rendezvous(KErrNone); + // + // Ready to run + CActiveScheduler::Start(); + // + // Cleanup the server and scheduler + CleanupStack::PopAndDestroy(2); + } + +TInt E32Main() +// +// Server process entry-point +// + { + __UHEAP_MARK; + // + CTrapCleanup* cleanup=CTrapCleanup::New(); + TInt r=KErrNoMemory; + if (cleanup) + { + TRAP(r,RunServerL()); + delete cleanup; + } + // + __UHEAP_MARKEND; + return r; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rls --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rls Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,49 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +// LOCALISATION STRINGS + +// Caption string for app. +#define qtn_caption_string "t_oomdummyapp" + +// First item in "Options" menu pane +#define qtn_command1 "Message" + +// Second item in "Options" menu pane +#define qtn_command2 "Message from file" + +#define qtn_help "Help" + +#define qtn_about "About" + +// Third item in "Options" menu pane +#define qtn_exit "Exit" + +// When user requests ECommand1 event, text below is shown. +#define qtn_command1_text "OOM dummy app" + +#define qtn_loc_resource_file_1 "\\resource\\apps\\t_oomdummyapp_0xE6CFBA00" + +#define qtn_about_dialog_title "About" + +#define qtn_about_dialog_text "t_oomdummyapp Version 1.0.0\n\nAuthor: \n\nSupport: support@mycompany.com\n\n(c) Your copyright notice" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rss Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,188 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +// RESOURCE IDENTIFIER +NAME T_OO // 4 letter ID + + +// INCLUDES +#include +#include +#include +#include +#include "t_oomdummyapp.hrh" +#include "t_oomdummyapp.rls" + +// RESOURCE DEFINITIONS +// ----------------------------------------------------------------------------- +// +// Define the resource file signature +// This resource should be empty. +// +// ----------------------------------------------------------------------------- +// +RESOURCE RSS_SIGNATURE + { + } + +// ----------------------------------------------------------------------------- +// +// Default Document Name +// +// ----------------------------------------------------------------------------- +// +RESOURCE TBUF r_default_document_name + { + buf="T_OO"; + } + +// ----------------------------------------------------------------------------- +// +// Define default menu and CBA key. +// +// ----------------------------------------------------------------------------- +// +RESOURCE EIK_APP_INFO + { + menubar = r_menubar; + cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT; + } + + +// ----------------------------------------------------------------------------- +// +// r_menubar +// Main menubar +// +// ----------------------------------------------------------------------------- +// +RESOURCE MENU_BAR r_menubar + { + titles = + { + MENU_TITLE { menu_pane = r_menu; } + }; + } + + +// ----------------------------------------------------------------------------- +// +// r_menu +// Menu for "Options" +// +// ----------------------------------------------------------------------------- +// +RESOURCE MENU_PANE r_menu + { + items = + { + // added the new Options menu command here + MENU_ITEM + { + command = ECommand1; + txt = qtn_command1; + }, + MENU_ITEM + { + command = ECommand2; + txt = qtn_command2; + }, + MENU_ITEM + { + command = EHelp; + txt = qtn_help; + }, + MENU_ITEM + { + command = EAbout; + txt = qtn_about; + }, + MENU_ITEM + { + command = EAknSoftkeyExit; + txt = qtn_exit; + } + }; + } + +// ----------------------------------------------------------------------------- +// +// About dialog resource. +// +// ----------------------------------------------------------------------------- +// +RESOURCE DIALOG r_about_query_dialog + { + flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow; + buttons = R_AVKON_SOFTKEYS_OK_EMPTY; + items= + { + DLG_LINE + { + type = EAknCtPopupHeadingPane; + id = EAknMessageQueryHeaderId; + itemflags = EEikDlgItemNonFocusing; + control = AVKON_HEADING + { + }; + }, + DLG_LINE + { + type = EAknCtMessageQuery; + id = EAknMessageQueryContentId; + control = AVKON_MESSAGE_QUERY + { + }; + } + }; + } + + +// ----------------------------------------------------------------------------- +// +// Resources for messages. +// +// ----------------------------------------------------------------------------- +// +RESOURCE TBUF32 r_caption_string { buf=qtn_caption_string; } +RESOURCE TBUF32 r_about_dialog_title { buf=qtn_about_dialog_title; } +RESOURCE TBUF r_about_dialog_text { buf=qtn_about_dialog_text; } +RESOURCE TBUF r_command1_text { buf=qtn_command1_text; } + + +// ---------------------------------------------------------------------------- +// +// r_localisable_app_info +// +// ---------------------------------------------------------------------------- +// +RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info + { + short_caption = qtn_caption_string; + caption_and_icon = + CAPTION_AND_ICON_INFO + { + caption = qtn_caption_string; + + number_of_icons = 1; + icon_file = "\\resource\\apps\\t_oomdummyapp_0xE6CFBA00.mif"; + }; + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp_reg.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp_reg.rss Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,38 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include "t_oomdummyapp.hrh" +#include "t_oomdummyapp.rls" +#include +#include + +UID2 KUidAppRegistrationResourceFile +UID3 _UID3 + +RESOURCE APP_REGISTRATION_INFO + { + app_file="t_oomdummyapp_0xE6CFBA00"; + localisable_resource_file = qtn_loc_resource_file_1; + localisable_resource_id = R_LOCALISABLE_APP_INFO; + + embeddability=KAppNotEmbeddable; + newfile=KAppDoesNotSupportNewFile; + } + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/gfx/qgn_menu_t_oomdummyapp.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/gfx/qgn_menu_t_oomdummyapp.svg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,54 @@ +# ============================================================================ +# Name : Icons_scalable_dc.mk +# Part of : t_oomdummyapp +# +# Description: This is file for creating .mif file (scalable icon) +# +# ============================================================================ + + +ifeq (WINS,$(findstring WINS, $(PLATFORM))) +ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z +else +ZDIR=$(EPOCROOT)epoc32\data\z +endif + +TARGETDIR=$(ZDIR)\resource\apps +ICONTARGETFILENAME=$(TARGETDIR)\t_oomdummyapp_0xE6CFBA00.mif + +ICONDIR=..\gfx + +do_nothing : + @rem do_nothing + +MAKMAKE : do_nothing + +BLD : do_nothing + +CLEAN : do_nothing + +LIB : do_nothing + +CLEANLIB : do_nothing + +# ---------------------------------------------------------------------------- +# NOTE: if you have JUSTINTIME enabled for your S60 3rd FP1 or newer SDK +# and this command crashes, consider adding "/X" to the command line. +# See +# ---------------------------------------------------------------------------- + +RESOURCE : $(ICONTARGETFILENAME) + +$(ICONTARGETFILENAME) : $(ICONDIR)\qgn_menu_t_oomdummyapp.svg + mifconv $(ICONTARGETFILENAME) \ + /c32 $(ICONDIR)\qgn_menu_t_oomdummyapp.svg + +FREEZE : do_nothing + +SAVESPACE : do_nothing + +RELEASABLES : + @echo $(ICONTARGETFILENAME) + +FINAL : do_nothing + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,29 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +PRJ_PLATFORMS +DEFAULT + +PRJ_TESTMMPFILES + +gnumakefile icons_scalable_dc.mk + +t_oomdummyapp.mmp diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/t_oomdummyapp.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/t_oomdummyapp.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,81 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include + +TARGET t_oomdummyapp_0xE6CFBA00.exe +TARGETTYPE exe +UID 0x100039CE 0xE6CFBA00 + +// This is a SYSTEMINCLUDE macro containing the middleware +// layer specific include directories +MW_LAYER_SYSTEMINCLUDE + +SOURCEPATH ../src +SOURCE t_oomdummyapp.cpp +SOURCE t_oomdummyappApplication.cpp +SOURCE t_oomdummyappAppView.cpp +SOURCE t_oomdummyappAppUi.cpp +SOURCE t_oomdummyappDocument.cpp +SOURCE CMsgHandler.cpp + +SOURCEPATH ../data + +START RESOURCE t_oomdummyapp.rss +HEADER +TARGET t_oomdummyapp_0xE6CFBA00 +TARGETPATH resource/apps +END //RESOURCE + +START RESOURCE t_oomdummyapp_reg.rss +TARGET t_oomdummyapp_0xE6CFBA00_reg +TARGETPATH /private/10003a3f/apps +END //RESOURCE + +USERINCLUDE ../inc +USERINCLUDE ../../inc +USERINCLUDE ../help + +LIBRARY euser.lib +LIBRARY apparc.lib +LIBRARY cone.lib +LIBRARY eikcore.lib +LIBRARY avkon.lib +LIBRARY commonengine.lib +LIBRARY efsrv.lib +LIBRARY estor.lib +LIBRARY aknnotify.lib +LIBRARY hlplch.lib +LIBRARY oommonitor.lib + +LANG SC + +VENDORID 0 +SECUREID 0xE6CFBA00 +CAPABILITY ReadUserData WriteDeviceData + +#ifdef ENABLE_ABIV2_MODE + DEBUGGABLE_UDEBONLY +#endif + +EPOCHEAPSIZE 0x1000 0x1000000 +EPOCSTACKSIZE 0x4000 + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/Custom.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/Custom.xml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,45 @@ +# ============================================================================ +# Name : build_help.mk +# Part of : t_oomdummyapp +# ============================================================================ +# Name : build_help.mk +# Part of : t_oomdummyapp +# +# Description: This make file will build the application help file (.hlp) +# +# ============================================================================ + +do_nothing : + @rem do_nothing + +# build the help from the MAKMAKE step so the header file generated +# will be found by cpp.exe when calculating the dependency information +# in the mmp makefiles. + +MAKMAKE : t_oomdummyapp_0xE6CFBA00.hlp +t_oomdummyapp_0xE6CFBA00.hlp : t_oomdummyapp.xml t_oomdummyapp.cshlp Custom.xml + cshlpcmp t_oomdummyapp.cshlp +ifeq (WINS,$(findstring WINS, $(PLATFORM))) + copy t_oomdummyapp_0xE6CFBA00.hlp $(EPOCROOT)epoc32\$(PLATFORM)\c\resource\help +endif + +BLD : do_nothing + +CLEAN : + del t_oomdummyapp_0xE6CFBA00.hlp + del t_oomdummyapp_0xE6CFBA00.hlp.hrh + +LIB : do_nothing + +CLEANLIB : do_nothing + +RESOURCE : do_nothing + +FREEZE : do_nothing + +SAVESPACE : do_nothing + +RELEASABLES : + @echo t_oomdummyapp_0xE6CFBA00.hlp + +FINAL : do_nothing diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/t_oomdummyapp.cshlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/t_oomdummyapp.cshlp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,19 @@ + + + + +0xE6CFBA00 + + + + + temp\ + + + + t_oomdummyapp.xml + + t_oomdummyapp_0xE6CFBA00.hlp + custom.xml + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/t_oomdummyapp.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/t_oomdummyapp.xml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,13 @@ + + + + + +t_oomdummyappGeneral Information +General Information + +General Information +

Insert your help here.

+

+ + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/CMsgHandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/CMsgHandler.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,71 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef CMSGHANDLER_H +#define CMSGHANDLER_H + +#include // For CActive, link against: euser.lib +#include +#include "t_oomdummyappAppUi.h" + +class CMsgHandler : public CActive + { +public: + // Cancel and destroy + ~CMsgHandler(); + + // Two-phased constructor. + static CMsgHandler* NewL(Ct_oomdummyappAppUi& aOwner); + + // Two-phased constructor. + static CMsgHandler* NewLC(Ct_oomdummyappAppUi& aOwner); + +public: + // New functions + // Function for making the initial request + void StartL(); + +private: + // C++ constructor + CMsgHandler(Ct_oomdummyappAppUi& aOwner); + + // Second-phase constructor + void ConstructL(); + +private: + // From CActive + // Handle completion + void RunL(); + + // How to cancel me + void DoCancel(); + + // Override to handle leaves from RunL(). Default implementation causes + // the active scheduler to panic. + TInt RunError(TInt aError); + +private: + TInt iState; // State of the active object + RMsgQueue iMsgQueue; // messages from the harness + Ct_oomdummyappAppUi& iOwner; + + }; + +#endif // CMSGHANDLER_H diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,35 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef __T_OOMDUMMYAPP_HRH__ +#define __T_OOMDUMMYAPP_HRH__ + +#define _UID3 0xE6CFBA00 + +// t_oomdummyapp enumerate command codes +enum Tt_oomdummyappIds + { + ECommand1 = 0x6001, // start value must not be 0 + ECommand2, + EHelp, + EAbout + }; + +#endif // __T_OOMDUMMYAPP_HRH__ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.pan --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.pan Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,37 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef __T_OOMDUMMYAPP_PAN__ +#define __T_OOMDUMMYAPP_PAN__ + +/** t_oomdummyapp application panic codes */ +enum Tt_oomdummyappPanics + { + Et_oomdummyappUi = 1 + // add further panics here + }; + +inline void Panic(Tt_oomdummyappPanics aReason) + { + _LIT(applicationName, "t_oomdummyapp"); + User::Panic(applicationName, aReason); + } + +#endif // __T_OOMDUMMYAPP_PAN__ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppUi.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppUi.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,104 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef __T_OOMDUMMYAPPAPPUI_h__ +#define __T_OOMDUMMYAPPAPPUI_h__ + +// INCLUDES +#include + +// FORWARD DECLARATIONS +class Ct_oomdummyappAppView; +class CMsgHandler; + +// CLASS DECLARATION +/** + * Ct_oomdummyappAppUi application UI class. + * Interacts with the user through the UI and request message processing + * from the handler class + */ +class Ct_oomdummyappAppUi : public CAknAppUi + { +public: + + void SetPriorityBusy(); + void SetPriorityHigh(); + void SetPriorityNormal(); + + // Constructors and destructor + + /** + * ConstructL. + * 2nd phase constructor. + */ + void ConstructL(); + + /** + * Ct_oomdummyappAppUi. + * C++ default constructor. This needs to be public due to + * the way the framework constructs the AppUi + */ + Ct_oomdummyappAppUi(); + + /** + * ~Ct_oomdummyappAppUi. + * Virtual Destructor. + */ + virtual ~Ct_oomdummyappAppUi(); + + void HandleHarnessCommandL(TInt aCommand); +private: + // Functions from base classes + + /** + * From CEikAppUi, HandleCommandL. + * Takes care of command handling. + * @param aCommand Command to be handled. + */ + void HandleCommandL(TInt aCommand); + + /** + * HandleStatusPaneSizeChange. + * Called by the framework when the application status pane + * size is changed. + */ + void HandleStatusPaneSizeChange(); + + /** + * From CCoeAppUi, HelpContextL. + * Provides help context for the application. + * size is changed. + */ + CArrayFix* HelpContextL() const; + +private: + // Data + + /** + * The application view + * Owned by Ct_oomdummyappAppUi + */ + Ct_oomdummyappAppView* iAppView; + CMsgHandler* iMsgHandler; + + }; + +#endif // __T_OOMDUMMYAPPAPPUI_h__ +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppView.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppView.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,95 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef __T_OOMDUMMYAPPAPPVIEW_h__ +#define __T_OOMDUMMYAPPAPPVIEW_h__ + +// INCLUDES +#include + +// CLASS DECLARATION +class Ct_oomdummyappAppView : public CCoeControl + { +public: + // New methods + + /** + * NewL. + * Two-phased constructor. + * Create a Ct_oomdummyappAppView object, which will draw itself to aRect. + * @param aRect The rectangle this view will be drawn to. + * @return a pointer to the created instance of Ct_oomdummyappAppView. + */ + static Ct_oomdummyappAppView* NewL(const TRect& aRect); + + /** + * NewLC. + * Two-phased constructor. + * Create a Ct_oomdummyappAppView object, which will draw itself + * to aRect. + * @param aRect Rectangle this view will be drawn to. + * @return A pointer to the created instance of Ct_oomdummyappAppView. + */ + static Ct_oomdummyappAppView* NewLC(const TRect& aRect); + + /** + * ~Ct_oomdummyappAppView + * Virtual Destructor. + */ + virtual ~Ct_oomdummyappAppView(); + +public: + // Functions from base classes + + /** + * From CCoeControl, Draw + * Draw this Ct_oomdummyappAppView to the screen. + * @param aRect the rectangle of this view that needs updating + */ + void Draw(const TRect& aRect) const; + + /** + * From CoeControl, SizeChanged. + * Called by framework when the view size is changed. + */ + virtual void SizeChanged(); + +private: + // Constructors + + /** + * ConstructL + * 2nd phase constructor. + * Perform the second phase construction of a + * Ct_oomdummyappAppView object. + * @param aRect The rectangle this view will be drawn to. + */ + void ConstructL(const TRect& aRect); + + /** + * Ct_oomdummyappAppView. + * C++ default constructor. + */ + Ct_oomdummyappAppView(); + + }; + +#endif // __T_OOMDUMMYAPPAPPVIEW_h__ +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappApplication.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappApplication.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,74 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef __T_OOMDUMMYAPPAPPLICATION_H__ +#define __T_OOMDUMMYAPPAPPLICATION_H__ + +// INCLUDES +#include +#include "t_oomdummyapp.hrh" + +// UID for the application; +// this should correspond to the uid defined in the mmp file +const TUid KUidt_oomdummyappApp = + { + _UID3 + }; + +// CLASS DECLARATION + +/** + * Ct_oomdummyappApplication application class. + * Provides factory to create concrete document object. + * An instance of Ct_oomdummyappApplication is the application part of the + * AVKON application framework for the t_oomdummyapp example application. + */ +class Ct_oomdummyappApplication : public CAknApplication + { +public: + Ct_oomdummyappApplication(TUid aUid, TUint aAlloc); + // Functions from base classes + + /** + * From CApaApplication, AppDllUid. + * @return Application's UID (KUidt_oomdummyappApp). + */ + TUid AppDllUid() const; + + ~Ct_oomdummyappApplication(); +protected: + // Functions from base classes + + /** + * From CApaApplication, CreateDocumentL. + * Creates Ct_oomdummyappDocument document object. The returned + * pointer in not owned by the Ct_oomdummyappApplication object. + * @return A pointer to the created document object. + */ + CApaDocument* CreateDocumentL(); + +private: + TUid iUID; + TUint iAlloc; + TAny* iMemory; + }; + +#endif // __T_OOMDUMMYAPPAPPLICATION_H__ +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappDocument.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappDocument.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,102 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef __T_OOMDUMMYAPPDOCUMENT_h__ +#define __T_OOMDUMMYAPPDOCUMENT_h__ + +// INCLUDES +#include + +// FORWARD DECLARATIONS +class Ct_oomdummyappAppUi; +class CEikApplication; + +// CLASS DECLARATION + +/** + * Ct_oomdummyappDocument application class. + * An instance of class Ct_oomdummyappDocument is the Document part of the + * AVKON application framework for the t_oomdummyapp example application. + */ +class Ct_oomdummyappDocument : public CAknDocument + { +public: + // Constructors and destructor + + /** + * NewL. + * Two-phased constructor. + * Construct a Ct_oomdummyappDocument for the AVKON application aApp + * using two phase construction, and return a pointer + * to the created object. + * @param aApp Application creating this document. + * @return A pointer to the created instance of Ct_oomdummyappDocument. + */ + static Ct_oomdummyappDocument* NewL(CEikApplication& aApp); + + /** + * NewLC. + * Two-phased constructor. + * Construct a Ct_oomdummyappDocument for the AVKON application aApp + * using two phase construction, and return a pointer + * to the created object. + * @param aApp Application creating this document. + * @return A pointer to the created instance of Ct_oomdummyappDocument. + */ + static Ct_oomdummyappDocument* NewLC(CEikApplication& aApp); + + /** + * ~Ct_oomdummyappDocument + * Virtual Destructor. + */ + virtual ~Ct_oomdummyappDocument(); + +public: + // Functions from base classes + + /** + * CreateAppUiL + * From CEikDocument, CreateAppUiL. + * Create a Ct_oomdummyappAppUi object and return a pointer to it. + * The object returned is owned by the Uikon framework. + * @return Pointer to created instance of AppUi. + */ + CEikAppUi* CreateAppUiL(); + +private: + // Constructors + + /** + * ConstructL + * 2nd phase constructor. + */ + void ConstructL(); + + /** + * Ct_oomdummyappDocument. + * C++ default constructor. + * @param aApp Application creating this document. + */ + Ct_oomdummyappDocument(CEikApplication& aApp); + + }; + +#endif // __T_OOMDUMMYAPPDOCUMENT_h__ +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,8 @@ +#ifndef T_OOMDUMMAPPMSGS_H_ +#define T_OOMDUMMAPPMSGS_H_ + +const TInt KOomDummyAppSetBusy = 5; +const TInt KOomDummyAppSetNormalPriority = 6; +const TInt KOomDummyAppSetHighPriority = 7; + +#endif /*T_OOMDUMMAPPMSGS_H_*/ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/backup_registration.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/backup_registration.xml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,5 @@ + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,37 @@ +; Installation file for t_oomdummyapp application +; +; This is an auto-generated PKG file by Carbide. +; This file uses variables specific to Carbide builds that will not work +; on command-line builds. If you want to use this generated PKG file from the +; command-line tools you will need to modify the variables with the appropriate +; values: $(EPOCROOT), $(PLATFORM), $(TARGET) +; +;Language - standard language definitions +&EN + +; standard SIS file header +#{"t_oomdummyapp"},(0xE6CFBA00),1,0,0 + +;Localised Vendor name +%{"Vendor-EN"} + +;Unique Vendor name +:"Vendor" + +;Supports Series 60 v 3.0 +[0x101F7961], 0, 0, 0, {"Series60ProductID"} + +;Files to install +;You should change the source paths to match that of your environment +; +"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\t_oomdummyapp_0xE6CFBA00.exe" -"!:\sys\bin\t_oomdummyapp_0xE6CFBA00.exe" +"$(EPOCROOT)Epoc32\data\z\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc" -"!:\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc" +"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc" -"!:\private\10003a3f\import\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc" +"$(EPOCROOT)Epoc32\data\z\resource\apps\t_oomdummyapp_0xE6CFBA00.mif" -"!:\resource\apps\t_oomdummyapp_0xE6CFBA00.mif" +"..\help\t_oomdummyapp_0xE6CFBA00.hlp" -"!:\resource\help\t_oomdummyapp_0xE6CFBA00.hlp" + +; Add any installation notes if applicable +;"t_oomdummyapp.txt" -"!:\private\E6CFBA00\t_oomdummyapp.txt" + +;required for application to be covered by backup/restore facility +"..\sis\backup_registration.xml" -"!:\private\E6CFBA00\backup_registration.xml" diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/CMsgHandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/CMsgHandler.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,83 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include "CMsgHandler.h" + +CMsgHandler::CMsgHandler(Ct_oomdummyappAppUi& aOwner) : + CActive(EPriorityStandard), // Standard priority + iOwner(aOwner) + { + } + +CMsgHandler* CMsgHandler::NewLC(Ct_oomdummyappAppUi& aOwner) + { + CMsgHandler* self = new (ELeave) CMsgHandler(aOwner); + CleanupStack::PushL(self); + self->ConstructL(); + return self; + } + +CMsgHandler* CMsgHandler::NewL(Ct_oomdummyappAppUi& aOwner) + { + CMsgHandler* self = CMsgHandler::NewLC(aOwner); + CleanupStack::Pop(); // self; + return self; + } + +void CMsgHandler::ConstructL() + { + User::LeaveIfError(iMsgQueue.Open(15)); // Initialize message queue from process parameters + CActiveScheduler::Add(this); // Add to scheduler + StartL(); + } + +CMsgHandler::~CMsgHandler() + { + Cancel(); // Cancel any request, if outstanding + iMsgQueue.Close(); // Destroy the RMsgQueue object + // Delete instance variables if any + } + +void CMsgHandler::DoCancel() + { + iMsgQueue.CancelDataAvailable(); + } + +void CMsgHandler::StartL() + { + Cancel(); // Cancel any request, just to be sure + iMsgQueue.NotifyDataAvailable(iStatus); + SetActive(); // Tell scheduler a request is active + } + +void CMsgHandler::RunL() + { + TInt command; + while(KErrNone==iMsgQueue.Receive(command)) + { + iOwner.HandleHarnessCommandL(command); + } + StartL(); + } + +TInt CMsgHandler::RunError(TInt aError) + { + return aError; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyapp.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyapp.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,96 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// INCLUDE FILES +#include +#include "t_oomdummyappApplication.h" + +_LIT(KFakeUidParam,"uid="); +_LIT(KAllocParam,"alloc="); +LOCAL_C CApaApplication* NewApplication() + { + TUid uid(KUidt_oomdummyappApp); + TUint alloc = 0; + //override uid from command line (add "uid=6789ABCD" anywhere) + TInt cmdsize = User::CommandLineLength(); + HBufC *cmdbuf = NULL; + if(cmdsize > 0) cmdbuf = HBufC::New(cmdsize); + if(cmdbuf) + { + TPtr cmdline(cmdbuf->Des()); + User::CommandLine(cmdline); + TLex lex(*cmdbuf); + while(!lex.Eos()) + { + lex.SkipSpaceAndMark(); + while(!lex.Eos() && lex.Get() != '=') + { + } + if(lex.MarkedToken().CompareF(KFakeUidParam) == 0) + { + lex.SkipSpaceAndMark(); + while(!lex.Eos() && lex.Get().IsHexDigit()) + { + } + TUint id; + TLex num(lex.MarkedToken()); + if(KErrNone==num.Val(id,EHex)) + { + RDebug::Printf("\tapp uid override %x", id); + uid = TUid::Uid(id); + } + } + else if(lex.MarkedToken().CompareF(KAllocParam) == 0) + { + lex.SkipSpaceAndMark(); + while(!lex.Eos() && lex.Get().IsHexDigit()) + { + } + TLex num(lex.MarkedToken()); + if(KErrNone!=num.Val(alloc,EHex)) + { + alloc = 0; + } + } + } + /* + TInt offset = cmdbuf->Find(KFakeUidParam); + if(offset >=0 && offset + 12 <= cmdbuf->Length()) + { + TLex lex(cmdbuf->Mid(offset+4,8)); + TUint id; + if(KErrNone==lex.Val(id,EHex)) + { + RDebug::Printf("\tapp uid override %x", id); + uid = TUid::Uid(id); + } + } + TInt offset = cmdbuf->Find(KAllocParam); + if(offset >=0 && offset + 12 <= cmdbuf->Length())*/ + delete cmdbuf; + } + return new Ct_oomdummyappApplication(uid, alloc); + } + +GLDEF_C TInt E32Main() + { + return EikStart::RunApplication(NewApplication); + } + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppUi.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppUi.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,271 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// INCLUDE FILES +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +//#include "t_oomdummyapp_0xE6CFBA00.hlp.hrh" +#include "t_oomdummyapp.hrh" +#include "t_oomdummyapp.pan" +#include "t_oomdummyappApplication.h" +#include "t_oomdummyappAppUi.h" +#include "t_oomdummyappAppView.h" +#include "CMsgHandler.h" +#include "t_oomdummyappmsgs.h" + +_LIT( KFileName, "C:\\private\\E6CFBA00\\t_oomdummyapp.txt" ); +_LIT( KText, "OOM dummy app"); + +// ============================ MEMBER FUNCTIONS =============================== + + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppUi::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void Ct_oomdummyappAppUi::ConstructL() + { + // Initialise app UI with standard value. + BaseConstructL(CAknAppUi::EAknEnableSkin); + + // Create view object + iAppView = Ct_oomdummyappAppView::NewL(ClientRect()); + + // Create a file to write the text to + TInt err = CCoeEnv::Static()->FsSession().MkDirAll(KFileName); + if ((KErrNone != err) && (KErrAlreadyExists != err)) + { + return; + } + + RFile file; + err = file.Replace(CCoeEnv::Static()->FsSession(), KFileName, EFileWrite); + CleanupClosePushL(file); + if (KErrNone != err) + { + CleanupStack::PopAndDestroy(1); // file + return; + } + + RFileWriteStream outputFileStream(file); + CleanupClosePushL(outputFileStream); + outputFileStream << KText; + + CleanupStack::PopAndDestroy(2); // outputFileStream, file + + TRAP_IGNORE(iMsgHandler = CMsgHandler::NewL(*this)); //if not launched by test harness, the message queue won't exist + } +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppUi::Ct_oomdummyappAppUi() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappAppUi::Ct_oomdummyappAppUi() + { + // No implementation required + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppUi::~Ct_oomdummyappAppUi() +// Destructor. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappAppUi::~Ct_oomdummyappAppUi() + { + if (iAppView) + { + delete iAppView; + iAppView = NULL; + } + delete iMsgHandler; + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppUi::HandleCommandL() +// Takes care of command handling. +// ----------------------------------------------------------------------------- +// +void Ct_oomdummyappAppUi::HandleCommandL(TInt aCommand) + { + switch (aCommand) + { + case EEikCmdExit: + case EAknSoftkeyExit: + Exit(); + break; + + case ECommand1: + { + + // Load a string from the resource file and display it + HBufC* textResource = StringLoader::LoadLC(R_COMMAND1_TEXT); + CAknInformationNote* informationNote; + + informationNote = new (ELeave) CAknInformationNote; + + // Show the information Note with + // textResource loaded with StringLoader. + informationNote->ExecuteLD(*textResource); + + // Pop HBuf from CleanUpStack and Destroy it. + CleanupStack::PopAndDestroy(textResource); + } + break; + case ECommand2: + { + RFile rFile; + + //Open file where the stream text is + User::LeaveIfError(rFile.Open(CCoeEnv::Static()->FsSession(), + KFileName, EFileStreamText));//EFileShareReadersOnly));// EFileStreamText)); + CleanupClosePushL(rFile); + + // copy stream from file to RFileStream object + RFileReadStream inputFileStream(rFile); + CleanupClosePushL(inputFileStream); + + // HBufC descriptor is created from the RFileStream object. + HBufC* fileData = HBufC::NewLC(inputFileStream, 32); + + CAknInformationNote* informationNote; + + informationNote = new (ELeave) CAknInformationNote; + // Show the information Note + informationNote->ExecuteLD(*fileData); + + // Pop loaded resources from the cleanup stack + CleanupStack::PopAndDestroy(3); // filedata, inputFileStream, rFile + } + break; + case EHelp: + { + + CArrayFix* buf = CCoeAppUi::AppHelpContextL(); + HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), buf); + } + break; + case EAbout: + { + + CAknMessageQueryDialog* dlg = new (ELeave) CAknMessageQueryDialog(); + dlg->PrepareLC(R_ABOUT_QUERY_DIALOG); + HBufC* title = iEikonEnv->AllocReadResourceLC(R_ABOUT_DIALOG_TITLE); + dlg->QueryHeading()->SetTextL(*title); + CleanupStack::PopAndDestroy(); //title + HBufC* msg = iEikonEnv->AllocReadResourceLC(R_ABOUT_DIALOG_TEXT); + dlg->SetMessageTextL(*msg); + CleanupStack::PopAndDestroy(); //msg + dlg->RunLD(); + } + break; + default: + Panic(Et_oomdummyappUi); + break; + } + } + +void Ct_oomdummyappAppUi::HandleHarnessCommandL(TInt aCommand) + { + switch(aCommand) + { + case 0: + Exit(); + break; + case 1: + ActivateTopViewL(); + break; + case KOomDummyAppSetBusy: + SetPriorityBusy(); + break; + case KOomDummyAppSetNormalPriority: + SetPriorityNormal(); + break; + case KOomDummyAppSetHighPriority: + SetPriorityHigh(); + break; + } + } + +void Ct_oomdummyappAppUi::SetPriorityBusy() + { + ROomMonitorSession oomSession; + oomSession.Connect(); + oomSession.SetOomPriority(ROomMonitorSession::EOomPriorityBusy); + oomSession.Close(); + } + +void Ct_oomdummyappAppUi::SetPriorityNormal() + { + ROomMonitorSession oomSession; + oomSession.Connect(); + oomSession.SetOomPriority(ROomMonitorSession::EOomPriorityNormal); + oomSession.Close(); + } + +void Ct_oomdummyappAppUi::SetPriorityHigh() + { + ROomMonitorSession oomSession; + oomSession.Connect(); + oomSession.SetOomPriority(ROomMonitorSession::EOomPriorityHigh); + oomSession.Close(); + } + + +// ----------------------------------------------------------------------------- +// Called by the framework when the application status pane +// size is changed. Passes the new client rectangle to the +// AppView +// ----------------------------------------------------------------------------- +// +void Ct_oomdummyappAppUi::HandleStatusPaneSizeChange() + { + iAppView->SetRect(ClientRect()); + } + +CArrayFix* Ct_oomdummyappAppUi::HelpContextL() const + { + // Note: Help will not work if the application uid3 is not in the + // protected range. The default uid3 range for projects created + // from this template (0xE0000000 - 0xEFFFFFFF) are not in the protected range so that they + // can be self signed and installed on the device during testing. + // Once you get your official uid3 from Symbian Ltd. and find/replace + // all occurrences of uid3 in your project, the context help will + // work. Alternatively, a patch now exists for the versions of + // HTML help compiler in SDKs and can be found here along with an FAQ: + // http://www3.symbian.com/faq.nsf/AllByDate/E9DF3257FD565A658025733900805EA2?OpenDocument + CArrayFixFlat* array = new (ELeave) CArrayFixFlat< + TCoeHelpContext> (1); + CleanupStack::PushL(array); + //array->AppendL(TCoeHelpContext(KUidt_oomdummyappApp, KGeneral_Information)); + CleanupStack::Pop(array); + return array; + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppView.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppView.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,117 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +// INCLUDE FILES +#include +#include "t_oomdummyappAppView.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppView::NewL() +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappAppView* Ct_oomdummyappAppView::NewL(const TRect& aRect) + { + Ct_oomdummyappAppView* self = Ct_oomdummyappAppView::NewLC(aRect); + CleanupStack::Pop(self); + return self; + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppView::NewLC() +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappAppView* Ct_oomdummyappAppView::NewLC(const TRect& aRect) + { + Ct_oomdummyappAppView* self = new (ELeave) Ct_oomdummyappAppView; + CleanupStack::PushL(self); + self->ConstructL(aRect); + return self; + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppView::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void Ct_oomdummyappAppView::ConstructL(const TRect& aRect) + { + // Create a window for this application view + CreateWindowL(); + + // Set the windows size + SetRect(aRect); + + // Activate the window, which makes it ready to be drawn + ActivateL(); + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppView::Ct_oomdummyappAppView() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappAppView::Ct_oomdummyappAppView() + { + // No implementation required + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppView::~Ct_oomdummyappAppView() +// Destructor. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappAppView::~Ct_oomdummyappAppView() + { + // No implementation required + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppView::Draw() +// Draws the display. +// ----------------------------------------------------------------------------- +// +void Ct_oomdummyappAppView::Draw(const TRect& /*aRect*/) const + { + // Get the standard graphics context + CWindowGc& gc = SystemGc(); + + // Gets the control's extent + TRect drawRect(Rect()); + + // Clears the screen + gc.Clear(drawRect); + + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappAppView::SizeChanged() +// Called by framework when the view size is changed. +// ----------------------------------------------------------------------------- +// +void Ct_oomdummyappAppView::SizeChanged() + { + DrawNow(); + } +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappApplication.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappApplication.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,62 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +// INCLUDE FILES +#include "t_oomdummyapp.hrh" +#include "t_oomdummyappDocument.h" +#include "t_oomdummyappApplication.h" + +// ============================ MEMBER FUNCTIONS =============================== + +Ct_oomdummyappApplication::Ct_oomdummyappApplication(TUid aUid, TUint aAlloc) : iUID(aUid), iAlloc(aAlloc) + { + + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappApplication::CreateDocumentL() +// Creates CApaDocument object +// ----------------------------------------------------------------------------- +// +CApaDocument* Ct_oomdummyappApplication::CreateDocumentL() + { + if(iAlloc > 0) iMemory = User::AllocL(iAlloc); + // Create an t_oomdummyapp document, and return a pointer to it + return Ct_oomdummyappDocument::NewL(*this); + } + +Ct_oomdummyappApplication::~Ct_oomdummyappApplication() + { + delete iMemory; + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappApplication::AppDllUid() +// Returns application UID +// ----------------------------------------------------------------------------- +// +TUid Ct_oomdummyappApplication::AppDllUid() const + { + // Return the UID for the t_oomdummyapp application + return iUID; + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappDocument.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappDocument.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,97 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +// INCLUDE FILES +#include "t_oomdummyappAppUi.h" +#include "t_oomdummyappDocument.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappDocument::NewL() +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappDocument* Ct_oomdummyappDocument::NewL(CEikApplication& aApp) + { + Ct_oomdummyappDocument* self = NewLC(aApp); + CleanupStack::Pop(self); + return self; + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappDocument::NewLC() +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappDocument* Ct_oomdummyappDocument::NewLC(CEikApplication& aApp) + { + Ct_oomdummyappDocument* self = new (ELeave) Ct_oomdummyappDocument(aApp); + + CleanupStack::PushL(self); + self->ConstructL(); + return self; + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappDocument::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void Ct_oomdummyappDocument::ConstructL() + { + // No implementation required + } + +// ----------------------------------------------------------------------------- +// Ct_oomdummyappDocument::Ct_oomdummyappDocument() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +// +Ct_oomdummyappDocument::Ct_oomdummyappDocument(CEikApplication& aApp) : + CAknDocument(aApp) + { + // No implementation required + } + +// --------------------------------------------------------------------------- +// Ct_oomdummyappDocument::~Ct_oomdummyappDocument() +// Destructor. +// --------------------------------------------------------------------------- +// +Ct_oomdummyappDocument::~Ct_oomdummyappDocument() + { + // No implementation required + } + +// --------------------------------------------------------------------------- +// Ct_oomdummyappDocument::CreateAppUiL() +// Constructs CreateAppUi. +// --------------------------------------------------------------------------- +// +CEikAppUi* Ct_oomdummyappDocument::CreateAppUiL() + { + // Create the application user interface, and return a pointer to it; + // the framework takes ownership of this object + return new (ELeave) Ct_oomdummyappAppUi; + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/data/t_oomdummyplugin.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/data/t_oomdummyplugin.rss Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,102 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +#include +#include + +RESOURCE REGISTRY_INFO theInfo + { + dll_uid = 0x10286A33; + interfaces = + { + INTERFACE_INFO + { + interface_uid = KOomPluginInterfaceUidValue; + implementations = + { + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A34; + version_no = 1; + display_name = "dummy 1"; + default_data = ""; + opaque_data = ""; + }, + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A35; + version_no = 1; + display_name = "dummy 2"; + default_data = ""; + opaque_data = ""; + }, + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A36; + version_no = 1; + display_name = "dummy 3"; + default_data = ""; + opaque_data = ""; + }, + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A37; + version_no = 1; + display_name = "dummy 4"; + default_data = ""; + opaque_data = ""; + }, + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A38; + version_no = 1; + display_name = "dummy 5"; + default_data = ""; + opaque_data = ""; + }, + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A39; + version_no = 1; + display_name = "dummy 6"; + default_data = ""; + opaque_data = ""; + }, + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A3A; + version_no = 1; + display_name = "dummy 7"; + default_data = ""; + opaque_data = ""; + }, + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A3B; + version_no = 1; + display_name = "dummy 8"; + default_data = ""; + opaque_data = ""; + } + }; + } + }; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +PRJ_PLATFORMS +DEFAULT + +PRJ_TESTMMPFILES +t_oomdummyplugin.mmp + +PRJ_TESTEXPORTS +../inc/t_oomdummyplugin_properties.h ../../inc/t_oomdummyplugin_properties.h diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/t_oomdummyplugin.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/t_oomdummyplugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,52 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +#include + +TARGET t_oomdummyplugin.dll +TARGETTYPE PLUGIN +// UID2 = 0x10009d8d for ECOM plugins. +// UID3 = the 'DLL UID' (see resource file) +UID 0x10009d8d 0x10286A33 +CAPABILITY CAP_GENERAL_DLL + +// This is a SYSTEMINCLUDE macro containing the middleware +// layer specific include directories +MW_LAYER_SYSTEMINCLUDE + +LIBRARY euser.lib +LIBRARY t_oomclient.lib +LIBRARY oommonitor.lib + +USERINCLUDE ../inc +USERINCLUDE ../../inc + + +SOURCEPATH ../data +RESOURCE t_oomdummyplugin.rss + +SOURCEPATH ../src +SOURCE ecom_entry.cpp +SOURCE dummyplugin.cpp + +#ifdef ENABLE_ABIV2_MODE +DEBUGGABLE +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/debug.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/debug.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,36 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef DEBUG_H_ +#define DEBUG_H_ + +#include + +#ifdef _DEBUG +#define TRACE_FUNC RDebug::Printf("\t%s[%x]", __PRETTY_FUNCTION__, iInstance); +#define TRACE_FUNC_ENTRY RDebug::Printf("\t+%s[%x]", __PRETTY_FUNCTION__, iInstance); +#define TRACE_FUNC_EXIT RDebug::Printf("\t-%s[%x]", __PRETTY_FUNCTION__, iInstance); +#else +#define TRACE_FUNC +#define TRACE_FUNC_ENTRY +#define TRACE_FUNC_EXIT +#endif + +#endif /* DEBUG_H_ */ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/dummyplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/dummyplugin.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,69 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef DUMMYPLUGIN_H_ +#define DUMMYPLUGIN_H_ + +#include +#include "t_oomclient.h" + +class CDummyOomPlugin : public COomMonitorPlugin + { +public: + static CDummyOomPlugin* NewL(TInt aInstance); + ~CDummyOomPlugin(); +private: + CDummyOomPlugin(TInt aInstance); + void ConstructL(); + //from COomMonitorPlugin + virtual void FreeRam(); + virtual void MemoryGood(); + +private: + TInt iInstance; + TInt iLowMemoryCallCount; + TInt iGoodMemoryCallCount; + ROOMAllocSession iAllocServer; + }; + + +/* +class CDummyOomPluginV2 : public COomMonitorPluginV2 + { +public: + static CDummyOomPluginV2* NewL(TInt aInstance); + ~CDummyOomPluginV2(); +private: + CDummyOomPluginV2(TInt aInstance); + void ConstructL(); + //from COomMonitorPlugin + virtual void FreeRam(TInt aBytesRequested); + virtual void MemoryGood(); + +private: + TInt iInstance; + TInt iLowMemoryCallCount; + TInt iGoodMemoryCallCount; + ROOMAllocSession iAllocServer; + }; +*/ + + +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/t_oomdummyplugin_properties.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/t_oomdummyplugin_properties.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,37 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef DUMMYPLUGIN_PROPETIES_H_ +#define DUMMYPLUGIN_PROPETIES_H_ + +const TUid KUidOomPropertyCategory = {0x10286A3E}; + +//The key is the UID of the implementation instance, i.e. 10286A34 To 10286A3D +const TInt KUidOOMDummyPluginFirstImplementation(0x10286A34); +const TInt KUidOOMDummyPluginLastImplementation(0x10286A3D); + +const TUint KOOMDummyPluginImplementationCount = 10; + +const TUint KOOMDummyPluginLowMemoryCount = 0; +const TUint KOOMDummyPluginGoodMemoryCount = 1 * KOOMDummyPluginImplementationCount; +const TUint KOOMDummyPluginCurrentAllocationBytes = 2 * KOOMDummyPluginImplementationCount; +const TUint KOOMDummyPluginBytesRequested = 3 * KOOMDummyPluginImplementationCount; + +#endif /* DUMMYPLUGIN_PROPETIES_H_ */ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/dummyplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/dummyplugin.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,69 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include +#include +#include "dummyplugin.h" +#include "debug.h" +#include "t_oomdummyplugin_properties.h" + +CDummyOomPlugin* CDummyOomPlugin::NewL(TInt aInstance) + { + CDummyOomPlugin* self = new(ELeave)CDummyOomPlugin(aInstance); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +CDummyOomPlugin::CDummyOomPlugin(TInt aInstance) : +iInstance(aInstance) + { + + } + +void CDummyOomPlugin::ConstructL() + { + TRACE_FUNC_ENTRY; + //connect to alloc server + User::LeaveIfError(iAllocServer.Connect()); + TRACE_FUNC_EXIT; + } + +CDummyOomPlugin::~CDummyOomPlugin() + { + TRACE_FUNC; + } + +void CDummyOomPlugin::FreeRam() + { + TRACE_FUNC; + iLowMemoryCallCount++; + RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginLowMemoryCount, iLowMemoryCallCount); + iAllocServer.MemoryLow(TUid::Uid(iInstance)); + } + +void CDummyOomPlugin::MemoryGood() + { + TRACE_FUNC; + iGoodMemoryCallCount++; + RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginGoodMemoryCount, iGoodMemoryCallCount); + iAllocServer.MemoryGood(TUid::Uid(iInstance)); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/ecom_entry.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/ecom_entry.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,62 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include +#include "dummyplugin.h" + +#define DECLARE_CREATE_INSTANCE(UID) CDummyOomPlugin* CreateInstance##UID() { return CDummyOomPlugin::NewL(UID); } +#define IMPLEMENTATION_INSTANCE(UID) IMPLEMENTATION_PROXY_ENTRY(UID, CreateInstance##UID) + +// #define DECLARE_CREATE_INSTANCEV2(UID) CDummyOomPluginV2* CreateInstance##UID() { return CDummyOomPluginV2::NewL(UID); } +// #define IMPLEMENTATION_INSTANCEV2(UID) IMPLEMENTATION_PROXY_ENTRY(UID, CreateInstance##UID) + +//ECOM factory functions +DECLARE_CREATE_INSTANCE(0x10286A34) +DECLARE_CREATE_INSTANCE(0x10286A35) +DECLARE_CREATE_INSTANCE(0x10286A36) +DECLARE_CREATE_INSTANCE(0x10286A37) +DECLARE_CREATE_INSTANCE(0x10286A38) +DECLARE_CREATE_INSTANCE(0x10286A39) +DECLARE_CREATE_INSTANCE(0x10286A3A) +DECLARE_CREATE_INSTANCE(0x10286A3B) +// DECLARE_CREATE_INSTANCEV2(0x10286A3C) +// DECLARE_CREATE_INSTANCEV2(0x10286A3D) + +// Define the private interface UIDs +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_INSTANCE(0x10286A34), + IMPLEMENTATION_INSTANCE(0x10286A35), + IMPLEMENTATION_INSTANCE(0x10286A36), + IMPLEMENTATION_INSTANCE(0x10286A37), + IMPLEMENTATION_INSTANCE(0x10286A38), + IMPLEMENTATION_INSTANCE(0x10286A39), + IMPLEMENTATION_INSTANCE(0x10286A3A), + IMPLEMENTATION_INSTANCE(0x10286A3B)// , + // IMPLEMENTATION_INSTANCEV2(0x10286A3C), + // IMPLEMENTATION_INSTANCEV2(0x10286A3D) + }; + +EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) + { + aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + + return ImplementationTable; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/data/t_oomdummyplugin2.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/data/t_oomdummyplugin2.rss Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,55 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + + +#include +#include + +RESOURCE REGISTRY_INFO theInfo + { + dll_uid = 0x10286A81; + interfaces = + { + INTERFACE_INFO + { + interface_uid = KOomPluginInterfaceV2UidValue; + implementations = + { + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A3C; + version_no = 1; + display_name = "dummyv2 1"; + default_data = ""; + opaque_data = ""; + }, + IMPLEMENTATION_INFO + { + implementation_uid = 0x10286A3D; + version_no = 1; + display_name = "dummyv2 2"; + default_data = ""; + opaque_data = ""; + } + }; + } + }; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +PRJ_PLATFORMS +DEFAULT + +PRJ_TESTMMPFILES +t_oomdummyplugin2.mmp + +PRJ_TESTEXPORTS +../inc/t_oomdummyplugin_properties2.h ../../inc/t_oomdummyplugin_properties2.h diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/t_oomdummyplugin2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/t_oomdummyplugin2.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,51 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +#include + +TARGET t_oomdummyplugin2.dll +TARGETTYPE PLUGIN +// UID2 = 0x10009d8d for ECOM plugins. +// UID3 = the 'DLL UID' (see resource file) +UID 0x10009d8d 0x10286A81 +CAPABILITY CAP_GENERAL_DLL + +// This is a SYSTEMINCLUDE macro containing the middleware +// layer specific include directories +MW_LAYER_SYSTEMINCLUDE + +USERINCLUDE ../inc +USERINCLUDE ../../inc + +LIBRARY euser.lib +LIBRARY t_oomclient.lib +LIBRARY oommonitor.lib + +SOURCEPATH ../data +RESOURCE t_oomdummyplugin2.rss + +SOURCEPATH ../src +SOURCE ecom_entry2.cpp +SOURCE dummyplugin2.cpp + +#ifdef ENABLE_ABIV2_MODE +DEBUGGABLE +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/debug.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/debug.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,36 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef DEBUG_H_ +#define DEBUG_H_ + +#include + +#ifdef _DEBUG +#define TRACE_FUNC RDebug::Printf("\t%s[%x]", __PRETTY_FUNCTION__, iInstance); +#define TRACE_FUNC_ENTRY RDebug::Printf("\t+%s[%x]", __PRETTY_FUNCTION__, iInstance); +#define TRACE_FUNC_EXIT RDebug::Printf("\t-%s[%x]", __PRETTY_FUNCTION__, iInstance); +#else +#define TRACE_FUNC +#define TRACE_FUNC_ENTRY +#define TRACE_FUNC_EXIT +#endif + +#endif /* DEBUG_H_ */ diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/dummyplugin2.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/dummyplugin2.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,50 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef DUMMYPLUGIN2_H_ +#define DUMMYPLUGIN2_H_ + +#include +#include "t_oomclient.h" + + + +class CDummyOomPluginV2 : public COomMonitorPluginV2 + { +public: + static CDummyOomPluginV2* NewL(TInt aInstance); + ~CDummyOomPluginV2(); +private: + CDummyOomPluginV2(TInt aInstance); + void ConstructL(); + //from COomMonitorPlugin + virtual void FreeRam(TInt aBytesRequested); + virtual void MemoryGood(); + +private: + TInt iInstance; + TInt iLowMemoryCallCount; + TInt iGoodMemoryCallCount; + ROOMAllocSession iAllocServer; + }; + + + +#endif diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/t_oomdummyplugin_properties2.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/t_oomdummyplugin_properties2.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,21 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/dummyplugin2.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/dummyplugin2.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,71 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include +#include +#include "dummyplugin2.h" +#include "debug.h" +#include "t_oomdummyplugin_properties.h" + + +CDummyOomPluginV2* CDummyOomPluginV2::NewL(TInt aInstance) + { + CDummyOomPluginV2* self = new(ELeave)CDummyOomPluginV2(aInstance); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +CDummyOomPluginV2::CDummyOomPluginV2(TInt aInstance) : +iInstance(aInstance) + { + + } + +void CDummyOomPluginV2::ConstructL() + { + TRACE_FUNC_ENTRY; + //connect to alloc server + User::LeaveIfError(iAllocServer.Connect()); + TRACE_FUNC_EXIT; + } + +CDummyOomPluginV2::~CDummyOomPluginV2() + { + TRACE_FUNC; + } + +void CDummyOomPluginV2::FreeRam(TInt aBytesRequested) + { + TRACE_FUNC; + iLowMemoryCallCount++; + RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginLowMemoryCount, iLowMemoryCallCount); + TInt err = RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginBytesRequested, aBytesRequested); + iAllocServer.MemoryLow(TUid::Uid(iInstance)); + } + +void CDummyOomPluginV2::MemoryGood() + { + TRACE_FUNC; + iGoodMemoryCallCount++; + RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginGoodMemoryCount, iGoodMemoryCallCount); + iAllocServer.MemoryGood(TUid::Uid(iInstance)); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/ecom_entry2.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/ecom_entry2.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,43 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include +#include "dummyplugin2.h" + +#define DECLARE_CREATE_INSTANCEV2(UID) CDummyOomPluginV2* CreateInstance##UID() { return CDummyOomPluginV2::NewL(UID); } +#define IMPLEMENTATION_INSTANCEV2(UID) IMPLEMENTATION_PROXY_ENTRY(UID, CreateInstance##UID) + +//ECOM factory functions +DECLARE_CREATE_INSTANCEV2(0x10286A3C) +DECLARE_CREATE_INSTANCEV2(0x10286A3D) + +// Define the private interface UIDs +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_INSTANCEV2(0x10286A3C), + IMPLEMENTATION_INSTANCEV2(0x10286A3D) + }; + +EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) + { + aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + + return ImplementationTable; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +PRJ_PLATFORMS +DEFAULT + +PRJ_TESTMMPFILES +t_oomharness.mmp diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/t_oomharness.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/t_oomharness.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,50 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +#include + +TARGET t_oomharness.exe +TARGETTYPE exe +UID 0 0xEF1971CE + +// This is a SYSTEMINCLUDE macro containing the middleware +// layer specific include directories +MW_LAYER_SYSTEMINCLUDE + +USERINCLUDE ../inc +USERINCLUDE ../../inc + +SOURCEPATH ../src +SOURCE t_oomharness.cpp +SOURCE CDummyApplicationHandle.cpp + +LIBRARY euser.lib +LIBRARY t_oomclient.lib +LIBRARY hal.lib +LIBRARY oommonitor.lib + + +#ifdef ENABLE_ABIV2_MODE +DEBUGGABLE +#endif + +EPOCHEAPSIZE 0x4000 0x4000000 +CAPABILITY WriteDeviceData diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/CDummyApplicationHandle.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/CDummyApplicationHandle.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,91 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef CDUMMYAPPLICATIONHANDLE_H +#define CDUMMYAPPLICATIONHANDLE_H + +// INCLUDES +#include +#include +#include + +// a few uids...use appuidlister to extract from the app_reg.rsc files +const TUid KUidAbout = {0x10005a22}; +const TUid KUidBLID = {0x101f85a0}; +const TUid KUidBrowserNG = {0x10008d39}; +const TUid KUidCalendar = {0x10005901}; +const TUid KUidClock = {0x10005903}; +const TUid KUidGallery = {0x101f8599}; +const TUid KUidPhonebook2 = {0x101f4cce}; +const TUid KUidProfileApp = {0x100058f8}; + +// CLASS DECLARATION + +/** + * CCDummyApplicationHandle + * A helper class for launching dummy apps and checking their status + */ +class CCDummyApplicationHandle : public CBase + { +public: + // Constructors and destructor + + /** + * Destructor. + */ + ~CCDummyApplicationHandle(); + + /** + * Two-phased constructor. + */ + static CCDummyApplicationHandle* NewL(TUid aUid, TInt aExtraMemoryAllocation = 0); + + /** + * Two-phased constructor. + */ + static CCDummyApplicationHandle* NewLC(TUid aUid, TInt aExtraMemoryAllocation = 0); + + inline RProcess& Process() { return iProcess; } + inline const TUid& Uid() { return iUid; } + + void SendMessage(TInt aMessage); + + void BringToForeground(); + + static TBool CompareTo(const TUid* aKey, const CCDummyApplicationHandle& aValue); +private: + + /** + * Constructor for performing 1st stage construction + */ + CCDummyApplicationHandle(TUid aUid); + + /** + * EPOC default constructor for performing 2nd stage construction + */ + void ConstructL(TInt aExtraMemoryAllocation = 0); + + RProcess iProcess; + //a channel for sending control messages to the dummy app... + RMsgQueue iMsgQueue; + TUid iUid; + }; + +#endif // CDUMMYAPPLICATIONHANDLE_H diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,35 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + */ + +template +class CleanupResetAndDestroy + { +public: + inline static void PushL(T& aRef); +private: + static void ResetAndDestroy(TAny *aPtr); + }; + +template +inline void CleanupResetAndDestroyPushL(T& aRef); + + +#include "cleanuputils.inl" diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.inl Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,37 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +template +inline void CleanupResetAndDestroy::PushL(T& aRef) + { + CleanupStack::PushL(TCleanupItem(&ResetAndDestroy,&aRef)); + } + +template +void CleanupResetAndDestroy::ResetAndDestroy(TAny *aPtr) + { + static_cast(aPtr)->ResetAndDestroy(); + } + +template +inline void CleanupResetAndDestroyPushL(T& aRef) + { + CleanupResetAndDestroy::PushL(aRef); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/t_oomharness.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/t_oomharness.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,308 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef __T_OOMHARNESS_H__ +#define __T_OOMHARNESS_H__ + +// Include Files + +#include +#include +#include + +#include "CDummyApplicationHandle.h" +#include "t_oomclient.h" +#include + +const TTimeIntervalMicroSeconds32 KSettlingTime = 500000; + +// Function Prototypes + +GLDEF_C TInt E32Main(); + +class COomTestHarness : public CBase + { +public: + // Constructors and destructor + static COomTestHarness* NewLC(); + + ~COomTestHarness(); + + void StartL(); + +private: + +// Test setup functions... + + // Close any dummy apps + // Free all memory being eaten by the server + // Update the call counts on the plugins (add them if they're not there already) + void ResetL(); + + void EatMemoryL(TInt aKBytesToLeaveFree); + + // Set up the plugins and applications - this is the starting point for many test cases + // 5 applications are started with approx 1 MB used for each + // 1MB (approx) of memory is reserved for each one of the plugins + void CommonSetUpL(); + + void StartApplicationL(TInt32 aUid, TInt aInitialAllocationInKBs); + +// Results checking functions... + + // Returns KErrNone if we get the expected result + TInt AppIsRunning(TInt32 aUid, TBool aExpectedResult); + + // Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)? + // Returns KErrNone if we get the expected result + TInt PluginFreeRamCalledL(TInt32 aUid, TBool aExpectedResult); + + // Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)? + // Returns KErrNone if we get the expected result + TInt PluginMemoryGoodCalledL(TInt32 aUid, TBool aExpectedResult); + +// Utility functions + + // Wait a while for the system to settle down + inline void Settle(); + + TInt BringAppToForeground(TInt32 aUid); + + void EatMemoryUntilWeAreStuckUnderTheLowThresholdL(); + +// The tests... + + // Test normal application closure for a single app + // Start three applications + // The lowest priority app should be in the foregound + // ... with the next lowest behind it + // ... followed by the highest priority application at the back + // The middle application should be configured to eat 5MB of memory + // A low memory event is triggered and the middle application only should be closed + TInt AppCloseTest1L(); + + // Tests the idle time rule mechanism for app closure + // Start three applications + // The lowest priority app should be in the foregound + // ... with the next lowest behind it + // ... followed by the highest priority application at the back + // After an idle period the highest priority app is configured to become the lowest priority + // The middle and highest application should be configured to eat 5MB of memory + // A low memory event is triggered and the middle application only should be closed + // Note that this test should be the same as AppCloseTest1L, with the exception of the idle period which causes different apps to be closed + TInt AppCloseIdleTimeTest1L(); + + // Test system plugins and continue mode + // Simulate a low memory event + // Two system plugins should free enough memory, but four will be run because they work in "continue" mode + TInt PluginTest1L(); + + // Test application plugins + // Start two target apps + // Simulate a low memory event + // The one of the application plugins should now be run, displacing one of the system plugins + // The target apps are of sufficiently high priority that they will not be closed + TInt PluginTest2L(); + + // Test that the aBytesRequested is correctly passed to the FreeMemory function of V2 plugins + // Initialise P4 plugin to consume 5MB of memory + // No other plugins are configured to release memory + // Simulate a low memory event (go just below the low threshold) + // Check that the P4 plugin has been called + // Check that the P4 plugin has received a request for > 500K and less than <1500K + TInt PluginV2Test1L(); + + // Test simple prioritisation of application plugins + // Start two target applications + // Configure all plugins to consume 0.5MB + // Simulate a low memory event + // Some of the low priority app plugins with those target applications should be called + // The highest priority app with that target application should not be called (the lower priority plugins should free enough memory) + TInt AppPluginTest1L(); + + // Test simple prioritisation of application plugins + // Start two target applications + // Configure all plugins to consume 0.5MB + // The app plugin with the highest priority is configured to be assigned the lowest priority after an idle time + // Wait until the idle time rule applies + // Simulate a low memory event + // The plugin that initially had the highest priority (but now has the lowest priority) should be called + // Note that this test should be the same as AppPluginTest1L with the addition of the idle period + TInt AppPluginIdleTimeTest1L(); + + // Test idle time handling for plugins + // Start two target apps + // Simulate a low memory event + // The one of the application plugins should now be run, displacing one of the system plugins + // The target apps are of sufficiently high priority that they will not be closed + TInt PluginIdleTimeTest2L(); + + // Test the optional allocation mechanism + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 12MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just below the good memory level + // Request an optional allocation of 10MB referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed freeing the required memory + TInt OptionalAllocationTest1L(); + + + // Test the optional allocation mechanism - minimum requested RAM behaviour - successful request + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 5MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just above the good memory level + // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed freeing the required minimum amount memory + // The returned available memory should be about 5MB ( > 3MB and < 7MB ) + TInt OptionalAllocationTest2L(); + + // Test the optional allocation mechanism - minimum requested RAM behaviour - failed request + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 3MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just above the good memory level + // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed but it won't free enough memory + // The optional allocation should fail with KErrNoMemory + TInt OptionalAllocationTest3L(); + + + // Test the async optional allocation mechanism + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 12MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just below the good memory level + // Request an optional allocation of 10MB referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed freeing the required memory + TInt OptionalAllocationAsyncTest1L(); + + + // Test the async optional allocation mechanism - minimum requested RAM behaviour - successful request + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 5MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just above the good memory level + // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed freeing the required minimum amount memory + // The returned available memory should be about 5MB ( > 3MB and < 7MB ) + TInt OptionalAllocationAsyncTest2L(); + + // Test the async optional allocation mechanism - minimum requested RAM behaviour - failed request + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 3MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just above the good memory level + // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed but it won't free enough memory + // The optional allocation should fail with KErrNoMemory + TInt OptionalAllocationAsyncTest3L(); + + + // Test that force priority check applies (only) to selected priorities + // Setup three plugins (priorities 7, 8 & 9)to eat 5MB each + // The configuration file should force a check after priority 8 + // Drop just under the low threshold + // Plugins P7 & P8 should be called (P8 is called even though the P7 plugin freed enough memory) + // Plugin P9 should not be called because enou + TInt ForcePriorityCheck1L(); + + // Test the Busy API on the OOM server + // Start three applications + // Ensure that the lowest priority app is not in the foreground + // Call the busy API on the OOM monitor for the lowest priority app + // Simulate a low memory event by going just under the low threshold + // The busy application should not be closed + // The other (non-foreground) application should be closed + TInt BusyApplicationTest1L(); + + // Test the Normal-priority API on the OOM server + // Start three applications + // Ensure that the lowest priority app is not in the foreground + // Call the busy API on the OOM monitor for the lowest priority app + // Then call the not-busy API on the OOM monitor for the lowest priority app + // Simulate a low memory event by going just under the low threshold + // The lowest priority app should be closed (because it is no longer busy) + TInt NormalPriorityApplicationTest1L(); + + // Test that sync mode configuration is working for system plugins + // Configure three system plugins to release 5MB of memory each. + // The plugins are configured as follows + // Plugin 1: Priority 7, sync mode continue + // Plugin 2: Priority 8, sync mode check + // Plugin 3: Priority 9, sync mode continue + // Drop just under the low threshold + // Plugins 1 & 2 should be called (even though plugin 1 alone has freed enough RAM) + // Plugin 3 won't be called because the check on the priority 8 plugin discovers that enough RAM has been freed + TInt PluginSyncModeTest1L(); + + + // Start three applications + // One is set to NEVER_CLOSE, one is low priority, one is a dummy app to ensure that the first two are not in the foreground + // Configure applications not to release any memory + // Go just significantly under the low memory threshold + // Wait for the system to recover, if we have moved above the low memory threshold then go significantly under it again. Repeat this step until we no longer go above low. + // Check that the low priority application is closed + // Check that the NEVER_CLOSE application is not closed (even though we're still below the low theshold) + TInt NeverCloseTest1L(); + + TInt GetFreeMemory(); + + // Utility function which calls the async version of optional RAM request and makes it behave like the sync version + TInt RequestOptionalRamASyncWrapper(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable); + +private: + COomTestHarness(); + + void ConstructL(); + +private: + + struct TPluginCallCount + { + TInt iFreeRamCallCount; + TInt iMemoryGoodCallCount; + }; + + RHashMap iPluginCallCounts; + + RPointerArray iApps; + + ROOMAllocSession iAllocServer; + + RChunk iChunk; + TInt iChunkSize; + + ROomMonitorSession iOomSession; + }; + +#endif // __T_OOMHARNESS_H__ + +inline void COomTestHarness::Settle() + { + //wait for oom system to settle + User::After(KSettlingTime); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,24 @@ +; Installation file for Symbian OS 9.x for generic console application +; Installation file for t_oomharness EXE +; +; This is an auto-generated PKG file by Carbide. +; This file uses variables specific to Carbide builds that will not work +; on command-line builds. If you want to use this generated PKG file from the +; command-line tools you will need to modify the variables with the appropriate +; values: $(EPOCROOT), $(PLATFORM), $(TARGET) +; + +; +; UID is the exe's UID +; +#{"t_oomharness EXE"},(0xEF1971CE),1,0,0 + + +;Localised Vendor name +%{"Vendor-EN"} + +;Unique Vendor name +:"Vendor" + +"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\t_oomharness.exe" -"!:\sys\bin\t_oomharness.exe" + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/CDummyApplicationHandle.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/CDummyApplicationHandle.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,78 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include +#include "CDummyApplicationHandle.h" + +CCDummyApplicationHandle::CCDummyApplicationHandle(TUid aUid) +: iUid(aUid) + { + // No implementation required + } + +CCDummyApplicationHandle::~CCDummyApplicationHandle() + { + if(iMsgQueue.Handle()) + { + iMsgQueue.SendBlocking(0); + iMsgQueue.Close(); + } + iProcess.Close(); + } + +CCDummyApplicationHandle* CCDummyApplicationHandle::NewLC(TUid aUid, TInt aExtraMemoryAllocation) + { + CCDummyApplicationHandle* self = new (ELeave) CCDummyApplicationHandle(aUid); + CleanupStack::PushL(self); + self->ConstructL(aExtraMemoryAllocation); + return self; + } + +CCDummyApplicationHandle* CCDummyApplicationHandle::NewL(TUid aUid, TInt aExtraMemoryAllocation) + { + CCDummyApplicationHandle* self = CCDummyApplicationHandle::NewLC(aUid, aExtraMemoryAllocation); + CleanupStack::Pop(); // self; + return self; + } + +void CCDummyApplicationHandle::ConstructL(TInt aExtraMemoryAllocation) + { + TBuf<28> params; + params.Format(_L("uid=%08x alloc=%x"), iUid, aExtraMemoryAllocation); + User::LeaveIfError(iProcess.Create(_L("z:\\sys\\bin\\t_oomdummyapp_0xE6CFBA00.exe"), params)); + User::LeaveIfError(iMsgQueue.CreateGlobal(KNullDesC, 4)); + User::LeaveIfError(iProcess.SetParameter(15, iMsgQueue)); + iProcess.Resume(); + } + +void CCDummyApplicationHandle::SendMessage(TInt aMessage) + { + iMsgQueue.SendBlocking(aMessage); + } + +TBool CCDummyApplicationHandle::CompareTo(const TUid* aKey, const CCDummyApplicationHandle& aValue) + { + return aValue.iUid == *aKey; + } + +void CCDummyApplicationHandle::BringToForeground() + { + SendMessage(1); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/t_oomharness.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/t_oomharness.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,1715 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// Include Files + +#include "t_oomharness.h" +#include "CDummyApplicationHandle.h" +#include "cleanuputils.h" +#include "t_oomdummyplugin_properties.h" +#include +#include +#include // Console +#include +#include +#include +#include +#include "t_oomdummyplugin_properties.h" +#include "../../t_oomdummyapp/inc/t_oomdummyappmsgs.h" + + +// Constants + +_LIT(KTextConsoleTitle, "Console"); +_LIT(KTextFailed, " failed, leave code = %d"); +_LIT(KTextPressAnyKey, " [press any key]\n"); + +const TInt KOomLowMemoryThreshold = 4096; +const TInt KOomJustUnderLowMemoryThreshold = 4000; +const TInt KOomSignificantlyUnderLowMemoryThreshold = 2024; +const TInt KOomJustAboveGoodMemoryThreshold = 5100; +const TInt KOomHarnessInitialEatenMemory = 1024; // Just eat 1K of memory initially, this can grow later + +const TInt KOomTestFirstIdlePeriod = 40000000; // 40 seconds + +const TInt KOomHarnessMaxEatenMemory = 64 * 1024 * 1024; + +// Global Variables + +LOCAL_D CConsoleBase* console; // write all messages to this + + +void COomTestHarness::StartL() + { + ResetL(); + + TInt err = KErrNone; + TBool testsFailed = EFalse; + + err = AppCloseTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = AppCloseIdleTimeTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = PluginTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + + err = PluginTest2L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = AppPluginTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = AppPluginIdleTimeTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = OptionalAllocationTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = OptionalAllocationTest2L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = OptionalAllocationTest3L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = PluginV2Test1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = ForcePriorityCheck1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = PluginSyncModeTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = NeverCloseTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = OptionalAllocationAsyncTest1L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = OptionalAllocationAsyncTest2L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + + err = OptionalAllocationAsyncTest3L(); + if (err != KErrNone) + testsFailed = ETrue; + + ResetL(); + +// if (err == KErrNone) +// err = BusyApplicationTest1L(); + + ResetL(); + +// if (err == KErrNone) +// err = NormalPriorityApplicationTest1L(); + + if (!testsFailed) + console->Printf(_L("All tests passed\n")); + else + console->Printf(_L("Tests failed\n")); + } + +// Test normal application closure for a single app +// Start three applications +// The lowest priority app should be in the foregound +// ... with the next lowest behind it +// ... followed by the highest priority application at the back +// The middle and highest priority application should be configured to eat 5MB of memory +// A low memory event is triggered and the middle application only should be closed +TInt COomTestHarness::AppCloseTest1L() + { + // The lowest priority app should be in the foregound + // ... with the next lowest behind it + // ... followed by the highest priority application at the back + StartApplicationL(0x101f8599, 5 * 1024); // P9 app + StartApplicationL(0x10005901, 5 * 1024); // P8 app, configure it to eat 5MB + StartApplicationL(0x10005a22, 0); // P7 app + + BringAppToForeground(0x10005a22); + + Settle(); + + // Go significantly under the low memory threshold + EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold); + + Settle(); + + TInt err = KErrNone; + + // The P8 application should be closed + err = AppIsRunning(0x10005901, EFalse); + + // The P7 app should still be running because it was in the foreground + if (err == KErrNone) + err = AppIsRunning(0x10005a22, ETrue); + + // The P9 app should still be running because the P8 application freed enough memory + if (err == KErrNone) + err = AppIsRunning(0x101f8599, ETrue); + + if (err == KErrNone) + console->Printf(_L("App Close Test 1 passed\n")); + else + console->Printf(_L("App Close Test 1 failed\n")); + + return err; + + } + +// Tests the idle time rule mechanism for app closure +// Start three applications +// The lowest priority app should be in the foregound +// ... with the next lowest behind it +// ... followed by the highest priority application at the back +// After an idle period the highest priority app is configured to become the lowest priority +// The middle and highest application should be configured to eat 5MB of memory +// A low memory event is triggered and the middle application only should be closed +// Note that this test should be the same as AppCloseTest1L, with the exception of the idle period which causes different apps to be closed +TInt COomTestHarness::AppCloseIdleTimeTest1L() + { + // The lowest priority app should be in the foregound + // ... with the next lowest behind it + // ... followed by the highest priority application at the back + StartApplicationL(0x101f8599, 5 * 1024); // P9 app (which becomes a P2 app after the idle time) + StartApplicationL(0x10005901, 5 * 1024); // P8 app, configure it to eat 5MB + StartApplicationL(0x10005a22, 0); // P7 app + + BringAppToForeground(0x10005a22); + + Settle(); + + // Wait for the first set of idle time rules to apply + User::After(KOomTestFirstIdlePeriod); + + // Go significantly under the low memory threshold + EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold); + + Settle(); + + // The first two system plugins should have been closed, releasing the required memory + // The following two system plugins won't be called (the app plugins will now take their place) + TInt err = KErrNone; + + // The P9 app should have become a P2 app after the idle period, therefore it should have been the first candidate for closure + if (err == KErrNone) + err = AppIsRunning(0x101f8599, EFalse); + + // The P8 application should still be running because the P9 app (that has become a P2 app) has freed the required memory + err = AppIsRunning(0x10005901, ETrue); + + // The P7 app should still be running because it was in the foreground + if (err == KErrNone) + err = AppIsRunning(0x10005a22, ETrue); + + if (err == KErrNone) + console->Printf(_L("App Close Idle Time Test 1 passed\n")); + else + console->Printf(_L("App Close Idle Time Test 1 failed\n")); + + return err; + + } + + + +TInt COomTestHarness::PluginTest1L() + { + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + + Settle(); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + // The first four system plugins should have been run, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + TInt err = KErrNone; + + err = PluginFreeRamCalledL(KUidOOMDummyPluginFirstImplementation, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(KUidOOMDummyPluginFirstImplementation + 1, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(KUidOOMDummyPluginFirstImplementation + 2, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3C, ETrue); + + + // Finally check that the plugins have been notified of the final good memory state + if (err == KErrNone) + err = PluginMemoryGoodCalledL(KUidOOMDummyPluginFirstImplementation, ETrue); + + if (err == KErrNone) + err = PluginMemoryGoodCalledL(KUidOOMDummyPluginFirstImplementation + 1, ETrue); + + if (err == KErrNone) + err = PluginMemoryGoodCalledL(KUidOOMDummyPluginFirstImplementation + 2, ETrue); + + if (err == KErrNone) + err = PluginMemoryGoodCalledL(0x10286A3C, ETrue); + + if (err == KErrNone) + console->Printf(_L("Plugin Test 1 passed\n")); + else + console->Printf(_L("Plugin Test 1 failed\n")); + + return err; + } + + +// Test application plugins +// Start two target apps +// Simulate a low memory event +// The one of the application plugins should now be run, displacing one of the system plugins +// The target apps are of sufficiently high priority that they will not be closed +TInt COomTestHarness::PluginTest2L() + { + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(0x10005901, 0); + StartApplicationL(0x10005a22, 0); + StartApplicationL(0x101f8599, 0); + + BringAppToForeground(0x101f8599); + + Settle(); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + // The first two system plugins should have been closed, releasing the required memory + // The following two system plugins won't be called (the app plugins will now take their place) + TInt err = KErrNone; + + // The following plugins should be called... + // Application plugins: 10286A3A 10286A3B + // System plugins: 10286A3C(v2 plugin) 10286A34 + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3A, ETrue); + + // Plugins and apps with higher priorities will not be called/closed because 0x10286A3A is configured to check memory before running anything else + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3C, EFalse); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A34, EFalse); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A35, EFalse); + + if (err == KErrNone) + err = AppIsRunning(0x10005a22, ETrue); + + if (err == KErrNone) + err = AppIsRunning(0x10005901, ETrue); + + if (err == KErrNone) + err = AppIsRunning(0x101f8599, ETrue); + + + if (err == KErrNone) + console->Printf(_L("Plugin Test 2 passed\n")); + else + console->Printf(_L("Plugin Test 2 failed\n")); + + return err; + + } + + + +// Test that the aBytesRequested is correctly passed to the FreeMemory function of V2 plugins +// Initialise P4 plugin to consume 5MB of memory +// No other plugins are configured to release memory +// Simulate a low memory event (go just below the low threshold) +// Check that the P4 plugin has been called +// Check that the P4 plugin has received a request for > 500K and less than <1500K +TInt COomTestHarness::PluginV2Test1L() + { + // Configure the P4 V2 plugin to eat 5MB: + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3C), 0, 0x500000, 0x500000)); + + Settle(); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + // The first four system plugins should have been closed, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + TInt err = KErrNone; + + // Check that the P4 plugin has been called + err = PluginFreeRamCalledL(0x10286A3C, ETrue); + + // Check that the request for memory was about right + // Note: regular system variation makes it impossible to test for an exact number + TInt requestedMemory = 0; + err = RProperty::Get(KUidOomPropertyCategory, 0x10286A3C + KOOMDummyPluginBytesRequested, requestedMemory); + if ((requestedMemory < 512 * 1024) + || (requestedMemory > 1500 * 1024)) + err = KErrGeneral; + + // Check that the higher priority V2 plugin has not been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3D, EFalse); + + if (err == KErrNone) + console->Printf(_L("Plugin V2 Test 1 passed\n")); + else + console->Printf(_L("Plugin V2 Test 1 failed\n")); + + return err; + } + + +// Test simple prioritisation of application plugins +// Start two target applications +// Configure all plugins to consume 0.5MB +// Simulate a low memory event +// Some of the low priority app plugins with those target applications should be called +// The highest priority app with that target application should not be called (the lower priority plugins should free enough memory) +TInt COomTestHarness::AppPluginTest1L() + { + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(0x10005901, 0); + StartApplicationL(0x10005a22, 0); + StartApplicationL(0x101f8599, 0); + + TInt err = KErrNone; + + // Check that all of the apps are running + if (err == KErrNone) + err = AppIsRunning(0x10005901, ETrue); + + if (err == KErrNone) + err = AppIsRunning(0x10005a22, ETrue); + + if (err == KErrNone) + err = AppIsRunning(0x101f8599, ETrue); + + if (err == KErrNone) + console->Printf(_L("Apps started\n")); + else + console->Printf(_L("Apps not started\n")); + + + + BringAppToForeground(0x101f8599); + + Settle(); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + // The following application plugins should be called... + // Application plugins: 10286A3A 10286A3B + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3A, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + // The following plugin should not be called because other plugins (including some unchecked system plugins) have freed enough memory + // 10286A38 + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A38, EFalse); + + if (err == KErrNone) + console->Printf(_L("App Plugin Test 1 passed\n")); + else + console->Printf(_L("App Plugin Test 1 failed\n")); + + return err; + + } + +// Test simple prioritisation of application plugins +// Start two target applications +// Configure all plugins to consume 0.5MB +// The app plugin with the highest priority is configured to be assigned the lowest priority after an idle time +// Wait until the idle time rule applies +// Simulate a low memory event +// The plugin that initially had the highest priority (but now has the lowest priority) should be called +// Note that this test should be the same as AppPluginTest1L with the addition of the idle period +TInt COomTestHarness::AppPluginIdleTimeTest1L() + { + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(0x10005901, 0); + StartApplicationL(0x10005a22, 0); + StartApplicationL(0x101f8599, 0); + + BringAppToForeground(0x101f8599); + + TInt err = KErrNone; + + Settle(); + + User::After(KOomTestFirstIdlePeriod); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + // The following application plugins should be called... + // Application plugins: 10286A3A 10286A3B + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3A, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + // The following plugin should also be called (its priority was initially too high but has been reduced after the idle time) + // 10286A38 + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A38, ETrue); + + if (err == KErrNone) + console->Printf(_L("Plugin Idle Time Test 1 passed\n")); + else + console->Printf(_L("Plugin Idle Time Test 1 failed\n")); + + return err; + + } + + +// Test the optional allocation mechanism +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 12MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed freeing the required memory +TInt COomTestHarness::OptionalAllocationTest1L() + { + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 12MB of RAM + StartApplicationL(0x10005A22, 12 * 1024); + StartApplicationL(0x101F8599, 0); + + BringAppToForeground(0x101F8599); + + Settle(); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + Settle(); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + TInt bytesAvailable; + TInt err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 10 * 1024 * 1024, 0x10286A37, bytesAvailable); + + // Check that all system plugins below P8 have been called + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A34, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A35, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A36, ETrue); + + // This the P8 system plugin has not been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A37, EFalse); + + // Check that the low priority app plugin has been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + // Check that the P7 application has been closed + if (err == KErrNone) + err = AppIsRunning(0x10005A22, EFalse); + + if (err == KErrNone) + console->Printf(_L("Optional Allocation Test 1 passed\n")); + else + console->Printf(_L("Optional Allocation Test 1 failed\n")); + + + return err; + } + + +// Test the optional allocation mechanism - minimum requested RAM behaviour - successful request +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 5MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed freeing the required minimum amount memory +// The returned available memory should be about 5MB ( > 3MB and < 7MB ) +TInt COomTestHarness::OptionalAllocationTest2L() + { + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 5MB of RAM + StartApplicationL(0x10005A22, 5 * 1024); + StartApplicationL(0x101F8599, 0); + + BringAppToForeground(0x101F8599); + + Settle(); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + Settle(); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + // Say that 5MB is the minimum we need + TInt bytesAvailable; + TInt err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + + if (err == KErrNone) + { + // Check that the reported bytes available is > 3MB and < 7MB + if ((bytesAvailable < 3 * 1024 * 1024) + || (bytesAvailable > 7 * 1024 * 1024)) + { + err = KErrGeneral; + } + } + + // Check that all system plugins below P8 have been called + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A34, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A35, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A36, ETrue); + + // This the P8 system plugin has not been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A37, EFalse); + + // Check that the low priority app plugin has been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + // Check that the P7 application has been closed + if (err == KErrNone) + err = AppIsRunning(0x10005A22, EFalse); + + if (err == KErrNone) + console->Printf(_L("Optional Allocation Test 2 passed\n")); + else + console->Printf(_L("Optional Allocation Test 2 failed\n")); + + + return err; + } + + + +// Test the optional allocation mechanism - minimum requested RAM behaviour - failed request +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 3MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed but it won't free enough memory +// The optional allocation should fail with KErrNoMemory +TInt COomTestHarness::OptionalAllocationTest3L() + { + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 5MB of RAM + StartApplicationL(0x10005A22, 3 * 1024); + StartApplicationL(0x101F8599, 0); + + BringAppToForeground(0x101F8599); + + Settle(); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + Settle(); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + // Say that 5MB is the minimum we need + TInt bytesAvailable; + TInt err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + + // We expect an error because it has not been possible to free the minimum memory + if (err == KErrNoMemory) + { + err = KErrNone; + } + else + { + err = KErrGeneral; + } + + // Check that all system plugins below P8 have been called + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A34, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A35, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A36, ETrue); + + // This the P8 system plugin has not been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A37, EFalse); + + // Check that the low priority app plugin has been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + // Check that the P7 application has been closed + if (err == KErrNone) + err = AppIsRunning(0x10005A22, EFalse); + + if (err == KErrNone) + console->Printf(_L("Optional Allocation Test 3 passed\n")); + else + console->Printf(_L("Optional Allocation Test 3 failed\n")); + + + return err; + } + + +// Test that force priority check applies (only) to selected priorities +// Setup three plugins (priorities 7, 8 & 9)to eat 5MB each +// The configuration file should force a check after priority 8 +// Drop just under the low threshold +// Plugins P7 & P8 should be called (P8 is called even though the P7 plugin freed enough memory) +// Plugin P9 should not be called because enou +TInt COomTestHarness::ForcePriorityCheck1L() + { + // Configure the P7, P8 and P9 plugins to eat 5MB each: + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A36), 0, 0x500000, 0x500000)); // P7 + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A37), 0, 0x500000, 0x500000)); // P8 + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3D), 0, 0x500000, 0x500000)); // P9 + + Settle(); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + TInt err = KErrNone; + + // The P7 plugin should have been called and is the first to release RAM + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A36, ETrue); + + // The P8 plugin should be called even though the P7 plugin has already released enough memory because the plugin runs in continue mode and there is no forced check + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A37, ETrue); + + // The P9 plugin should not be called because of the force priority check (the P7 & P8 plugins have already released plenty of RAM) + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3D, EFalse); + + if (err == KErrNone) + console->Printf(_L("Force Prioirty Check Test 1 passed\n")); + else + console->Printf(_L("Force Prioirty Check Test 1 failed\n")); + + return err; + + } + + + +// Test the Busy API on the OOM server +// Start three applications +// Ensure that the lowest priority app is not in the foreground +// Call the busy API on the OOM monitor for the lowest priority app +// Simulate a low memory event by going just under the low threshold +// The busy application should not be closed +// The other (non-foreground) application should be closed +TInt COomTestHarness::BusyApplicationTest1L() + { + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(0x10005901, 0); + StartApplicationL(0x101f8599, 0); + StartApplicationL(0x10005a22, 0); // Lowest priority app + + BringAppToForeground(0x101f8599); // TODO: this doesn't seem to be working - message not getting through to the dummy application + + Settle(); + + // Send the second app a message to make itself busy + TInt id = iApps.Find(TUid::Uid(0x10005a22), CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + iApps[id]->SendMessage(KOomDummyAppSetBusy); + + Settle(); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + // The first four system plugins should have been closed, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + TInt err = KErrNone; + + // Check that the busy application is still running + if (err == KErrNone) + err = AppIsRunning(0x10005a22, ETrue); + + // Check that the higher priority but non-busy application has been close + if (err == KErrNone) + err = AppIsRunning(0x10005901, EFalse); + + if (err == KErrNone) + console->Printf(_L("Busy Application Test 1 passed\n")); + else + console->Printf(_L("Busy Application Test 1 failed\n")); + + return err; + } + + +// Test the NotBusy API on the OOM server +// Start three applications +// Ensure that the lowest priority app is not in the foreground +// Call the busy API on the OOM monitor for the lowest priority app +// Then call the not-busy API on the OOM monitor for the lowest priority app +// Simulate a low memory event by going just under the low threshold +// The lowest priority app should be closed (because it is no longer busy) +TInt COomTestHarness::NormalPriorityApplicationTest1L() + { + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(0x10005901, 0); + StartApplicationL(0x10005a22, 0); // Lowest priority app + StartApplicationL(0x101f8599, 0); + + BringAppToForeground(0x101f8599); + + Settle(); + + // Send the second app a message to make itself busy + TInt id = iApps.Find(TUid::Uid(0x10005a22), CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + // TODO: temp removed - needs to be put back +// iApps[id]->SendMessage(KOomDummyAppSetBusy); + + // Send the second app a message to make itself normal priority + id = iApps.Find(TUid::Uid(0x10005a22), CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + iApps[id]->SendMessage(KOomDummyAppSetNormalPriority); + + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + // The first four system plugins should have been closed, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + TInt err = KErrNone; + + // Check that the no-longer-busy application has been closed + if (err == KErrNone) + err = AppIsRunning(0x10005a22, EFalse); + + if (err == KErrNone) + console->Printf(_L("Normal Priority Application Test 1 passed\n")); + else + console->Printf(_L("Normal Priority Application Test 2 failed\n")); + + return err; + } + + + +// Start three applications +// One is set to NEVER_CLOSE, one is low priority, one is a dummy app to ensure that the first two are not in the foreground +// Configure applications not to release any memory +// Go just significantly under the low memory threshold +// Wait for the system to recover, if we have moved above the low memory threshold then go significantly under it again. Repeat this step until we no longer go above low. +// Check that the low priority application is closed +// Check that the NEVER_CLOSE application is not closed (even though we're still below the low theshold) +TInt COomTestHarness::NeverCloseTest1L() + { + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(0x10005a22, 0); // Lowest priority app + StartApplicationL(0x10008d39, 0); // NEVER_CLOSE application + StartApplicationL(0x101f8599, 0); + + BringAppToForeground(0x101f8599); + + Settle(); + + EatMemoryUntilWeAreStuckUnderTheLowThresholdL(); + + Settle(); + + // The first four system plugins should have been closed, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + TInt err = KErrNone; + + // The NEVER_CLOSE app should still be running (even though we are still below the low threshold) + if (err == KErrNone) + err = AppIsRunning(0x10008d39, ETrue); + + // The low priority app should still be closed (even though we are still below the low threshold) + if (err == KErrNone) + err = AppIsRunning(0x10005a22, EFalse); + + if (err == KErrNone) + console->Printf(_L("Never Close Test 1 passed\n")); + else + console->Printf(_L("Never Close Test 2 failed\n")); + + return err; + } + + + + + +// Test that sync mode configuration is working for system plugins +// Configure three system plugins to release 5MB of memory each. +// The plugins are configured as follows +// Plugin 1: Priority 7, sync mode continue +// Plugin 2: Priority 8, sync mode check +// Plugin 3: Priority 9, sync mode continue +// Drop just under the low threshold +// Plugins 1 & 2 should be called (even though plugin 1 alone has freed enough RAM) +// Plugin 3 won't be called because the check on the priority 8 plugin discovers that enough RAM has been freed +TInt COomTestHarness::PluginSyncModeTest1L() + { + // Configure three plugins to eat 5MB each: + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A36), 0, 0x500000, 0x500000)); + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A37), 0, 0x500000, 0x500000)); + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3D), 0, 0x500000, 0x500000)); + + Settle(); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + Settle(); + + // The first four system plugins should have been run, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + TInt err = KErrNone; + + // Check that the first two plugins have been called, but not the third + err = PluginFreeRamCalledL(0x10286A36, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A37, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3D, EFalse); + + if (err == KErrNone) + console->Printf(_L("Plugin Sync Mode Test 1 passed\n")); + else + console->Printf(_L("Plugin Sync Mode Test 1 failed\n")); + + return err; + } + + + + +// Test the optional allocation mechanism +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 12MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed freeing the required memory +TInt COomTestHarness::OptionalAllocationAsyncTest1L() + { + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 12MB of RAM + StartApplicationL(0x10005A22, 12 * 1024); + StartApplicationL(0x101F8599, 0); + + BringAppToForeground(0x101F8599); + + Settle(); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + Settle(); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + TInt bytesAvailable; + TInt err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 10 * 1024 * 1024, 0x10286A37, bytesAvailable); + + // Check that all system plugins below P8 have been called + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A34, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A35, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A36, ETrue); + + // This the P8 system plugin has not been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A37, EFalse); + + // Check that the low priority app plugin has been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + // Check that the P7 application has been closed + if (err == KErrNone) + err = AppIsRunning(0x10005A22, EFalse); + + if (err == KErrNone) + console->Printf(_L("Optional Allocation (Async) Test 1 passed\n")); + else + console->Printf(_L("Optional Allocation (Async) Test 1 failed\n")); + + + return err; + } + + +// Test the optional allocation mechanism - minimum requested RAM behaviour - successful request +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 5MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed freeing the required minimum amount memory +// The returned available memory should be about 5MB ( > 3MB and < 7MB ) +TInt COomTestHarness::OptionalAllocationAsyncTest2L() + { + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 5MB of RAM + StartApplicationL(0x10005A22, 5 * 1024); + StartApplicationL(0x101F8599, 0); + + BringAppToForeground(0x101F8599); + + Settle(); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + Settle(); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + // Say that 5MB is the minimum we need + TInt bytesAvailable; + TInt err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + + if (err == KErrNone) + { + // Check that the reported bytes available is > 3MB and < 7MB + if ((bytesAvailable < 3 * 1024 * 1024) + || (bytesAvailable > 7 * 1024 * 1024)) + { + err = KErrGeneral; + } + } + + // Check that all system plugins below P8 have been called + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A34, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A35, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A36, ETrue); + + // This the P8 system plugin has not been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A37, EFalse); + + // Check that the low priority app plugin has been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + // Check that the P7 application has been closed + if (err == KErrNone) + err = AppIsRunning(0x10005A22, EFalse); + + if (err == KErrNone) + console->Printf(_L("Optional Allocation (Async) Test 2 passed\n")); + else + console->Printf(_L("Optional Allocation (Async) Test 2 failed\n")); + + + return err; + } + + + +// Test the optional allocation mechanism - minimum requested RAM behaviour - failed request +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 3MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed but it won't free enough memory +// The optional allocation should fail with KErrNoMemory +TInt COomTestHarness::OptionalAllocationAsyncTest3L() + { + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 5MB of RAM + StartApplicationL(0x10005A22, 3 * 1024); + StartApplicationL(0x101F8599, 0); + + BringAppToForeground(0x101F8599); + + Settle(); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + Settle(); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + // Say that 5MB is the minimum we need + TInt bytesAvailable; + TInt err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + + // We expect an error because it has not been possible to free the minimum memory + if (err == KErrNoMemory) + { + err = KErrNone; + } + else + { + err = KErrGeneral; + } + + // Check that all system plugins below P8 have been called + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A34, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A35, ETrue); + + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A36, ETrue); + + // This the P8 system plugin has not been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A37, EFalse); + + // Check that the low priority app plugin has been called + if (err == KErrNone) + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + + // Check that the P7 application has been closed + if (err == KErrNone) + err = AppIsRunning(0x10005A22, EFalse); + + if (err == KErrNone) + console->Printf(_L("Optional Allocation (Async) Test 3 passed\n")); + else + console->Printf(_L("Optional Allocation (Async) Test 3 failed\n")); + + + return err; + } + + + + +////////////////////////////////////////////////////////////////////////////// + + +TInt COomTestHarness::BringAppToForeground(TInt32 aUid) + { + //bring app to foreground + TInt id = iApps.Find(TUid::Uid(aUid), CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + iApps[id]->BringToForeground(); + User::After(KSettlingTime); + } + + +COomTestHarness* COomTestHarness::NewLC() + { + COomTestHarness* self = new (ELeave) COomTestHarness(); + CleanupStack::PushL(self); + self->ConstructL(); + return self; + } + +void COomTestHarness::ConstructL() + { + User::LeaveIfError(iAllocServer.Connect()); + User::LeaveIfError(iOomSession.Connect()); + + User::LeaveIfError(iChunk.CreateLocal(KOomHarnessInitialEatenMemory, KOomHarnessMaxEatenMemory)); + iChunkSize = KOomHarnessInitialEatenMemory; + + ResetL(); + } + + +COomTestHarness::~COomTestHarness() + { + iApps.ResetAndDestroy(); + iAllocServer.Close(); + iChunk.Close(); + iPluginCallCounts.Close(); + } + + +void COomTestHarness::ResetL() + { + Settle(); + + // Close any dummy apps + iApps.ResetAndDestroy(); + + Settle(); + + // Free all memory being eaten by the server + iChunk.Adjust(KOomHarnessInitialEatenMemory); // Just eat 1K of memory initially, this can grow later + iChunkSize = KOomHarnessInitialEatenMemory; + + User::LeaveIfError(iAllocServer.Reset()); + + // Wait for the system to settle before getting the call counts (freeing the memory could cause some more movement). + Settle(); + + // Update the call counts on the plugins (add them if they're not there already) + for (TInt pluginUid = KUidOOMDummyPluginFirstImplementation; pluginUid <= KUidOOMDummyPluginLastImplementation; pluginUid++) + { + TInt lowMemoryCount = 0; + RProperty::Get(KUidOomPropertyCategory, pluginUid + KOOMDummyPluginLowMemoryCount, lowMemoryCount); + + TInt goodMemoryCallCount = 0; + RProperty::Get(KUidOomPropertyCategory, pluginUid + KOOMDummyPluginGoodMemoryCount, goodMemoryCallCount); + + TPluginCallCount pluginCallCount; + pluginCallCount.iFreeRamCallCount = lowMemoryCount; + pluginCallCount.iMemoryGoodCallCount = goodMemoryCallCount; + + iPluginCallCounts.InsertL(pluginUid, pluginCallCount); + }; + } + +void COomTestHarness::EatMemoryL(TInt aKBytesToLeaveFree) + { + Settle(); + + TMemoryInfoV1Buf meminfo; + UserHal::MemoryInfo(meminfo); + TInt freeMem = meminfo().iFreeRamInBytes; + + // Resize the dummy chunk to consume the correct ammount of memory + iChunkSize = freeMem + iChunkSize - (aKBytesToLeaveFree * 1024); + TInt err = iChunk.Adjust(iChunkSize); + User::LeaveIfError(err); + } + +// Set up the plugins and applications - this is the starting point for many test cases +// 5 applications are started with approx 0.5 MB used for each +// 0.5MB (approx) of memory is reserved for each one of the plugins +void COomTestHarness::CommonSetUpL() + { + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + } + +void COomTestHarness::StartApplicationL(TInt32 aUid, TInt aInitialAllocationInKBs) + { + User::ResetInactivityTime(); + CCDummyApplicationHandle *app = CCDummyApplicationHandle::NewLC(TUid::Uid(aUid), aInitialAllocationInKBs * 1024); + iApps.AppendL(app); + CleanupStack::Pop(app); + Settle(); + } + +// Returns KErrNone if we get the expected result +TInt COomTestHarness::AppIsRunning(TInt32 aUid, TBool aExpectedResult) + { + TBool appRunning = ETrue; + + TInt id = iApps.Find(TUid::Uid(aUid), CCDummyApplicationHandle::CompareTo); + if (id < 0) + appRunning = EFalse; + else if(iApps[id]->Process().ExitType() != EExitPending) + appRunning = EFalse; + + TInt err = KErrNone; + + if (aExpectedResult != appRunning) + err = KErrGeneral; + + if (aExpectedResult != appRunning) + { + console->Printf(_L("Application running state not as expected %x \n"), aUid); + err = KErrGeneral; + } + + return err; + } + + +// Utility function which calls the async version of optional RAM request and makes it behave like the sync version +TInt COomTestHarness::RequestOptionalRamASyncWrapper(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable) + { + TInt err = KErrNone; + TRequestStatus status; + iOomSession.RequestOptionalRam(aBytesRequested, aMinimumBytesNeeded, aPluginId, status); + User::WaitForRequest(status); + + if (status.Int() < 0) + err = status.Int(); + else + aBytesAvailable = status.Int(); + + return err; + } + + +TInt COomTestHarness::GetFreeMemory() + { + User::CompressAllHeaps(); + + TInt current = 0; + HAL::Get( HALData::EMemoryRAMFree, current ); + + return current; + } + +// Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)? +// Returns KErrNone if we get the expected result +TInt COomTestHarness::PluginFreeRamCalledL(TInt32 aUid, TBool aExpectedResult) + { + TInt newLowMemoryCount = 0; + TInt err = RProperty::Get(KUidOomPropertyCategory, aUid + KOOMDummyPluginLowMemoryCount, newLowMemoryCount); + + if (err != KErrNone) + console->Printf(_L("Unable to get plugin FreeRam count\n")); + + TBool freeRamHasBeenCalledOnPlugin = EFalse; + TPluginCallCount* pluginCallCount = iPluginCallCounts.Find(aUid); + + if (pluginCallCount) + { + freeRamHasBeenCalledOnPlugin = (pluginCallCount->iFreeRamCallCount != newLowMemoryCount); + + if (freeRamHasBeenCalledOnPlugin) + { + // Update the list of old counts with the current value so we can see if it has changed next time this function is called + pluginCallCount->iFreeRamCallCount = newLowMemoryCount; + iPluginCallCounts.InsertL(aUid, *pluginCallCount); + } + } + else + { + console->Printf(_L("Unable to find call count.\n")); + err = KErrNotFound; + } + + if (aExpectedResult != freeRamHasBeenCalledOnPlugin) + { + console->Printf(_L("Plugin FreeRam count not as expected %x \n"), aUid); + err = KErrGeneral; + } + + return err; + } + +// Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)? +// Returns KErrNone if we get the expected result +TInt COomTestHarness::PluginMemoryGoodCalledL(TInt32 aUid, TBool aExpectedResult) + { + TInt newGoodMemoryCount = 0; + RProperty::Get(KUidOomPropertyCategory, aUid + KOOMDummyPluginGoodMemoryCount, newGoodMemoryCount); + + TBool memoryGoodHasBeenCalledOnPlugin = EFalse; + TPluginCallCount* pluginCallCount = iPluginCallCounts.Find(aUid); + + if (pluginCallCount) + { + memoryGoodHasBeenCalledOnPlugin = (pluginCallCount->iMemoryGoodCallCount != newGoodMemoryCount); + + if (memoryGoodHasBeenCalledOnPlugin) + { + // Update the list of old counts with the current value so we can see if it has changed next time this function is called + pluginCallCount->iMemoryGoodCallCount = newGoodMemoryCount; + iPluginCallCounts.InsertL(aUid, *pluginCallCount); + } + } + + TInt err = KErrNone; + + if (aExpectedResult != memoryGoodHasBeenCalledOnPlugin) + err = KErrGeneral; + + return err; + } + +void COomTestHarness::EatMemoryUntilWeAreStuckUnderTheLowThresholdL() + { + while (ETrue) + { + // Go significantly under the low memory threshold + EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold); + Settle(); + // If we are still under the memory threshold then the OOM monitor has not been able to recover, + // so our job here is done... + if (GetFreeMemory() < (KOomLowMemoryThreshold * 1024)) + break; + + // If memory has been released to take us above the low memory threshold then go again... + } + } + + +COomTestHarness::COomTestHarness() + { + // TODO + } + + +// Local Functions +LOCAL_C void MainL() + { + COomTestHarness* testHarness = COomTestHarness::NewLC(); + + testHarness->StartL(); + + CleanupStack::PopAndDestroy(testHarness); + } + +// Local Functions +LOCAL_C void OldMainL() + { + // + // add your program code here, example code below + // + const TInt implementations(KUidOOMDummyPluginLastImplementation-KUidOOMDummyPluginFirstImplementation+1); + TInt initialLowCount[implementations]; + TInt initialGoodCount[implementations]; + TInt finalLowCount[implementations]; + TInt finalGoodCount[implementations]; + TInt tmp; + TBuf<80> line; + TBool pass = ETrue; + ROOMAllocSession allocServer; + TMemoryInfoV1Buf meminfo; + //connect to alloc server + User::LeaveIfError(allocServer.Connect()); + CleanupClosePushL(allocServer); + //configure alloc server + User::LeaveIfError(allocServer.Reset()); +/* User::LeaveIfError(allocServer.Configure(TUid::Uid(KUidOOMDummyPluginFirstImplementation), 0x100000, 0x1000, 0x400000)); + User::LeaveIfError(allocServer.Configure(TUid::Uid(KUidOOMDummyPluginFirstImplementation+3), 0x100000, 0x1000, 0x400000)); + User::LeaveIfError(allocServer.StartAllocating()); + for(TInt i=0;i<5;i++) + { + UserHal::MemoryInfo(meminfo); + console->Printf(_L("free mem %d"), meminfo().iFreeRamInBytes); + User::After(1000000); + }*/ + //create dummy apps (note app with that UID *must* exist or apparc won't allow contruction due to missing app_reg.rsc) + RPointerArray apps; + CleanupResetAndDestroyPushL(apps); + CCDummyApplicationHandle *app = CCDummyApplicationHandle::NewLC(KUidCalendar, 0x100000); + apps.AppendL(app); + CleanupStack::Pop(app); + app = CCDummyApplicationHandle::NewLC(KUidClock, 0x100000); + apps.AppendL(app); + CleanupStack::Pop(app); + app = CCDummyApplicationHandle::NewLC(KUidAbout, 0x100000); + apps.AppendL(app); + CleanupStack::Pop(app); + + //wait for oom system to settle + User::After(KSettlingTime); + + //verify apps started OK + for(TInt i=0;iProcess().ExitType() != EExitPending) + { + pass = EFalse; + console->Printf(_L("app %x not running (status %d)\n"),apps[i]->Uid().iUid,apps[i]->Process().ExitType()); + } + } + + //bring calendar to foreground + TInt id = apps.Find(KUidCalendar, CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + apps[id]->BringToForeground(); + User::After(KSettlingTime); + + //eat memory to invoke low memory handler + UserHal::MemoryInfo(meminfo); + TInt freeMem = meminfo().iFreeRamInBytes; + TAny *ptr = User::Alloc(freeMem - 247 * 1024); + CleanupStack::PushL(ptr); + + //wait for oom system to settle + User::After(KSettlingTime); + + //verify some apps were closed + for(TInt i=0;iProcess().ExitType() != EExitPending) + { + console->Printf(_L("app %x not running (status %d)\n"),apps[i]->Uid().iUid,apps[i]->Process().ExitType()); + } + else + { + console->Printf(_L("app %x still running\n"),apps[i]->Uid().iUid); + } + } + + //release memory to invoke good memory handler + CleanupStack::PopAndDestroy(ptr); + + //wait for oom system to settle + User::After(KSettlingTime); + +/* console->Write(_L("Initial Counts\n")); + for(TInt id=0;idWrite(line); + } + //check status of dummy apps + User::After(2000000); + line.Format(_L("app1 %d app2 %d\n"), app1.ExitType(), app2.ExitType()); + console->Write(line); + if(app1.ExitType() != EExitPending || app2.ExitType() != EExitPending) pass = EFalse; + if(pass) + console->Write(_L("verdict: pass")); + else + console->Write(_L("verdict: fail")); + console->Getch(); + + UserHal::MemoryInfo(meminfo); + TInt freeMem = meminfo().iFreeRamInBytes; + TAny *ptr = User::Alloc(freeMem - 260000); + CleanupStack::PushL(ptr); + console->Write(_L("Counts after alloc\n")); + for(TInt id=0;idWrite(line); + if(finalLowCount[id] - initialLowCount[id] != 1) pass = EFalse; + } + //check status of dummy apps + User::After(2000000); + line.Format(_L("app1 %d app2 %d\n"), app1.ExitType(), app2.ExitType()); + console->Write(line); + if(app1.ExitType() == EExitPending || app2.ExitType() == EExitPending) pass = EFalse; + if(pass) + console->Write(_L("verdict: pass")); + else + console->Write(_L("verdict: fail")); + console->Getch(); + CleanupStack::PopAndDestroy(ptr); + console->Write(_L("Counts after free\n")); + for(TInt id=0;idWrite(line); + if(finalGoodCount[id] - initialGoodCount[id] != 1) pass = EFalse; + } + //check status of dummy apps + User::After(2000000); + line.Format(_L("app1 %d app2 %d\n"), app1.ExitType(), app2.ExitType()); + console->Write(line); + if(app1.ExitType() == EExitPending || app2.ExitType() == EExitPending) pass = EFalse;*/ + if(pass) + console->Write(_L("verdict: pass")); + else + console->Write(_L("verdict: fail")); + console->Getch(); + allocServer.Reset(); + CleanupStack::PopAndDestroy(2);//apps, allocServer + } + +LOCAL_C void DoStartL() + { + // Create active scheduler (to run active objects) + CActiveScheduler* scheduler = new (ELeave) CActiveScheduler(); + CleanupStack::PushL(scheduler); + CActiveScheduler::Install(scheduler); + + MainL(); + + // Delete active scheduler + CleanupStack::PopAndDestroy(scheduler); + } + +// Global Functions + +GLDEF_C TInt E32Main() + { + // Create cleanup stack + __UHEAP_MARK; + CTrapCleanup* cleanup = CTrapCleanup::New(); + + // Create output console + TRAPD(createError, console = Console::NewL(KTextConsoleTitle, TSize( + KConsFullScreen, KConsFullScreen))); + if (createError) + return createError; + + // Run application code inside TRAP harness, wait keypress when terminated + TRAPD(mainError, DoStartL()); + if (mainError) + console->Printf(KTextFailed, mainError); + console->Printf(KTextPressAnyKey); + console->Getch(); + + delete console; + delete cleanup; + __UHEAP_MARKEND; + return KErrNone; + } + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/BWINS/t_oomharness_stifu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/BWINS/t_oomharness_stifu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,3 @@ +EXPORTS + ?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * LibEntryL(void) + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/EABI/t_oomharness_stifu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/EABI/t_oomharness_stifu.def Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,3 @@ +EXPORTS + _Z9LibEntryLv @ 1 NONAME + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +PRJ_PLATFORMS +// specify the platforms your component needs to be built for here +// defaults to WINS MARM so you can ignore this if you just build these +DEFAULT + +PRJ_TESTEXPORTS + +PRJ_TESTMMPFILES +t_oomharness_stif.mmp + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/t_oomharness_stif.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/t_oomharness_stif.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,54 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include + +//uncomment to enable tests which require CLIENT_REQUEST_QUEUE +macro CLIENT_REQUEST_QUEUE + +TARGET t_oomharness_stif.dll +TARGETTYPE dll +// First UID is DLL UID, Second UID is STIF Test Framework UID +UID 0x1000008D 0x101FB3E7 + +VENDORID VID_DEFAULT + +CAPABILITY ALL -TCB + +// This is a SYSTEMINCLUDE macro containing the middleware +// layer specific include directories +MW_LAYER_SYSTEMINCLUDE + +USERINCLUDE ../inc +USERINCLUDE ../../inc + + +SOURCEPATH ../src +SOURCE t_oomharness.cpp +SOURCE t_oomharnessCases.cpp +SOURCE CDummyApplicationHandle.cpp + +LIBRARY euser.lib +LIBRARY stiftestinterface.lib +LIBRARY stiftestengine.lib +LIBRARY t_oomclient.lib +LIBRARY hal.lib +LIBRARY oommonitor.lib + diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/CDummyApplicationHandle.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/CDummyApplicationHandle.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,94 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef CDUMMYAPPLICATIONHANDLE_H +#define CDUMMYAPPLICATIONHANDLE_H + +// INCLUDES +#include +#include +#include + +// a few uids...use appuidlister to extract from the app_reg.rsc files +// and mappings to uids not used by tests anymore +const TInt KOomTestAppUid = 0xE6CFBA01; // 0x101f8599 +const TInt KOomTestApp2Uid = 0xE6CFBA02; // 0x10005901 +const TInt KOomTestApp3Uid = 0xE6CFBA03; // 0x10005a22 +const TInt KOomTestApp4Uid = 0xE6CFBA04; // 0x101f4cd5 +const TInt KOomTestApp5Uid = 0xE6CFBA05; // 0x10005234 +const TInt KOomTestApp6Uid = 0xE6CFBA06; // 0x10207218 +const TInt KOomTestApp7Uid = 0xE6CFBA07; // 0x10008d39 +const TInt KOomTestApp8Uid = 0xE6CFBA08; // 0x10005903 +const TInt KOomTestApp9Uid = 0xE6CFBA09; // 0x101f4cce +const TInt KOomTestApp10Uid = 0xE6CFBA0A; // 0x101f4cd2 + +// CLASS DECLARATION + +/** + * CCDummyApplicationHandle + * A helper class for launching dummy apps and checking their status + */ +NONSHARABLE_CLASS ( CCDummyApplicationHandle ) : public CBase + { +public: + // Constructors and destructor + + /** + * Destructor. + */ + ~CCDummyApplicationHandle(); + + /** + * Two-phased constructor. + */ + static CCDummyApplicationHandle* NewL(TUid aUid, TInt aExtraMemoryAllocation = 0); + + /** + * Two-phased constructor. + */ + static CCDummyApplicationHandle* NewLC(TUid aUid, TInt aExtraMemoryAllocation = 0); + + inline RProcess& Process() { return iProcess; } + inline const TUid& Uid() { return iUid; } + + void SendMessage(TInt aMessage); + + void BringToForeground(); + + static TBool CompareTo(const TUid* aKey, const CCDummyApplicationHandle& aValue); +private: + + /** + * Constructor for performing 1st stage construction + */ + CCDummyApplicationHandle(TUid aUid); + + /** + * EPOC default constructor for performing 2nd stage construction + */ + void ConstructL(TInt aExtraMemoryAllocation = 0); + + RProcess iProcess; + //a channel for sending control messages to the dummy app... + RMsgQueue iMsgQueue; + TUid iUid; + }; + +#endif // CDUMMYAPPLICATIONHANDLE_H diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/t_oomharness.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/t_oomharness.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,681 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +#ifndef T_OOMHARNESS_H +#define T_OOMHARNESS_H + +// INCLUDES +#include "StifTestModule.h" +#include +#include +#include +#include "CDummyApplicationHandle.h" +#include "t_oomclient.h" +#include +#include + +// CONSTANTS + +const TInt KSettlingTime = 2000000; +const TInt KOomHarnessInitialEatenMemory= 1024; // Just eat 1K of memory initially, this can grow later +const TInt KOomHarnessMaxEatenMemory = 64 * 1024 * 1024; + +const TInt KTimeout = 20000000; //20 secs + +enum TTestStates + { + // EInit: Test initialisation phase + ETestInit, + + // EPossiblePass: In the case of memorymonitor reporting EAboveTreshhold + ETestAbove, + + // EFail: All other cases including timeout + ETestBelow, + + ETestTimeout + }; + +// MACROS +// None + +// Logging path +_LIT( KT_OomHarnessLogPath, "\\logs\\testframework\\T_OomHarness\\" ); +// Log file +_LIT( KT_OomHarnessLogFile, "T_OomHarness.txt" ); +_LIT( KT_OomHarnessLogFileWithTitle, "T_OomHarness_[%S].txt" ); + +// Function pointer related internal definitions +// Rounding known bug in GCC +#define GETPTR & +#define ENTRY(str,func) {_S(str), GETPTR func,0,0,0} +#define FUNCENTRY(func) {_S(#func), GETPTR func,0,0,0} +#define OOM_ENTRY(str,func,a,b,c) {_S(str), GETPTR func,a,b,c} +#define OOM_FUNCENTRY(func,a,b,c) {_S(#func), GETPTR func,a,b,c} + +// FUNCTION PROTOTYPES +// None + +// FORWARD DECLARATIONS +class COomTestHarness; +class CMemoryMonitorStatusWatcher; +class CMemoryMonitorTimeoutWatcher; + +// DATA TYPES +// None + +// A typedef for function that does the actual testing, +// function is a type +// TInt COomTestHarness:: ( TTestResult& aResult ) +typedef TInt (COomTestHarness::* TestFunction)(TTestResult&); + +// CLASS DECLARATION + +/** +* An internal structure containing a test case name and +* the pointer to function doing the test +* +* @lib ?library +* @since ?Series60_version +*/ +class TCaseInfoInternal + { + public: + const TText* iCaseName; + TestFunction iMethod; + TBool iIsOOMTest; + TInt iFirstMemoryAllocation; + TInt iLastMemoryAllocation; + }; + +// CLASS DECLARATION + +/** +* A structure containing a test case name and +* the pointer to function doing the test +* +* @lib ?library +* @since ?Series60_version +*/ +class TCaseInfo + { + public: + TPtrC iCaseName; + TestFunction iMethod; + TBool iIsOOMTest; + TInt iFirstMemoryAllocation; + TInt iLastMemoryAllocation; + + TCaseInfo( const TText* a ) : iCaseName( (TText*) a ) + { + }; + + }; + +// CLASS DECLARATION + +/** +* This a T_OomHarness class. +* ?other_description_lines +* +* @lib ?library +* @since ?Series60_version +*/ +NONSHARABLE_CLASS(COomTestHarness) : public CTestModuleBase + { + public: // Constructors and destructor + + + /** + * Two-phased constructor. + */ + static COomTestHarness* NewL(); + + /** + * Destructor. + */ + virtual ~COomTestHarness(); + + public: // New functions + // None + + public: // Functions from base classes + + /** + * From CTestModuleBase InitL is used to initialize the + * T_OomHarness. It is called once for every instance of + * TestModule T_OomHarness after its creation. + * @since ?Series60_version + * @param aIniFile Initialization file for the test module (optional) + * @param aFirstTime Flag is true when InitL is executed for first + * created instance of T_OomHarness. + * @return Symbian OS error code + */ + TInt InitL( TFileName& aIniFile, TBool aFirstTime ); + + /** + * From CTestModuleBase GetTestCasesL is used to inquiry test cases + * from T_OomHarness. + * @since ?Series60_version + * @param aTestCaseFile Test case file (optional) + * @param aTestCases Array of TestCases returned to test framework + * @return Symbian OS error code + */ + TInt GetTestCasesL( const TFileName& aTestCaseFile, + RPointerArray& aTestCases ); + + /** + * From CTestModuleBase RunTestCaseL is used to run an individual + * test case. + * @since ?Series60_version + * @param aCaseNumber Test case number + * @param aTestCaseFile Test case file (optional) + * @param aResult Test case result returned to test framework (PASS/FAIL) + * @return Symbian OS error code (test case execution error, which is + * not reported in aResult parameter as test case failure). + */ + TInt RunTestCaseL( const TInt aCaseNumber, + const TFileName& aTestCaseFile, + TTestResult& aResult ); + + /** + * From CTestModuleBase; OOMTestQueryL is used to specify is particular + * test case going to be executed using OOM conditions + * @param aTestCaseFile Test case file (optional) + * @param aCaseNumber Test case number (optional) + * @param aFailureType OOM failure type (optional) + * @param aFirstMemFailure The first heap memory allocation failure value (optional) + * @param aLastMemFailure The last heap memory allocation failure value (optional) + * @return TBool + */ + virtual TBool OOMTestQueryL( const TFileName& /* aTestCaseFile */, + const TInt /* aCaseNumber */, + TOOMFailureType& aFailureType, + TInt& /* aFirstMemFailure */, + TInt& /* aLastMemFailure */ ); + + /** + * From CTestModuleBase; OOMTestInitializeL may be used to initialize OOM + * test environment + * @param aTestCaseFile Test case file (optional) + * @param aCaseNumber Test case number (optional) + * @return None + */ + virtual void OOMTestInitializeL( const TFileName& /* aTestCaseFile */, + const TInt /* aCaseNumber */ ); + /** + * From CTestModuleBase; OOMTestFinalizeL may be used to finalize OOM + * test environment + * @param aTestCaseFile Test case file (optional) + * @param aCaseNumber Test case number (optional) + * @return None + */ + virtual void OOMTestFinalizeL( const TFileName& /* aTestCaseFile */, + const TInt /* aCaseNumber */ ); + + /** + * From CTestModuleBase; OOMHandleWarningL + * @param aTestCaseFile Test case file (optional) + * @param aCaseNumber Test case number (optional) + * @param aFailNextValue FailNextValue for OOM test execution (optional) + * @return None + */ + virtual void OOMHandleWarningL( const TFileName& /* aTestCaseFile */, + const TInt /* aCaseNumber */, + TInt& /* aFailNextValue */); + void AllocateMemoryL(TInt aKBytes); + + protected: // New functions + // None + + protected: // Functions from base classes + // None + + private: + + /** + * C++ default constructor. + */ + COomTestHarness(); + + /** + * By default Symbian 2nd phase constructor is private. + */ + void ConstructL(); + + // Prohibit copy constructor if not deriving from CBase. + // ?classname( const ?classname& ); + // Prohibit assigment operator if not deriving from CBase. + // ?classname& operator=( const ?classname& ); + + /** + * Function returning test case name and pointer to test case function. + * @since ?Series60_version + * @param aCaseNumber test case number + * @return TCaseInfo + */ + const TCaseInfo Case ( const TInt aCaseNumber ) const; + + // Test setup functions... + + // Close any dummy apps + // Free all memory being eaten by the server + // Update the call counts on the plugins (add them if they're not there already) + void ResetL(); + + void EatMemoryL(TInt aKBytesToLeaveFree); + + // Set up the plugins and applications - this is the starting point for many test cases + // 5 applications are started with approx 1 MB used for each + // 1MB (approx) of memory is reserved for each one of the plugins + void CommonSetUpL(); + + void StartApplicationL(TInt32 aUid, TInt aInitialAllocationInKBs); + + // Results checking functions... + + // Returns KErrNone if we get the expected result + TInt AppIsRunning(TInt32 aUid, TBool aExpectedResult); + + // Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)? + // Returns KErrNone if we get the expected result + TInt PluginFreeRamCalledL(TInt32 aUid, TBool aExpectedResult); + + // Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)? + // Returns KErrNone if we get the expected result + TInt PluginMemoryGoodCalledL(TInt32 aUid, TBool aExpectedResult); + + // Utility functions + + // Wait a while for the system to settle down + inline void Settle(); + + void BringAppToForeground(TInt32 aUid); + + + TInt GetFreeMemory(); + + // Utility function which calls the async version of optional RAM request and makes it behave like the sync version + TInt RequestOptionalRamASyncWrapper(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable); + + // Utility function which starts the memory monitor property watcher. + // The watcher stops the active scheduler when the monitor status changes + void StartMemoryMonitorStatusWatcher(TInt& aTestState); + + // Utility function which starts the timeout watcher and the active scheduler + // The watcher stops the active scheduler when the monitor status changes + // This function also cancels any pending requests when we are done + void StartTimerAndRunWatcher(TInt& aTestState); + + // The tests... + + // Test normal application closure for a single app + // Start three applications + // The lowest priority app should be in the foregound + // ... with the next lowest behind it + // ... followed by the highest priority application at the back + // The middle application should be configured to eat 5MB of memory + // A low memory event is triggered and the middle application only should be closed + TInt AppCloseTest1L(TTestResult& aResult); + + // Tests the idle time rule mechanism for app closure + // Start three applications + // The lowest priority app should be in the foregound + // ... with the next lowest behind it + // ... followed by the highest priority application at the back + // After an idle period the highest priority app is configured to become the lowest priority + // The middle and highest application should be configured to eat 5MB of memory + // A low memory event is triggered and the middle application only should be closed + // Note that this test should be the same as AppCloseTest1L, with the exception of the idle period which causes different apps to be closed + TInt AppCloseIdleTimeTest1L(TTestResult& aResult); + + //Tests the that window group z order is considered when closing apps. + //Start 3 apps of equal priority, ensuring their z order is known + //Starts another lower priority app and puts that in the foreground + //A low memory event is triggered such that only one app needs to be closed + //The closed app should be the one furthest from the foreground in the z order + TInt AppCloseEqualPrioritiesL(TTestResult& aResult); + + // Test system plugins and continue mode + // Simulate a low memory event + // Two system plugins should free enough memory, but four will be run because they work in "continue" mode + TInt PluginTest1L(TTestResult& aResult); + + // Test application plugins + // Start two target apps + // Simulate a low memory event + // The one of the application plugins should now be run, displacing one of the system plugins + // The target apps are of sufficiently high priority that they will not be closed + TInt PluginTest2L(TTestResult& aResult); + + // Test that the aBytesRequested is correctly passed to the FreeMemory function of V2 plugins + // Initialise P4 plugin to consume 5MB of memory + // No other plugins are configured to release memory + // Simulate a low memory event (go just below the low threshold) + // Check that the P4 plugin has been called + // Check that the P4 plugin has received a request for > 500K and less than <1500K + TInt PluginV2Test1L(TTestResult& aResult); + + // Test simple prioritisation of application plugins + // Start two target applications + // Configure all plugins to consume 0.5MB + // Simulate a low memory event + // Some of the low priority app plugins with those target applications should be called + // The highest priority app with that target application should not be called (the lower priority plugins should free enough memory) + TInt AppPluginTest1L(TTestResult& aResult); + + // Test simple prioritisation of application plugins + // Start two target applications + // Configure all plugins to consume 0.5MB + // The app plugin with the highest priority is configured to be assigned the lowest priority after an idle time + // Wait until the idle time rule applies + // Simulate a low memory event + // The plugin that initially had the highest priority (but now has the lowest priority) should be called + // Note that this test should be the same as AppPluginTest1L with the addition of the idle period + TInt AppPluginIdleTimeTest1L(TTestResult& aResult); + + // Test idle time handling for plugins + // Start two target apps + // Simulate a low memory event + // The one of the application plugins should now be run, displacing one of the system plugins + // The target apps are of sufficiently high priority that they will not be closed + TInt PluginIdleTimeTest2L(TTestResult& aResult); + + // Test the optional allocation mechanism + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 12MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just below the good memory level + // Request an optional allocation of 10MB referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed freeing the required memory + TInt OptionalAllocationTest1L(TTestResult& aResult); + + + // Test the optional allocation mechanism - minimum requested RAM behaviour - successful request + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 5MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just above the good memory level + // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed freeing the required minimum amount memory + // The returned available memory should be about 5MB ( > 3MB and < 7MB ) + TInt OptionalAllocationTest2L(TTestResult& aResult); + + // Test the optional allocation mechanism - minimum requested RAM behaviour - failed request + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 3MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just above the good memory level + // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed but it won't free enough memory + // The optional allocation should fail with KErrNoMemory + TInt OptionalAllocationTest3L(TTestResult& aResult); + + + // Test that force priority check applies (only) to selected priorities + // Setup three plugins (priorities 7, 8 & 9)to eat 5MB each + // The configuration file should force a check after priority 8 + // Drop just under the low threshold + // Plugins P7 & P8 should be called (P8 is called even though the P7 plugin freed enough memory) + // Plugin P9 should not be called because enou + TInt ForcePriorityCheck1L(TTestResult& aResult); + + // Test the Busy API on the OOM server + // Start three applications + // Ensure that the lowest priority app is not in the foreground + // Call the busy API on the OOM monitor for the lowest priority app + // Simulate a low memory event by going just under the low threshold + // The busy application should not be closed + // The other (non-foreground) application should be closed + TInt BusyApplicationTest1L(TTestResult& aResult); + + // Test the Normal-priority API on the OOM server + // Start three applications + // Ensure that the lowest priority app is not in the foreground + // Call the busy API on the OOM monitor for the lowest priority app + // Then call the not-busy API on the OOM monitor for the lowest priority app + // Simulate a low memory event by going just under the low threshold + // The lowest priority app should be closed (because it is no longer busy) + TInt NormalPriorityApplicationTest1L(TTestResult& aResult); + + // Test the async optional allocation mechanism + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 12MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just below the good memory level + // Request an optional allocation of 10MB referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed freeing the required memory + TInt OptionalAllocationAsyncTest1L(TTestResult& aResult); + + + // Test the async optional allocation mechanism - minimum requested RAM behaviour - successful request + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 5MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just above the good memory level + // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed freeing the required minimum amount memory + // The returned available memory should be about 5MB ( > 3MB and < 7MB ) + TInt OptionalAllocationAsyncTest2L(TTestResult& aResult); + + // Test the async optional allocation mechanism - minimum requested RAM behaviour - failed request + // Configure the plugins not to release any RAM when FreeRam is called + // Configure one priority 7 application to release 3MB when FreeRam is called + // Start this application (plus another one so it isn't in the foreground) + // Drop just above the good memory level + // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin + // All of the plugins below P8 should be called + // The P7 application should be closed but it won't free enough memory + // The optional allocation should fail with KErrNoMemory + TInt OptionalAllocationAsyncTest3L(TTestResult& aResult); + + // Test that sync mode configuration is working for system plugins + // Configure three system plugins to release 5MB of memory each. + // The plugins are configured as follows + // Plugin 1: Priority 7, sync mode continue + // Plugin 2: Priority 8, sync mode check + // Plugin 3: Priority 9, sync mode continue + // Drop just under the low threshold + // Plugins 1 & 2 should be called (even though plugin 1 alone has freed enough RAM) + // Plugin 3 won't be called because the check on the priority 8 plugin discovers that enough RAM has been freed + TInt PluginSyncModeTest1L(TTestResult& aResult); + + + // Start three applications + // One is set to NEVER_CLOSE, one is low priority, one is a dummy app to ensure that the first two are not in the foreground + // Configure applications not to release any memory + // Go just significantly under the low memory threshold + // Wait for the system to recover, if we have moved above the low memory threshold then go significantly under it again. Repeat this step until we no longer go above low. + // Check that the low priority application is closed + // Check that the NEVER_CLOSE application is not closed (even though we're still below the low theshold) + TInt NeverCloseTest1L(TTestResult& aResult); + + TInt AppCloseTwoSessionsL(TTestResult& aResult); + + TInt CallIfTargetAppNotRunningTest1L(TTestResult& aResult); + + TInt AppCloseSpecificThresholdTest1L(TTestResult& aResult); + + // test that the plugins are left in the off state if a request for optional RAM + // cannot be granted + TInt PluginTestInsufficientMemoryFreedL(TTestResult& aResult); + + // test that the plugins are left in the off state if a request for optional RAM + // cannot be granted + // The test makes the optional RAM call from a state where memory is between the + // global low and good thresholds + TInt PluginTestInsufficientMemoryFreed2L(TTestResult& aResult); + + + public: // Data + // None + + protected: // Data + // None + + private: // Data + // Pointer to test (function) to be executed + TestFunction iMethod; + + // Pointer to logger + CStifLogger * iLog; + + // Normal logger + CStifLogger* iStdLog; + + // Test case logger + CStifLogger* iTCLog; + + // Flag saying if test case title should be added to log file name + TBool iAddTestCaseTitleToLogName; + + // ?one_line_short_description_of_data + //?data_declaration; + + // Reserved pointer for future extension + //TAny* iReserved; + + struct TPluginCallCount + { + TInt iFreeRamCallCount; + TInt iMemoryGoodCallCount; + }; + + RHashMap iPluginCallCounts; + + RPointerArray iApps; + + ROOMAllocSession iAllocServer; + + RChunk iChunk; + TInt iChunkSize; + + RChunk iDummyChunk; + TInt iDummyChunkSize; + + ROomMonitorSession iOomSession; + + //CActiveScheduler needed by the memory monitor watchers + CActiveScheduler* iScheduler; + + //The watchers + CMemoryMonitorStatusWatcher* iStatusWatcher; + CMemoryMonitorTimeoutWatcher* iTimeoutWatcher; + + + public: // Friend classes + // None + + protected: // Friend classes + // None + + private: // Friend classes + // None + + }; + +/** +* This CMemoryMonitorStatusWatcher class signals a client if the memorymonitor status becomes different from EFreeingMemory. +* ?other_description_lines +* +* @lib ?library +* @since ?Series60_version +*/ +NONSHARABLE_CLASS(CMemoryMonitorStatusWatcher) : public CActive + { + public: + static CMemoryMonitorStatusWatcher* NewL(); + ~CMemoryMonitorStatusWatcher(); + void Start(TInt* aWatcherState); + private: + CMemoryMonitorStatusWatcher(); + void ConstructL(); + void DoCancel(); + void RunL(); + private: + RProperty iMonitorProperty; + TInt* iTestState; + }; + +/** +* This CMemoryMonitorTimeoutWatcher class signals a client if the memorymonitor takes too long to leave EFreeingMemory state. +* ?other_description_lines +* +* @lib ?library +* @since ?Series60_version +*/ +NONSHARABLE_CLASS(CMemoryMonitorTimeoutWatcher) : public CTimer + { +public: + static CMemoryMonitorTimeoutWatcher* NewL(); + ~CMemoryMonitorTimeoutWatcher(); + void Start(TInt* aTestState, const TTimeIntervalMicroSeconds32& aTimeout); + +private: + CMemoryMonitorTimeoutWatcher(); + void ConstructL(); + void DoCancel(); + void RunL(); +private: + TInt* iTestState; + }; + +struct TReturnStatus + { + TInt iId; + TBool iCompleted; + TInt iReturnStatus; + }; + + +NONSHARABLE_CLASS(CAsyncRequester) : public CActive + { +public: + static CAsyncRequester* NewL(RChunk aChunk, TInt aChunkSize); + ~CAsyncRequester(); + void Start(TInt aBytesToRequest, TReturnStatus* aReturnStatus); + +private: + CAsyncRequester(RChunk aChunk, TInt aChunkSize); + void ConstructL(); + void DoCancel(); + void RunL(); +private: + ROomMonitorSession iSession; + TReturnStatus* iReturnStatus; + RChunk iChunk; + TInt iChunkSize; + }; + + + +inline void COomTestHarness::Settle() + { + //wait for oom system to settle + User::After(TTimeIntervalMicroSeconds32(KSettlingTime)); + } + +#endif // T_OOMHARNESS_H + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/CDummyApplicationHandle.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/CDummyApplicationHandle.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,78 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include +#include "CDummyApplicationHandle.h" + +CCDummyApplicationHandle::CCDummyApplicationHandle(TUid aUid) +: iUid(aUid) + { + // No implementation required + } + +CCDummyApplicationHandle::~CCDummyApplicationHandle() + { + if(iMsgQueue.Handle()) + { + iMsgQueue.SendBlocking(0); + iMsgQueue.Close(); + } + iProcess.Close(); + } + +CCDummyApplicationHandle* CCDummyApplicationHandle::NewLC(TUid aUid, TInt aExtraMemoryAllocation) + { + CCDummyApplicationHandle* self = new (ELeave) CCDummyApplicationHandle(aUid); + CleanupStack::PushL(self); + self->ConstructL(aExtraMemoryAllocation); + return self; + } + +CCDummyApplicationHandle* CCDummyApplicationHandle::NewL(TUid aUid, TInt aExtraMemoryAllocation) + { + CCDummyApplicationHandle* self = CCDummyApplicationHandle::NewLC(aUid, aExtraMemoryAllocation); + CleanupStack::Pop(); // self; + return self; + } + +void CCDummyApplicationHandle::ConstructL(TInt aExtraMemoryAllocation) + { + TBuf<28> params; + params.Format(_L("uid=%08x alloc=%x"), iUid, aExtraMemoryAllocation); + User::LeaveIfError(iProcess.Create(_L("t_oomdummyapp_0xE6CFBA00.exe"), params)); + User::LeaveIfError(iMsgQueue.CreateGlobal(KNullDesC, 4)); + User::LeaveIfError(iProcess.SetParameter(15, iMsgQueue)); + iProcess.Resume(); + } + +void CCDummyApplicationHandle::SendMessage(TInt aMessage) + { + iMsgQueue.SendBlocking(aMessage); + } + +TBool CCDummyApplicationHandle::CompareTo(const TUid* aKey, const CCDummyApplicationHandle& aValue) + { + return aValue.iUid == *aKey; + } + +void CCDummyApplicationHandle::BringToForeground() + { + SendMessage(1); + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharness.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharness.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,584 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +// INCLUDE FILES +#include +#include "t_oomharness.h" +#include +#include "SettingServerClient.h" +#include + +// EXTERNAL DATA STRUCTURES +// None + +// EXTERNAL FUNCTION PROTOTYPES +// None + +// CONSTANTS +// None + +// MACROS +// None + +// LOCAL CONSTANTS AND MACROS +// None + +// MODULE DATA STRUCTURES +// None + +// LOCAL FUNCTION PROTOTYPES +// None + +// FORWARD DECLARATIONS +// None + +// ==================== LOCAL FUNCTIONS ======================================= + + +/* +------------------------------------------------------------------------------- + + DESCRIPTION + + This file (t_oomharness.cpp) contains all test framework related parts of + this test module. Actual test cases are implemented in file + t_oomharnesscases.cpp. + + COomTestHarness is an example of test module implementation. This example + uses hard coded test cases (i.e it does not have any test case + configuration file). + + Example uses function pointers to call test cases. This provides an easy + method to add new test cases. + + See function Cases in file t_oomharnesscases.cpp for instructions how to + add new test cases. It is not necessary to modify this file when adding + new test cases. + + To take this module into use, add following lines to test framework + initialisation file: + +# t_oomharness_stif +[New_Module] +ModuleName= t_oomharness_stif +[End_Module] + +------------------------------------------------------------------------------- +*/ + +// ================= MEMBER FUNCTIONS ========================================= + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: COomTestHarness + + Description: C++ default constructor can NOT contain any code, that + might leave. + + Parameters: None + + Return Values: None + + Errors/Exceptions: None + + Status: Approved + +------------------------------------------------------------------------------- +*/ +COomTestHarness::COomTestHarness() + { + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: ConstructL + + Description: Symbian 2nd phase constructor that can leave. + + Note: If OOM test case uses STIF Logger, then STIF Logger must be created + with static buffer size parameter (aStaticBufferSize). Otherwise Logger + allocates memory from heap and therefore causes error situations with OOM + testing. For more information about STIF Logger construction, see STIF + Users Guide. + + Parameters: None + + Return Values: None + + Errors/Exceptions: None + + Status: Approved + +------------------------------------------------------------------------------- +*/ +void COomTestHarness::ConstructL() + { + //Read logger settings to check whether test case name is to be + //appended to log file name. + RSettingServer settingServer; + TInt ret = settingServer.Connect(); + if(ret != KErrNone) + { + User::Leave(ret); + } + // Struct to StifLogger settigs. + TLoggerSettings loggerSettings; + // Parse StifLogger defaults from STIF initialization file. + ret = settingServer.GetLoggerSettings(loggerSettings); + if(ret != KErrNone) + { + User::Leave(ret); + } + // Close Setting server session + settingServer.Close(); + iAddTestCaseTitleToLogName = loggerSettings.iAddTestCaseTitle; + + // Constructing static buffer size logger, needed with OOM testing because + // normally logger allocates memory from heap! + iStdLog = CStifLogger::NewL( KT_OomHarnessLogPath, + KT_OomHarnessLogFile, + CStifLogger::ETxt, + CStifLogger::EFile, + ETrue, + ETrue, + ETrue, + EFalse, + ETrue, + EFalse, + 100 ); + iLog = iStdLog; + + // Sample how to use logging + _LIT( KLogInfo, "t_oomharness logging starts!" ); + iLog->Log( KLogInfo ); + + User::LeaveIfError(iAllocServer.Connect()); + User::LeaveIfError(iOomSession.Connect()); + + User::LeaveIfError(iChunk.CreateLocal(KOomHarnessInitialEatenMemory, KOomHarnessMaxEatenMemory)); + iChunkSize = KOomHarnessInitialEatenMemory; + + iScheduler = new (ELeave) CActiveScheduler; + CActiveScheduler::Install( iScheduler ); + + iStatusWatcher = CMemoryMonitorStatusWatcher::NewL(); + iTimeoutWatcher = CMemoryMonitorTimeoutWatcher::NewL(); + + ResetL(); + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: NewL + + Description: Two-phased constructor. Constructs new COomTestHarness + instance and returns pointer to it. + + Parameters: None + + Return Values: COomTestHarness*: new object. + + Errors/Exceptions: Leaves if memory allocation fails or ConstructL leaves. + + Status: Approved + +------------------------------------------------------------------------------- +*/ +COomTestHarness* COomTestHarness::NewL() + { + COomTestHarness* self = new (ELeave) COomTestHarness; + + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop(); + + return self; + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: ~COomTestHarness + + Description: Destructor. + + Parameters: None + + Return Values: None + + Errors/Exceptions: None + + Status: Approved + +------------------------------------------------------------------------------- +*/ +COomTestHarness::~COomTestHarness() + { + iLog = NULL; + delete iStdLog; + iStdLog = NULL; + delete iTCLog; + iTCLog = NULL; + iApps.ResetAndDestroy(); + iAllocServer.Close(); + iChunk.Close(); + iPluginCallCounts.Close(); + delete iScheduler; + delete iStatusWatcher; + delete iTimeoutWatcher; + } + +/* +------------------------------------------------------------------------------- + Class: COomTestHarness + + Method: InitL + + Description: Method for test case initialization + + Parameters: None + + Return Values: None + + Errors/Exceptions: None + + Status: Approved +------------------------------------------------------------------------------- +*/ +TInt COomTestHarness::InitL( TFileName& /*aIniFile*/, + TBool /*aFirstTime*/ ) + { + return KErrNone; + + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: GetTestCases + + Description: GetTestCases is used to inquire test cases + from the test module. Because this test module has hard coded test cases + (i.e cases are not read from file), paramter aConfigFile is not used. + + This function loops through all cases defined in Cases() function and + adds corresponding items to aTestCases array. + + Parameters: const TFileName& : in: Configuration file name. Not used + RPointerArray& aTestCases: out: + Array of TestCases. + + Return Values: KErrNone: No error + + Errors/Exceptions: Function leaves if any memory allocation operation fails + + Status: Proposal + +------------------------------------------------------------------------------- +*/ +TInt COomTestHarness::GetTestCasesL( const TFileName& /*aConfig*/, + RPointerArray& aTestCases ) + { + // Loop through all test cases and create new + // TTestCaseInfo items and append items to aTestCase array + for( TInt i = 0; Case(i).iMethod != NULL; i++ ) + { + // Allocate new TTestCaseInfo from heap for a testcase definition. + TTestCaseInfo* newCase = new( ELeave ) TTestCaseInfo(); + + // PushL TTestCaseInfo to CleanupStack. + CleanupStack::PushL( newCase ); + + // Set number for the testcase. + // When the testcase is run, this comes as a parameter to RunTestCaseL. + newCase->iCaseNumber = i; + + // Set title for the test case. This is shown in UI to user. + newCase->iTitle.Copy( Case(i).iCaseName ); + + // Append TTestCaseInfo to the testcase array. After appended + // successfully the TTestCaseInfo object is owned (and freed) + // by the TestServer. + User::LeaveIfError(aTestCases.Append ( newCase ) ); + + // Pop TTestCaseInfo from the CleanupStack. + CleanupStack::Pop( newCase ); + } + + return KErrNone; + + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: RunTestCase + + Description: Run a specified testcase. + + Function runs a test case specified by test case number. Test case file + parameter is not used. + + If case number is valid, this function runs a test case returned by + function Cases(). + + Parameters: const TInt aCaseNumber: in: Testcase number + const TFileName& : in: Configuration file name. Not used + TTestResult& aResult: out: Testcase result + + Return Values: KErrNone: Testcase ran. + KErrNotFound: Unknown testcase + + Errors/Exceptions: None + + Status: Proposal + +------------------------------------------------------------------------------- +*/ +TInt COomTestHarness::RunTestCaseL( const TInt aCaseNumber, + const TFileName& /* aConfig */, + TTestResult& aResult ) + { + // Return value + TInt execStatus = KErrNone; + + // Get the pointer to test case function + TCaseInfo tmp = Case ( aCaseNumber ); + + _LIT( KLogInfo, "Starting testcase [%S]" ); + iLog->Log( KLogInfo, &tmp.iCaseName); + + // Check that case number was valid + if ( tmp.iMethod != NULL ) + { + //Open new log file with test case title in file name + if(iAddTestCaseTitleToLogName) + { + //delete iLog; //Close currently opened log + //iLog = NULL; + //Delete test case logger if exists + if(iTCLog) + { + delete iTCLog; + iTCLog = NULL; + } + + TFileName logFileName; + TName title; + TestModuleIf().GetTestCaseTitleL(title); + + logFileName.Format(KT_OomHarnessLogFileWithTitle, &title); + + iTCLog = CStifLogger::NewL(KT_OomHarnessLogPath, + logFileName, + CStifLogger::ETxt, + CStifLogger::EFile, + ETrue, + ETrue, + ETrue, + EFalse, + ETrue, + EFalse, + 100); + iLog = iTCLog; + } + + // Valid case was found, call it via function pointer + iMethod = tmp.iMethod; + //execStatus = ( this->*iMethod )( aResult ); + TRAPD(err, execStatus = ( this->*iMethod )( aResult )); + if(iAddTestCaseTitleToLogName) + { + //Restore standard log and destroy test case logger + iLog = iStdLog; + delete iTCLog; //Close currently opened log + iTCLog = NULL; + } + User::LeaveIfError(err); + + } + else + { + // Valid case was not found, return error. + execStatus = KErrNotFound; + } + + // Return case execution status (not the result of the case execution) + return execStatus; + + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: OOMTestQueryL + + Description: Checks test case information for OOM execution. + + Return Values: TBool + + Errors/Exceptions: None + + Status: Proposal + +------------------------------------------------------------------------------- +*/ +TBool COomTestHarness::OOMTestQueryL( const TFileName& /* aTestCaseFile */, + const TInt aCaseNumber, + TOOMFailureType& /* aFailureType */, + TInt& aFirstMemFailure, + TInt& aLastMemFailure ) + { + _LIT( KLogInfo, "COomTestHarness::OOMTestQueryL" ); + iLog->Log( KLogInfo ); + + aFirstMemFailure = Case( aCaseNumber ).iFirstMemoryAllocation; + aLastMemFailure = Case( aCaseNumber ).iLastMemoryAllocation; + + return Case( aCaseNumber ).iIsOOMTest; + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: OOMTestInitializeL + + Description: Used to perform the test environment setup for a particular + OOM test case. Test Modules may use the initialization file to read + parameters for Test Module initialization but they can also have their own + configure file or some other routine to initialize themselves. + + NOTE: User may add implementation for OOM test environment initialization. + Usually no implementation is required. + + Return Values: None + + Errors/Exceptions: None + + Status: Proposal + +------------------------------------------------------------------------------- +*/ +void COomTestHarness::OOMTestInitializeL( const TFileName& /* aTestCaseFile */, + const TInt /* aCaseNumber */ ) + { + _LIT( KLogInfo, "COomTestHarness::OOMTestInitializeL" ); + iLog->Log( KLogInfo ); + + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: OOMHandleWarningL + + Description: Used in OOM testing to provide a way to the derived TestModule + to handle warnings related to non-leaving or TRAPped allocations. + + In some cases the allocation should be skipped, either due to problems in + the OS code or components used by the code being tested, or even inside the + tested components which are implemented this way on purpose (by design), so + it is important to give the tester a way to bypass allocation failures. + + NOTE: User may add implementation for OOM test warning handling. Usually no + implementation is required. + + Return Values: None + + Errors/Exceptions: None + + Status: Proposal + +------------------------------------------------------------------------------- +*/ +void COomTestHarness::OOMHandleWarningL( const TFileName& /* aTestCaseFile */, + const TInt /* aCaseNumber */, + TInt& /* aFailNextValue */ ) + { + _LIT( KLogInfo, "COomTestHarness::OOMHandleWarningL" ); + iLog->Log( KLogInfo ); + + } + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: OOMTestFinalizeL + + Description: Used to perform the test environment cleanup for a particular OOM + test case. + + NOTE: User may add implementation for OOM test environment finalization. + Usually no implementation is required. + + Return Values: None + + Errors/Exceptions: None + + Status: Proposal + +------------------------------------------------------------------------------- +*/ +void COomTestHarness::OOMTestFinalizeL( const TFileName& /* aTestCaseFile */, + const TInt /* aCaseNumber */ ) + { + _LIT( KLogInfo, "COomTestHarness::OOMTestFinalizeL" ); + iLog->Log( KLogInfo ); + + } + +// ========================== OTHER EXPORTED FUNCTIONS ========================= + +// ----------------------------------------------------------------------------- +// LibEntryL is a polymorphic Dll entry point +// Returns: CTestModuleBase*: Pointer to Test Module object +// ----------------------------------------------------------------------------- +// +EXPORT_C CTestModuleBase* LibEntryL() + { + return COomTestHarness::NewL(); + + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharnesscases.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharnesscases.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,3332 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +// INCLUDE FILES +#include //User::HAL +#include //RProperty +#include "t_oomharness.h" +#include "CDummyApplicationHandle.h" +#include "../../t_oomdummyapp/inc/t_oomdummyappmsgs.h" +#include "t_oomdummyplugin_properties.h" +#include + +// EXTERNAL DATA STRUCTURES +// None + +// EXTERNAL FUNCTION PROTOTYPES +// None + +// CONSTANTS +// None + +// MACROS +// None + +// LOCAL CONSTANTS AND MACROS + +const TInt KOomJustUnderLowMemoryThreshold = 4000; +const TInt KOomSignificantlyUnderLowMemoryThreshold = 2024; +const TInt KOomBetweenLowAndGoodThresholds = 4300; +const TInt KOomJustAboveGoodMemoryThreshold = 5100; + +const TInt KOomTestFirstIdlePeriod = 40000000; // 40 seconds + + +// MODULE DATA STRUCTURES +// None + +// LOCAL FUNCTION PROTOTYPES +// None + +// FORWARD DECLARATIONS +// None + +// ==================== LOCAL FUNCTIONS ======================================= + +/* +------------------------------------------------------------------------------- + + DESCRIPTION + + This module contains the implementation of COomTestHarness class + member functions that does the actual tests. + +------------------------------------------------------------------------------- +*/ + +// ============================ MEMBER FUNCTIONS =============================== + +/* +------------------------------------------------------------------------------- + + Class: COomTestHarness + + Method: Case + + Description: Returns a test case by number. + + This function contains an array of all available test cases + i.e pair of case name and test function. If case specified by parameter + aCaseNumber is found from array, then that item is returned. + + The reason for this rather complicated function is to specify all the + test cases only in one place. It is not necessary to understand how + function pointers to class member functions works when adding new test + cases. See function body for instructions how to add new test case. + + Parameters: const TInt aCaseNumber :in: Test case number + + Return Values: const TCaseInfo Struct containing case name & function + + Errors/Exceptions: None + + Status: Proposal + +------------------------------------------------------------------------------- +*/ +const TCaseInfo COomTestHarness::Case ( + const TInt aCaseNumber ) const + { + + /* + * To add new test cases, implement new test case function and add new + * line to KCases array specify the name of the case and the function + * doing the test case + * In practice, do following + * + * 1) Make copy of existing test case function and change its name + * and functionality. Note that the function must be added to + * OOMHard.cpp file and to OOMHard.h + * header file. + * + * 2) Add entry to following KCases array either by using: + * + * 2.1: FUNCENTRY or ENTRY macro + * ENTRY macro takes two parameters: test case name and test case + * function name. + * + * FUNCENTRY macro takes only test case function name as a parameter and + * uses that as a test case name and test case function name. + * + * Or + * + * 2.2: OOM_FUNCENTRY or OOM_ENTRY macro. Note that these macros are used + * only with OOM (Out-Of-Memory) testing! + * + * OOM_ENTRY macro takes five parameters: test case name, test case + * function name, TBool which specifies is method supposed to be run using + * OOM conditions, TInt value for first heap memory allocation failure and + * TInt value for last heap memory allocation failure. + * + * OOM_FUNCENTRY macro takes test case function name as a parameter and uses + * that as a test case name, TBool which specifies is method supposed to be + * run using OOM conditions, TInt value for first heap memory allocation + * failure and TInt value for last heap memory allocation failure. + */ + + static TCaseInfoInternal const KCases[] = + { + // To add new test cases, add new items to this array + + // NOTE: When compiled to GCCE, there must be Classname:: + // declaration in front of the method name, e.g. + // COomTestHarness::PrintTest. Otherwise the compiler + // gives errors. + + ENTRY( "App Close Test 1", COomTestHarness::AppCloseTest1L ), + ENTRY( "App Close Idle Time", COomTestHarness::AppCloseIdleTimeTest1L ), + ENTRY( "App Close Equal Priorities", COomTestHarness::AppCloseEqualPrioritiesL ), + ENTRY( "Plugin Test 1", COomTestHarness::PluginTest1L ), + ENTRY( "Plugin Test 2", COomTestHarness::PluginTest2L ), + ENTRY( "App Plugin Test 1", COomTestHarness::AppPluginTest1L ), + ENTRY( "App Plugin Idle Time Test 1", COomTestHarness::AppPluginIdleTimeTest1L ), + ENTRY( "Optional Allocation Test 1", COomTestHarness::OptionalAllocationTest1L ), + ENTRY( "Optional Allocation Test 2", COomTestHarness::OptionalAllocationTest2L ), + ENTRY( "Optional Allocation Test 3", COomTestHarness::OptionalAllocationTest3L ), + ENTRY( "Plugin V2 Test 1", COomTestHarness::PluginV2Test1L ), + ENTRY( "Force Priority Check Test 1", COomTestHarness::ForcePriorityCheck1L ), + ENTRY( "Plugin Sync Mode Test 1", COomTestHarness::PluginSyncModeTest1L ), + ENTRY( "Never Close Test 1", COomTestHarness::NeverCloseTest1L ), + ENTRY( "Optional Allocation Async Test 1", COomTestHarness::OptionalAllocationAsyncTest1L ), + ENTRY( "Optional Allocation Async Test 2", COomTestHarness::OptionalAllocationAsyncTest2L ), + ENTRY( "Optional Allocation Async Test 3", COomTestHarness::OptionalAllocationAsyncTest3L ), +#ifdef CLIENT_REQUEST_QUEUE + ENTRY( "App Close Two Client Sessions", COomTestHarness::AppCloseTwoSessionsL ), +#endif + ENTRY( "Call If Target App Not Running Test 1", COomTestHarness::CallIfTargetAppNotRunningTest1L ), +#ifdef __WINS__ + ENTRY( "App Close Specific Threshold Test 1", COomTestHarness::AppCloseSpecificThresholdTest1L ), +#endif + ENTRY( "Plugin Test Insufficient Memory Freed", COomTestHarness::PluginTestInsufficientMemoryFreedL ), + ENTRY( "Plugin Test Insufficient Memory Freed 2", COomTestHarness::PluginTestInsufficientMemoryFreed2L ), + }; + + // Verify that case number is valid + if( (TUint) aCaseNumber >= sizeof( KCases ) / + sizeof( TCaseInfoInternal ) ) + { + + // Invalid case, construct empty object + TCaseInfo null( (const TText*) L"" ); + null.iMethod = NULL; + null.iIsOOMTest = EFalse; + null.iFirstMemoryAllocation = 0; + null.iLastMemoryAllocation = 0; + return null; + + } + + // Construct TCaseInfo object and return it + TCaseInfo tmp ( KCases[ aCaseNumber ].iCaseName ); + tmp.iMethod = KCases[ aCaseNumber ].iMethod; + tmp.iIsOOMTest = KCases[ aCaseNumber ].iIsOOMTest; + tmp.iFirstMemoryAllocation = KCases[ aCaseNumber ].iFirstMemoryAllocation; + tmp.iLastMemoryAllocation = KCases[ aCaseNumber ].iLastMemoryAllocation; + return tmp; + + } + +TInt COomTestHarness::AppCloseTest1L(TTestResult& aResult) + { + ResetL(); + + // The lowest priority app should be in the foregound + // ... with the next lowest behind it + // ... followed by the highest priority application at the back + StartApplicationL(KOomTestAppUid, 5 * 1024); // P9 app + StartApplicationL(KOomTestApp2Uid, 5 * 1024); // P8 app, configure it to eat 5MB + StartApplicationL(KOomTestApp3Uid, 0); // P7 app + + BringAppToForeground(KOomTestApp3Uid); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go significantly under the low memory threshold + EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + err = AppIsRunning(KOomTestApp2Uid, EFalse); + + if (err != KErrNone) + { + _LIT( KResult ,"P8 App KOomTestApp2Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp3Uid, ETrue); + if (err != KErrNone) + { + // The P7 app should still be running because it was in the foreground + _LIT( KResult ,"(P7 App KOomTestApp3Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestAppUid, ETrue); + if (err != KErrNone) + { + // The P9 app should still be running because the P8 application freed enough memory + _LIT( KResult ,"P9 App KOomTestAppUid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + ResetL(); + return KErrNone; + } + +// Tests the idle time rule mechanism for app closure +// Start three applications +// The lowest priority app should be in the foregound +// ... with the next lowest behind it +// ... followed by the highest priority application at the back +// After an idle period the highest priority app is configured to become the lowest priority +// The middle and highest application should be configured to eat 5MB of memory +// A low memory event is triggered and the middle application only should be closed +// Note that this test should be the same as AppCloseTest1L, with the exception of the idle period which causes different apps to be closed +TInt COomTestHarness::AppCloseIdleTimeTest1L(TTestResult& aResult) + { + ResetL(); + + // The lowest priority app should be in the foregound + // ... with the next lowest behind it + // ... followed by the highest priority application at the back + StartApplicationL(KOomTestAppUid, 5 * 1024); // P9 app (which becomes a P2 app after the idle time) + StartApplicationL(KOomTestApp2Uid, 5 * 1024); // P8 app, configure it to eat 5MB + StartApplicationL(KOomTestApp3Uid, 0); // P7 app + + BringAppToForeground(KOomTestApp3Uid); + + // Wait for the first set of idle time rules to apply + User::After(KOomTestFirstIdlePeriod); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + StartMemoryMonitorStatusWatcher(memTestState); + + // Go significantly under the low memory threshold + EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + err = AppIsRunning(KOomTestAppUid, EFalse); + + if (err != KErrNone) + { + // The P9 app should have become a P2 app after the idle period, therefore it should have been the first candidate for closure + _LIT( KResult ,"P9->P2 App KOomTestAppUid running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp2Uid, ETrue); + if (err != KErrNone) + { + // The P8 application should still be running because the P9 app (that has become a P2 app) has freed the required memory + _LIT( KResult ,"P8 App KOomTestApp2Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp3Uid, ETrue); + if (err != KErrNone) + { + // The P7 app should still be running because it was in the foreground + _LIT( KResult ,"P7 App KOomTestApp3Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + +TInt COomTestHarness::AppCloseEqualPrioritiesL(TTestResult& aResult) + { + ResetL(); + + StartApplicationL(KOomTestApp4Uid, 3 * 1024); // P7 app1, configure it to eat 5MB + + Settle(); + + StartApplicationL(KOomTestApp3Uid, 3 * 1024); // P7 app2, configure it to eat 5MB + + Settle(); + + StartApplicationL(KOomTestApp5Uid, 3 * 1024); // P7 app3, configure it to eat 5MB + + Settle(); + + StartApplicationL(KOomTestAppUid, 0); //P9 app + + Settle(); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go significantly under the low memory threshold + EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + + if (err == KErrNone && memTestState == ETestAbove) + { + err = AppIsRunning(KOomTestApp4Uid, EFalse); + if (err != KErrNone) + { + // The P7 app furthest to the back in the z order should be closed. + // This should release sufficient memory. + _LIT( KResult ,"P7 App KOomTestApp4Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + // the other 3 apps should all still be running + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp3Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"App KOomTestApp3Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp5Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"App KOomTestApp5Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestAppUid, ETrue); + if (err != KErrNone) + { + // The P9 app should still be running because the P8 application freed enough memory + _LIT( KResult ,"P9 App KOomTestAppUid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +TInt COomTestHarness::PluginTest1L(TTestResult& aResult) + { + ResetL(); + + // Configure the plugins to eat 0.6MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x96000, 0x96000)); + } + //start application so that plugin 0x10286A3A which does the check can be called + StartApplicationL(KOomTestApp2Uid, 0); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + // The first two app plugins should have been run, releasing + // the required memory. The second app plugin to be run - 10286A3A - has a check, + // so no other plugins should have run. + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3A, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3A FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + // These two plugins should not be called + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A38, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A38 FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A34, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A34 FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + // Finally check that the plugins have been notified of the final good memory state + if (err == KErrNone) + { + err = PluginMemoryGoodCalledL(0x10286A3A, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3A MemoryGood not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginMemoryGoodCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B MemoryGood not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginMemoryGoodCalledL(0x10286A34, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A34 MemoryGood incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // MemoryGood should not be called on this plugin because FreeMemory was never called on it + // 10286A38 + err = PluginMemoryGoodCalledL(0x10286A38, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A38 MemoryGood incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +// Test application plugins +// Start two target apps +// Simulate a low memory event +// The one of the application plugins should now be run, displacing one of the system plugins +// The target apps are of sufficiently high priority that they will not be closed +TInt COomTestHarness::PluginTest2L(TTestResult& aResult) + { + ResetL(); + + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(KOomTestApp2Uid, 0); + StartApplicationL(KOomTestApp3Uid, 0); + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + // The first two system plugins should have been closed, releasing the required memory + // The following two system plugins won't be called (the app plugins will now take their place) + + // The following plugins should be called... + // Application plugins: 10286A3A 10286A3B + // System plugins: 10286A3C(v2 plugin) 10286A34 + + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B not called "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3A, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3A not called "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Plugins and apps with higher priorities will not be called/closed because 0x10286A3A is configured to check memory before running anything else + err = PluginFreeRamCalledL(0x10286A3C, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3C incorrectly called "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A34, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A34 incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // The following plugin should also be called (max_batch_size only applies to application closures, not running plugins) + // 10286A35 + err = PluginFreeRamCalledL(0x10286A35, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A35 incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp3Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"App KOomTestApp3Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp2Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"App KOomTestApp2Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = AppIsRunning(KOomTestAppUid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin KOomTestAppUid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + + +// Test that the aBytesRequested is correctly passed to the FreeMemory function of V2 plugins +// Initialise P4 plugin to consume 5MB of memory +// No other plugins are configured to release memory +// Simulate a low memory event (go just below the low threshold) +// Check that the P4 plugin has been called +// Check that the P4 plugin has received a request for > 500K and less than <1500K +TInt COomTestHarness::PluginV2Test1L(TTestResult& aResult) + { + ResetL(); + + // Configure the P4 V2 plugin to eat 5MB: + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3C), 0, 0x500000, 0x500000)); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + // The first four system plugins should have been closed, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + + // Check that the P4 plugin has been called + err = PluginFreeRamCalledL(0x10286A3C, ETrue); + + // Check that the request for memory was about right + // Note: regular system variation makes it impossible to test for an exact number + TInt requestedMemory = 0; + err = RProperty::Get(KUidOomPropertyCategory, 0x10286A3C + KOOMDummyPluginBytesRequested, requestedMemory); + if ((requestedMemory < 512 * 1024) || (requestedMemory > 1500 * 1024)) + { + _LIT( KResult ,"requestedMemory incorrect"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + // Check that the higher priority V2 plugin has not been called + err = PluginFreeRamCalledL(0x10286A3D, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3D incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +// Test simple prioritisation of application plugins +// Start two target applications +// Configure all plugins to consume 0.5MB +// Simulate a low memory event +// Some of the low priority app plugins with those target applications should be called +// The highest priority app with that target application should not be called (the lower priority plugins should free enough memory) +TInt COomTestHarness::AppPluginTest1L(TTestResult& aResult) + { + ResetL(); + + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(KOomTestApp2Uid, 0); + StartApplicationL(KOomTestApp3Uid, 0); + StartApplicationL(KOomTestAppUid, 0); + + + TInt err = KErrNone; + + // Check that all of the apps are running + err = AppIsRunning(KOomTestApp2Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"app KOomTestApp2Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp3Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"app KOomTestApp3Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = AppIsRunning(KOomTestAppUid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"app KOomTestAppUid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + // Now eat some memory till we are below treshhold and wait for the memory monitor to bring us above treshhold again + TInt memTestState = ETestInit; + + if (err == KErrNone) + { + BringAppToForeground(KOomTestAppUid); + + //start watchers + StartMemoryMonitorStatusWatcher(memTestState); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + // fail tests if watchers failed or memory was not freed + if (memTestState != ETestAbove) + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + //if memteststate is not desired signal to other cases that they should not pass + if (err == KErrNone) + { + err = KErrGeneral; + } + } + } + + // Check plugins for memory free calls + // The following application plugins should be called... + // Application plugins: 10286A3A 10286A3B + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3A, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3A FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // The following plugin should not be called because other plugins (including some unchecked system plugins) have freed enough memory + // 10286A38 + err = PluginFreeRamCalledL(0x10286A38, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A38 FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + + ResetL(); + return KErrNone; + } + +// Test simple prioritisation of application plugins +// Start two target applications +// Configure all plugins to consume 0.5MB +// The app plugin with the highest priority is configured to be assigned the lowest priority after an idle time +// Wait until the idle time rule applies +// Simulate a low memory event +// The plugin that initially had the highest priority (but now has the lowest priority) should be called +// Note that this test should be the same as AppPluginTest1L with the addition of the idle period +TInt COomTestHarness::AppPluginIdleTimeTest1L(TTestResult& aResult) + { + ResetL(); + + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(KOomTestApp2Uid, 0); + StartApplicationL(KOomTestApp3Uid, 0); + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + User::After(KOomTestFirstIdlePeriod); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + // The following application plugins should be called... + // Application plugins: 10286A3A 10286A3B + + err = PluginFreeRamCalledL(0x10286A3A, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3A FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // The following plugin should also be called (its priority was initially too high but has been reduced after the idle time) + // 10286A38 + err = PluginFreeRamCalledL(0x10286A38, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A38 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +// Test the optional allocation mechanism +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 12MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed freeing the required memory +TInt COomTestHarness::OptionalAllocationTest1L(TTestResult& aResult) + { + ResetL(); + + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 12MB of RAM + StartApplicationL(KOomTestApp3Uid, 12 * 1024); + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + TInt bytesAvailable; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 10 * 1024 * 1024, 0x10286A37, bytesAvailable); + + if(err == KErrNone) + { + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + } + + if (err == KErrNone && memTestState == ETestAbove) + { + // Check that all system plugins below P8 have been called + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A34, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A34 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A35, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A35 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A36 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // This the P8 system plugin has not been called + err = PluginFreeRamCalledL(0x10286A37, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A37 FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the low priority app plugin has been called + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"low prioirity app 0x10286A3B not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the P7 application has been closed + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 app KOomTestApp3Uid not closed"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +// Test the optional allocation mechanism - minimum requested RAM behaviour - successful request +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 5MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed freeing the required minimum amount memory +// The returned available memory should be about 5MB ( > 3MB and < 7MB ) +TInt COomTestHarness::OptionalAllocationTest2L(TTestResult& aResult) + { + ResetL(); + + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 5MB of RAM + StartApplicationL(KOomTestApp3Uid, 5 * 1024); + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + StartMemoryMonitorStatusWatcher(memTestState); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + // Say that 5MB is the minimum we need + TInt bytesAvailable; + err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + + if(err == KErrNone) + { + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + } + + if (err == KErrNone && memTestState == ETestAbove) + { + if (err == KErrNone) + { + // Check that the reported bytes available is > 3MB and < 7MB + if ((bytesAvailable < 3 * 1024 * 1024) + || (bytesAvailable > 7 * 1024 * 1024)) + { + _LIT( KResult ,"reported bytes not > 3MB and < 7MB"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + // Check that all system plugins below P8 have been called + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A34, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A34 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { err = PluginFreeRamCalledL(0x10286A35, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A35 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A36 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // This the P8 system plugin has not been called + err = PluginFreeRamCalledL(0x10286A37, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A37 FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the low priority app plugin has been called + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the P7 application has been closed + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 app KOomTestApp3Uid not closed"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +// Test the optional allocation mechanism - minimum requested RAM behaviour - failed request +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 3MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed but it won't free enough memory +// The optional allocation should fail with KErrNoMemory +TInt COomTestHarness::OptionalAllocationTest3L(TTestResult& aResult) + { + ResetL(); + + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 5MB of RAM + StartApplicationL(KOomTestApp3Uid, 3 * 1024); + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + // Say that 5MB is the minimum we need + TInt bytesAvailable; + err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + // We expect an error because it has not been possible to free the minimum memory + if (err == KErrNoMemory) + { + err = KErrNone; + } + + if(err == KErrNone) + { + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + } + + if (err == KErrNone && memTestState == ETestAbove) + { + // Check that all system plugins below P8 have been called + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A34, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A34 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A35, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A35 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A36 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // This the P8 system plugin has not been called + err = PluginFreeRamCalledL(0x10286A37, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A37 FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the low priority app plugin has been called + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the P7 application has been closed + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 App KOomTestApp3Uid not closed"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +// Test that force priority check applies (only) to selected priorities +// Setup three plugins (priorities 7, 8 & 9)to eat 5MB each +// The configuration file should force a check after priority 8 +// Drop just under the low threshold +// Plugins P7 & P8 should be called (P8 is called even though the P7 plugin freed enough memory) +// Plugin P9 should not be called because enou +TInt COomTestHarness::ForcePriorityCheck1L(TTestResult& aResult) + { + ResetL(); + + // Configure the P7, P8 and P9 plugins to eat 5MB each: + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A36), 0, 0x300000, 0x300000)); // P7 + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A37), 0, 0x300000, 0x300000)); // P8 + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3D), 0, 0x300000, 0x300000)); // P9 + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + + // The P7 plugin should have been called and is the first to release RAM + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"P7 Plugin 0x10286A36 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + // The P8 plugin should be called even though the P7 plugin has already released enough memory because the plugin runs in continue mode and there is no forced check + err = PluginFreeRamCalledL(0x10286A37, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"P8 Plugin 0x10286A37 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // The P9 plugin should not be called because of the force priority check (the P7 & P8 plugins have already released plenty of RAM) + err = PluginFreeRamCalledL(0x10286A3D, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P9 Plugin 0x10286A3D FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + + +// Test the Busy API on the OOM server +// Start three applications +// Ensure that the lowest priority app is not in the foreground +// Call the busy API on the OOM monitor for the lowest priority app +// Simulate a low memory event by going just under the low threshold +// The busy application should not be closed +// The other (non-foreground) application should be closed +TInt COomTestHarness::BusyApplicationTest1L(TTestResult& aResult) + { + ResetL(); + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(KOomTestApp2Uid, 0); + StartApplicationL(KOomTestAppUid, 0); + StartApplicationL(KOomTestApp3Uid, 0); // Lowest priority app + + BringAppToForeground(KOomTestAppUid); // TODO: this doesn't seem to be working - message not getting through to the dummy application + + Settle(); + + // Send the second app a message to make itself busy + TInt id = iApps.Find(TUid::Uid(KOomTestApp3Uid), CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + iApps[id]->SendMessage(KOomDummyAppSetBusy); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + + // The first four system plugins should have been closed, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + + // Check that the busy application is still running + err = AppIsRunning(KOomTestApp3Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"P7 App KOomTestApp3Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + // Check that the higher priority but non-busy application has been close + err = AppIsRunning(KOomTestApp2Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 App KOomTestApp2Uid not closed"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +// Test the NotBusy API on the OOM server +// Start three applications +// Ensure that the lowest priority app is not in the foreground +// Call the busy API on the OOM monitor for the lowest priority app +// Then call the not-busy API on the OOM monitor for the lowest priority app +// Simulate a low memory event by going just under the low threshold +// The lowest priority app should be closed (because it is no longer busy) +TInt COomTestHarness::NormalPriorityApplicationTest1L(TTestResult& aResult) + { + ResetL(); + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(KOomTestApp2Uid, 0); + StartApplicationL(KOomTestApp3Uid, 0); // Lowest priority app + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + Settle(); + + // Send the second app a message to make itself busy + TInt id = iApps.Find(TUid::Uid(KOomTestApp3Uid), CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + // TODO: temp removed - needs to be put back +// iApps[id]->SendMessage(KOomDummyAppSetBusy); + + // Send the second app a message to make itself normal priority + id = iApps.Find(TUid::Uid(KOomTestApp3Uid), CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + iApps[id]->SendMessage(KOomDummyAppSetNormalPriority); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + + if (err == KErrNone && memTestState == ETestAbove) + { + + // The first four system plugins should have been closed, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + + // Check that the no-longer-busy application has been closed + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"App KOomTestApp3Uid not closed"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + + +// Start three applications +// One is set to NEVER_CLOSE, one is low priority, one is a dummy app to ensure that the first two are not in the foreground +// Configure applications not to release any memory +// Go just significantly under the low memory threshold +// Wait for the system to recover, if we have moved above the low memory threshold then go significantly under it again. Repeat this step until we no longer go above low. +// Check that the low priority application is closed +// Check that the NEVER_CLOSE application is not closed (even though we're still below the low theshold) +TInt COomTestHarness::NeverCloseTest1L(TTestResult& aResult) + { + ResetL(); + + // Start the two target applications (plus a third so that the target apps are not in the foreground) + StartApplicationL(KOomTestApp3Uid, 0); // Lowest priority app + StartApplicationL(KOomTestApp7Uid, 0); // NEVER_CLOSE application + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + TInt attemps = 10; + + while (memTestState != ETestBelow && attemps > 0) + { + StartMemoryMonitorStatusWatcher(memTestState); + + // eat memory + EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold); + + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + attemps--; + } + + if (err == KErrNone && memTestState == ETestBelow) + { + + // The NEVER_CLOSE app should still be running (even though we are still below the low threshold) + err = AppIsRunning(KOomTestApp7Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"NEVER_CLOSE app KOomTestApp7Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + // The low priority app should still be closed (even though we are still below the low threshold) + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"low priority app KOomTestApp3Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Incorrectly Above Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + + + + +// Test that sync mode configuration is working for system plugins +// Configure three system plugins to release 5MB of memory each. +// The plugins are configured as follows +// Plugin 1: Priority 7, sync mode continue +// Plugin 2: Priority 8, sync mode check +// Plugin 3: Priority 9, sync mode continue +// Drop just under the low threshold +// Plugins 1 & 2 should be called (even though plugin 1 alone has freed enough RAM) +// Plugin 3 won't be called because the check on the priority 8 plugin discovers that enough RAM has been freed +TInt COomTestHarness::PluginSyncModeTest1L(TTestResult& aResult) + { + ResetL(); + + // Configure three plugins to eat 5MB each: + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A36), 0, 0x300000, 0x300000)); + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A37), 0, 0x300000, 0x300000)); + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3D), 0, 0x300000, 0x300000)); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (err == KErrNone && memTestState == ETestAbove) + { + + // The first four system plugins should have been run, releasing the required memory + // All four plugins should be called, even though the first two will release enough memory (this is because + // plugins are always run in continue mode) + + // Check that the first two plugins have been called, but not the third + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A36 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A37, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A37 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3D, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3D Free Ram incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + + + +// Test the optional allocation mechanism +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 12MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed freeing the required memory +TInt COomTestHarness::OptionalAllocationAsyncTest1L(TTestResult& aResult) + { + ResetL(); + + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 12MB of RAM + StartApplicationL(KOomTestApp3Uid, 12 * 1024); + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + TInt bytesAvailable; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 10 * 1024 * 1024, 0x10286A37, bytesAvailable); + + if (err == KErrNone) + { + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + } + + if (err == KErrNone && memTestState == ETestAbove) + { + // Check that all system plugins below P8 have been called + + err = PluginFreeRamCalledL(0x10286A34, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A34 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A35, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A35 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A36 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // This the P8 system plugin has not been called + err = PluginFreeRamCalledL(0x10286A37, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A37 Free Ram incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the low priority app plugin has been called + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the P7 application has been closed + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 App KOomTestApp3Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + +// Test the optional allocation mechanism - minimum requested RAM behaviour - successful request +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 5MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed freeing the required minimum amount memory +// The returned available memory should be about 5MB ( > 3MB and < 7MB ) +TInt COomTestHarness::OptionalAllocationAsyncTest2L(TTestResult& aResult) + { + ResetL(); + + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 5MB of RAM + StartApplicationL(KOomTestApp3Uid, 5 * 1024); + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + TInt bytesAvailable; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + // Say that 5MB is the minimum we need + err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + + if (err == KErrNone) + { + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + } + + if (err == KErrNone && memTestState == ETestAbove) + { + if (err == KErrNone) + { + // Check that the reported bytes available is > 3MB and < 7MB + if ((bytesAvailable < 3 * 1024 * 1024) + || (bytesAvailable > 7 * 1024 * 1024)) + { + _LIT( KResult ,"bytesAvailable not ( > 3MB and < 7MB )"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that all system plugins below P8 have been called + + err = PluginFreeRamCalledL(0x10286A34, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A34 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A35, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A35 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A36 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // This the P8 system plugin has not been called + err = PluginFreeRamCalledL(0x10286A37, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A37 Free Ram incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the low priority app plugin has been called + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the P7 application has been closed + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 App KOomTestApp3Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + + + +// Test the optional allocation mechanism - minimum requested RAM behaviour - failed request +// Configure the plugins not to release any RAM when FreeRam is called +// Configure one priority 7 application to release 3MB when FreeRam is called +// Start this application (plus another one so it isn't in the foreground) +// Drop just above the good memory level +// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin +// All of the plugins below P8 should be called +// The P7 application should be closed but it won't free enough memory +// The optional allocation should fail with KErrNoMemory +TInt COomTestHarness::OptionalAllocationAsyncTest3L(TTestResult& aResult) + { + ResetL(); + + // Start an application (plus a second so that the first app is not in the foreground) + // The first application is set to consume 5MB of RAM + StartApplicationL(KOomTestApp3Uid, 3 * 1024); + StartApplicationL(KOomTestAppUid, 0); + + BringAppToForeground(KOomTestAppUid); + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8) + // Say that 5MB is the minimum we need + TInt bytesAvailable; + + err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + // We expect an error because it has not been possible to free the minimum memory + if(err == KErrNoMemory) + { + err = KErrNone; + } + + if (err == KErrNone) + { + //start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + } + + if (err == KErrNone && memTestState == ETestAbove) + { + + if (err == KErrNone) + { + // Check that all system plugins below P8 have been called + + err = PluginFreeRamCalledL(0x10286A34, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A34 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A35, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A35 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A36 Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // This the P8 system plugin has not been called + err = PluginFreeRamCalledL(0x10286A37, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A37 Free Ram incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the low priority app plugin has been called + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B Free Ram not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // Check that the P7 application has been closed + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 App KOomTestApp3Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"minimum memory unexpectedly freed or still below treshhold or could not start watchers"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + ResetL(); + return KErrNone; + } + + + + + + + +void COomTestHarness::BringAppToForeground(TInt32 aUid) + { + //bring app to foreground + TInt id = iApps.Find(TUid::Uid(aUid), CCDummyApplicationHandle::CompareTo); + User::LeaveIfError(id); + iApps[id]->BringToForeground(); + User::After(TTimeIntervalMicroSeconds32(KSettlingTime)); + } + + +void COomTestHarness::ResetL() + { + Settle(); + + // Close any dummy apps + iApps.ResetAndDestroy(); + + Settle(); + + // Free all memory being eaten by the server + iChunk.Adjust(KOomHarnessInitialEatenMemory); // Just eat 1K of memory initially, this can grow later + iChunkSize = KOomHarnessInitialEatenMemory; + + iDummyChunk.Close(); + iDummyChunkSize = 0; + + User::LeaveIfError(iAllocServer.Reset()); + + // Wait for the system to settle before getting the call counts (freeing the memory could cause some more movement). + Settle(); + + // Update the call counts on the plugins (add them if they're not there already) + for (TInt pluginUid = KUidOOMDummyPluginFirstImplementation; pluginUid <= KUidOOMDummyPluginLastImplementation; pluginUid++) + { + TInt lowMemoryCount = 0; + RProperty::Get(KUidOomPropertyCategory, pluginUid + KOOMDummyPluginLowMemoryCount, lowMemoryCount); + + TInt goodMemoryCallCount = 0; + RProperty::Get(KUidOomPropertyCategory, pluginUid + KOOMDummyPluginGoodMemoryCount, goodMemoryCallCount); + + TPluginCallCount pluginCallCount; + pluginCallCount.iFreeRamCallCount = lowMemoryCount; + pluginCallCount.iMemoryGoodCallCount = goodMemoryCallCount; + + iPluginCallCounts.InsertL(pluginUid, pluginCallCount); + }; + } + +void COomTestHarness::EatMemoryL(TInt aKBytesToLeaveFree) + { + Settle(); + + TMemoryInfoV1Buf meminfo; + UserHal::MemoryInfo(meminfo); + TInt freeMem = meminfo().iFreeRamInBytes; + + // Resize the dummy chunk to consume the correct ammount of memory + iChunkSize = freeMem + iChunkSize - (aKBytesToLeaveFree * 1024); + + if( iChunkSize > KOomHarnessMaxEatenMemory) + { + TInt dummy = (iChunkSize - KOomHarnessMaxEatenMemory)+ 2*1024*1024; + /* + if(dummy > (2 *1024 * 1024)) + { + //User::LeaveIfError(iDummyChunk.CreateLocal(KOomHarnessInitialEatenMemory, ((dummy-(2*1024*1024))); + dummy = dummy - 2*1024*1024; + } + */ + User::LeaveIfError(iDummyChunk.CreateLocal(KOomHarnessInitialEatenMemory, dummy)); + iDummyChunkSize = KOomHarnessInitialEatenMemory; + TInt err1 = iDummyChunk.Adjust(dummy-1024); + UserHal::MemoryInfo(meminfo); + freeMem = meminfo().iFreeRamInBytes; + iChunkSize = freeMem + KOomHarnessInitialEatenMemory - (aKBytesToLeaveFree * 1024); + } + + + TInt err = iChunk.Adjust(iChunkSize); + User::LeaveIfError(err); + } + +void COomTestHarness::AllocateMemoryL(TInt aKBytes) + { + TInt err = iChunk.Allocate(aKBytes * 1024); + User::LeaveIfError(err); + } + +// Set up the plugins and applications - this is the starting point for many test cases +// 5 applications are started with approx 0.5 MB used for each +// 0.5MB (approx) of memory is reserved for each one of the plugins +void COomTestHarness::CommonSetUpL() + { + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + } + +void COomTestHarness::StartApplicationL(TInt32 aUid, TInt aInitialAllocationInKBs) + { + User::ResetInactivityTime(); + CCDummyApplicationHandle *app = CCDummyApplicationHandle::NewLC(TUid::Uid(aUid), aInitialAllocationInKBs * 1024); + iApps.AppendL(app); + CleanupStack::Pop(app); + Settle(); + } + +// Returns KErrNone if we get the expected result +TInt COomTestHarness::AppIsRunning(TInt32 aUid, TBool aExpectedResult) + { + TBool appRunning = ETrue; + + TInt id = iApps.Find(TUid::Uid(aUid), CCDummyApplicationHandle::CompareTo); + if (id < 0) + appRunning = EFalse; + else if(iApps[id]->Process().ExitType() != EExitPending) + appRunning = EFalse; + + TInt err = KErrNone; + + if (aExpectedResult != appRunning) + err = KErrGeneral; + + if (aExpectedResult != appRunning) + { + err = KErrGeneral; + } + + return err; + } + +// Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)? +// Returns KErrNone if we get the expected result +TInt COomTestHarness::PluginFreeRamCalledL(TInt32 aUid, TBool aExpectedResult) + { + TInt newLowMemoryCount = 0; + TInt err = RProperty::Get(KUidOomPropertyCategory, aUid + KOOMDummyPluginLowMemoryCount, newLowMemoryCount); + + //handle error? + + TBool freeRamHasBeenCalledOnPlugin = EFalse; + TPluginCallCount* pluginCallCount = iPluginCallCounts.Find(aUid); + + if (pluginCallCount) + { + freeRamHasBeenCalledOnPlugin = (pluginCallCount->iFreeRamCallCount != newLowMemoryCount); + + if (freeRamHasBeenCalledOnPlugin) + { + // Update the list of old counts with the current value so we can see if it has changed next time this function is called + pluginCallCount->iFreeRamCallCount = newLowMemoryCount; + iPluginCallCounts.InsertL(aUid, *pluginCallCount); + } + } + else + { + err = KErrNotFound; + } + + if (aExpectedResult != freeRamHasBeenCalledOnPlugin) + { + err = KErrGeneral; + } + + return err; + } + +// Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)? +// Returns KErrNone if we get the expected result +TInt COomTestHarness::PluginMemoryGoodCalledL(TInt32 aUid, TBool aExpectedResult) + { + TInt newGoodMemoryCount = 0; + RProperty::Get(KUidOomPropertyCategory, aUid + KOOMDummyPluginGoodMemoryCount, newGoodMemoryCount); + + TBool memoryGoodHasBeenCalledOnPlugin = EFalse; + TPluginCallCount* pluginCallCount = iPluginCallCounts.Find(aUid); + + if (pluginCallCount) + { + memoryGoodHasBeenCalledOnPlugin = (pluginCallCount->iMemoryGoodCallCount != newGoodMemoryCount); + + if (memoryGoodHasBeenCalledOnPlugin) + { + // Update the list of old counts with the current value so we can see if it has changed next time this function is called + pluginCallCount->iMemoryGoodCallCount = newGoodMemoryCount; + iPluginCallCounts.InsertL(aUid, *pluginCallCount); + } + } + + TInt err = KErrNone; + + if (aExpectedResult != memoryGoodHasBeenCalledOnPlugin) + err = KErrGeneral; + + return err; + } + +// Utility function which calls the async version of optional RAM request and makes it behave like the sync version +TInt COomTestHarness::RequestOptionalRamASyncWrapper(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable) + { + TInt err = KErrNone; + TRequestStatus status; + iOomSession.RequestOptionalRam(aBytesRequested, aMinimumBytesNeeded, aPluginId, status); + User::WaitForRequest(status); + + if (status.Int() < 0) + err = status.Int(); + else + aBytesAvailable = status.Int(); + + return err; + } + +void COomTestHarness::StartMemoryMonitorStatusWatcher(TInt& aTestState) + { + iStatusWatcher->Start(&aTestState); + } + +void COomTestHarness::StartTimerAndRunWatcher(TInt& aTestState) + { + //start timer + iTimeoutWatcher->Start(&aTestState, KTimeout); + + //start active scheduler to catch mem monitor status changes + CActiveScheduler::Start(); + + //One of the active objects has fired. Cancelling all pending requests + iStatusWatcher->Cancel(); + iTimeoutWatcher->Cancel(); + } + +TInt COomTestHarness::GetFreeMemory() + { + User::CompressAllHeaps(); + + TInt current = 0; + HAL::Get( HALData::EMemoryRAMFree, current ); + + return current; + } + + +CMemoryMonitorStatusWatcher* CMemoryMonitorStatusWatcher::NewL() + { + CMemoryMonitorStatusWatcher* self = new (ELeave) CMemoryMonitorStatusWatcher(); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(); // self; + return self; + } + +CMemoryMonitorStatusWatcher::~CMemoryMonitorStatusWatcher() + { + Cancel(); + iMonitorProperty.Close(); + } + +void CMemoryMonitorStatusWatcher::Start(TInt* aTestState) + { + iMonitorProperty.Subscribe(iStatus); + SetActive(); + + iTestState = aTestState; + } + +CMemoryMonitorStatusWatcher::CMemoryMonitorStatusWatcher() : CActive(CActive::EPriorityStandard) + { + } + +void CMemoryMonitorStatusWatcher::ConstructL() + { + CActiveScheduler::Add(this); // Add to scheduler + User::LeaveIfError(iMonitorProperty.Attach(KOomMemoryMonitorStatusPropertyCategory, KOomMemoryMonitorStatusPropertyKey)); + } + +void CMemoryMonitorStatusWatcher::DoCancel() + { + iMonitorProperty.Cancel(); + } + +void CMemoryMonitorStatusWatcher::RunL() + { + iMonitorProperty.Subscribe(iStatus); + SetActive(); + + TInt monitorState = EFreeingMemory; + User::LeaveIfError(iMonitorProperty.Get(monitorState)); + + if (monitorState != EFreeingMemory) + { + //Do not reschedule - signal client that request has completed + Cancel(); + if(monitorState == EBelowTreshHold) + { + *iTestState = ETestBelow; + } + else + { + *iTestState = ETestAbove; + } + CActiveScheduler::Stop(); + } + } + +CMemoryMonitorTimeoutWatcher* CMemoryMonitorTimeoutWatcher::NewL() + { + CMemoryMonitorTimeoutWatcher* self = new (ELeave) CMemoryMonitorTimeoutWatcher(); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(); // self; + return self; + } + +CMemoryMonitorTimeoutWatcher::~CMemoryMonitorTimeoutWatcher() + { + Cancel(); + } + +void CMemoryMonitorTimeoutWatcher::Start(TInt* aTestState, const TTimeIntervalMicroSeconds32& aTimeout) + { + iTestState = aTestState; + After(aTimeout); + } + +void CMemoryMonitorTimeoutWatcher::ConstructL() + { + CTimer::ConstructL(); + CActiveScheduler::Add(this); // Add to scheduler + } + +CMemoryMonitorTimeoutWatcher::CMemoryMonitorTimeoutWatcher() : CTimer(CActive::EPriorityStandard) + { + } + +void CMemoryMonitorTimeoutWatcher::DoCancel() + { + CTimer::DoCancel(); + } + +void CMemoryMonitorTimeoutWatcher::RunL() + { + Cancel(); + *iTestState = ETestTimeout; + CActiveScheduler::Stop(); + } + +//////// + +CAsyncRequester* CAsyncRequester::NewL(RChunk aChunk, TInt aChunkSize) + { + CAsyncRequester* self = new (ELeave) CAsyncRequester(aChunk, aChunkSize); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(); // self; + return self; + } + +CAsyncRequester::~CAsyncRequester() + { + Cancel(); + iSession.Close(); + } + +void CAsyncRequester::Start(TInt aBytesToRequest, TReturnStatus* aReturnStatus) + { + iReturnStatus = aReturnStatus; + //Request 2.8MB which will close KOomTestApp3Uid + iSession.RequestOptionalRam(aBytesToRequest, 0, 0x10286A3D, iStatus); + SetActive(); + } + +void CAsyncRequester::ConstructL() + { + User::LeaveIfError(iSession.Connect()); + CActiveScheduler::Add(this); // Add to scheduler + } + +CAsyncRequester::CAsyncRequester(RChunk aChunk, TInt aChunkSize) + : CActive(CActive::EPriorityStandard), + iChunk(aChunk), + iChunkSize(aChunkSize) + { + } + +void CAsyncRequester::DoCancel() + { + } + +void CAsyncRequester::RunL() + { + iReturnStatus->iCompleted = ETrue; + iReturnStatus->iReturnStatus = iStatus.Int(); + if (iReturnStatus->iId == 1) + { + TMemoryInfoV1Buf meminfo; + UserHal::MemoryInfo(meminfo); + TInt freeMem = meminfo().iFreeRamInBytes; + + // Resize the dummy chunk to consume the correct ammount of memory + iChunkSize = freeMem + iChunkSize - (KOomJustAboveGoodMemoryThreshold * 1024); + TInt err = iChunk.Adjust(iChunkSize); + User::LeaveIfError(err); + } + else + { + CActiveScheduler::Stop(); + } + } + +///////// + + +TInt COomTestHarness::AppCloseTwoSessionsL(TTestResult& aResult) + { + ResetL(); + + StartApplicationL(KOomTestApp2Uid, 3 * 1024); // P8 app to be closed + StartApplicationL(KOomTestAppUid, 3 * 1024); // P9 app should not be closed + StartApplicationL(KOomTestApp3Uid, 3 * 1024); // P7 app to be closed + StartApplicationL(KOomTestApp4Uid, 3 * 1024); // P7 app foreground should not be closed + + // Go just above the good memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + Settle(); + + TInt err = KErrNone; + CAsyncRequester* req1 = CAsyncRequester::NewL(iChunk, iChunkSize); + CleanupStack::PushL(req1); + CAsyncRequester* req2 = CAsyncRequester::NewL(iChunk, iChunkSize); + CleanupStack::PushL(req2); + TReturnStatus status1; + status1.iId = 1; + TReturnStatus status2; + status2.iId = 2; + + TInt memTestState = ETestInit; + iTimeoutWatcher->Start(&memTestState, KTimeout); + + //This request should close KOomTestApp3Uid + //On return the active object will allocate the memory it requested + req1->Start(3 * 1024 * 1024, &status1); + + //The second request should be queued until the first request has completed, there will then be + //a pause for the memory to be allocated before the request is properly serviced. + req2->Start(3 * 1024 * 1024, &status2); + + CActiveScheduler::Start(); + + //The active scheduler is stopped, we should return here once both AOs have been completed. + iTimeoutWatcher->Cancel(); + + if (memTestState == ETestTimeout) + { + err = KErrTimedOut; + _LIT( KResult ,"Test has timed out, requests have not been completed"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp4Uid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Foreground App KOomTestApp4Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestAppUid, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"P9 App KOomTestAppUid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp3Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 App KOomTestApp3Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp2Uid, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"P7 App KOomTestApp2Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + + CleanupStack::PopAndDestroy(2); + ResetL(); + return KErrNone; + } + + +TInt COomTestHarness::CallIfTargetAppNotRunningTest1L(TTestResult& aResult) + { + ResetL(); + + // Configure the plugins to eat 0.5MB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000)); + } + + StartApplicationL(KOomTestApp3Uid, 0); + + + TInt err = KErrNone; + + // Now eat some memory till we are below treshhold and wait for the memory monitor to bring us above treshhold again + TInt memTestState = ETestInit; + + //start watchers + StartMemoryMonitorStatusWatcher(memTestState); + + // Go just under the low memory threshold + EatMemoryL(KOomJustUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + // fail tests if watchers failed or memory was not freed + if (memTestState != ETestAbove) + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + //if memteststate is not desired signal to other cases that they should not pass + err = KErrGeneral; + } + + // The following application plugins should be called... + // Application plugins: 10286A3B + // The following application plugins should not be called... + // Application plugins: 10286A3A, 0x10286A38 + if (err == KErrNone) + { + //target app not running for this priority 3 app plugin + err = PluginFreeRamCalledL(0x10286A3A, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3A FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + //target app is running for this priority 4 app plugin + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + //By the time we get to this priority 9 plugin, the app plugins and other sys plugins + // have freed enough memory and a sys plugin with "check ram" has been called + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A38, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A38 FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + + ResetL(); + return KErrNone; + } + +//Test that an app that has an app_specific_thresholds but no close_app can still be closed +// +//This test only works on emulator. On hw there are many more apps started which have default priority +//and these are closed before KOomTestApp8Uid as they are behind it in the z order, freeing sufficient memory +//before we would get to KOomTestApp8Uid +TInt COomTestHarness::AppCloseSpecificThresholdTest1L(TTestResult& aResult) + { + ResetL(); + + StartApplicationL(KOomTestApp8Uid, 5 * 1024); // app with app_specific_thresholds but no close_app + StartApplicationL(KOomTestApp3Uid, 0); // P7 foreground app. Will not be closed + + BringAppToForeground(KOomTestApp3Uid); + + //start watchers + TInt memTestState = ETestInit; + TInt err = KErrNone; + + StartMemoryMonitorStatusWatcher(memTestState); + + // Go significantly under the low memory threshold + EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold); + + //start timer, start scheduler & stop watchers when done + StartTimerAndRunWatcher(memTestState); + + if (memTestState == ETestAbove) + { + err = AppIsRunning(KOomTestApp8Uid, EFalse); + + if (err != KErrNone) + { + _LIT( KResult ,"P8 App KOomTestApp2Uid incorrectly running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + if (err == KErrNone) + { + err = AppIsRunning(KOomTestApp3Uid, ETrue); + if (err != KErrNone) + { + // The P7 app should still be running because it was in the foreground + _LIT( KResult ,"(P7 App KOomTestApp3Uid not running"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + } + else + { + _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold "); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // case was not executed or case was executed but never finished or failed + } + + ResetL(); + return KErrNone; + } + +TInt COomTestHarness::PluginTestInsufficientMemoryFreedL(TTestResult& aResult) + { + ResetL(); + + // Configure the plugins to eat 1kB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x400, 0x400)); + } + + //start watchers + TInt err = KErrNone; + TInt bytesAvailable; + + // Go significantly under the low memory threshold + EatMemoryL(KOomJustAboveGoodMemoryThreshold); + + // Request 5 MB of data, using the priority of the referenced plugin (constant priority 8) + err = iOomSession.RequestOptionalRam(5 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + + // There should be nothing that can be done to free this memory + if (err == KErrNoMemory) + { + err = KErrNone; + } + else + { + _LIT( KResult ,"There should not have been actions available to successfully complete request"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + //Check a couple of plugins that should have been called + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A36 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + // This plugin should not be called as it is priority 9 + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3D, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3D FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + //This plugins should not be called as the target app is not running + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3A, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3A FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + // MemoryGood should have been called on all plugins which were run as the request to + // go below memory was triggered by an optional RAM request + if (err == KErrNone) + { + err = PluginMemoryGoodCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B MemoryGood not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginMemoryGoodCalledL(0x10286A3C, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3C MemoryGood not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // MemoryGood should not be called on this plugin because FreeMemory was never called on it + err = PluginMemoryGoodCalledL(0x10286A37, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A37 MemoryGood incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + + ResetL(); + return KErrNone; + } + +TInt COomTestHarness::PluginTestInsufficientMemoryFreed2L(TTestResult& aResult) + { + ResetL(); + + // Configure the plugins to eat 1kB each: + for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++) + { + User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x400, 0x400)); + } + + //start watchers + TInt err = KErrNone; + TInt bytesAvailable; + + // Go significantly under the low memory threshold + EatMemoryL(KOomBetweenLowAndGoodThresholds); + + // Request 5 MB of data, using the priority of the referenced plugin (constant priority 8) + err = iOomSession.RequestOptionalRam(5 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable); + + // There should be nothing that can be done to free this memory + if (err == KErrNoMemory) + { + err = KErrNone; + } + else + { + _LIT( KResult ,"There should not have been actions available to successfully complete request"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + + //Check a couple of plugins that should have been called + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A36, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A36 FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + // This plugin should not be called as it is priority 9 + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3D, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3D FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + //This plugins should not be called as the target app is not running + if (err == KErrNone) + { + err = PluginFreeRamCalledL(0x10286A3A, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"Plugin 0x10286A3A FreeRam incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + // MemoryGood should have been called on all plugins which were run as the request to + // go below memory was triggered by an optional RAM request + if (err == KErrNone) + { + err = PluginMemoryGoodCalledL(0x10286A3B, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3B MemoryGood not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + err = PluginMemoryGoodCalledL(0x10286A3C, ETrue); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A3C MemoryGood not called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + // MemoryGood should not be called on this plugin because FreeMemory was never called on it + err = PluginMemoryGoodCalledL(0x10286A37, EFalse); + if (err != KErrNone) + { + _LIT( KResult ,"plugin 0x10286A37 MemoryGood incorrectly called"); + aResult.iResultDes.Copy( KResult ); + aResult.iResult = KErrGeneral; + // Case was executed but failed + } + } + + if (err == KErrNone) + { + _LIT( KDescription , "Test case passed"); + aResult.SetResult( KErrNone, KDescription ); + } + + ResetL(); + return KErrNone; + } + +// ================= OTHER EXPORTED FUNCTIONS ================================= + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp.rss Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,171 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// RESOURCE IDENTIFIER +NAME T_OT // 4 letter ID + +// INCLUDES +#include +#include +#include +#include +#include +#include +#include "t_oomtestappcmd.hrh" + +// RESOURCE DEFINITIONS +RESOURCE RSS_SIGNATURE + { + } + +RESOURCE TBUF r_default_document_name + { + buf="T_OT"; + } + +RESOURCE EIK_APP_INFO + { + menubar = r_menubar; + cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT; + } + +RESOURCE MENU_BAR r_menubar + { + titles = + { + MENU_TITLE { menu_pane = r_menu; } + }; + } + +RESOURCE MENU_PANE r_menu + { + items = + { + MENU_ITEM + { + command = EOomTestAppSelectConfig; + txt = "Select config xml"; + }, + MENU_ITEM + { + command = EOomTestAppToggleSystem; + txt = "Toggle system"; + }, + MENU_ITEM + { + command = EOomTestAppAllocMemory; + txt = "Alloc memory"; + }, + MENU_ITEM + { + command = EOomTestAppFreeMemory; + txt = "Free memory"; + }, + MENU_ITEM + { + command = EOomTestAppAllocMemWithPermission; + txt = "Alloc memory with permission"; + }, + MENU_ITEM + { + command = EOomTestAppSetPriority; + cascade = r_priority_menu; + txt = "Set priority"; + }, + MENU_ITEM + { + command = EAknSoftkeyExit; + txt = "Exit"; + } + }; + } + +RESOURCE MENU_PANE r_priority_menu + { + items = + { + MENU_ITEM + { + command = EOomTestAppSetPriorityNormal; + txt = "Normal"; + }, + MENU_ITEM + { + command = EOomTestAppSetPriorityHigh; + txt = "High"; + }, + MENU_ITEM + { + command = EOomTestAppSetPriorityBusy; + txt = "Busy"; + } + }; + } + +RESOURCE MEMORYSELECTIONDIALOG r_memory_selection + { + title = ""; + softkey_1 = "Ok"; + } + +RESOURCE FILESELECTIONDIALOG r_file_selection + { + title = "Select xml"; + softkey_1_file = "Select"; + softkey_1_folder = "Open"; + softkey_2_root_level = "Cancel"; + softkey_2_subfolder = "Back"; + filters = + { + FILTER + { + filter_type = EFilenameFilter; + filter_style = EInclusiveFilter; + filter_data = { "*.xml" }; + } + }; + } + +RESOURCE DIALOG r_alloc_query + { + flags = EAknGeneralQueryFlags; + buttons = R_AVKON_SOFTKEYS_OK_CANCEL; + items = + { + DLG_LINE + { + type = EAknCtQuery; + id = EGeneralQuery; + control = AVKON_DATA_QUERY + { + layout = ENumberLayout; + label = "KBs to allocate"; + control = AVKON_INTEGER_EDWIN + { + maxlength=10; + min = 0; + max = 0x7fffffff; // KMaxTInt + }; + }; + } + }; + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp_reg.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp_reg.rss Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,30 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include +#include "t_oomtestapp.hrh" + +UID2 KUidAppRegistrationResourceFile +UID3 T_OOM_TESTAPP_UID + +RESOURCE APP_REGISTRATION_INFO + { + app_file = T_OOM_TESTAPP_NAME_STRING; + } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,35 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +PRJ_PLATFORMS +DEFAULT + +PRJ_TESTMMPFILES +t_oomtestapp.mmp +t_oomtestapp2.mmp +t_oomtestapp3.mmp +t_oomtestapp4.mmp +t_oomtestapp5.mmp +t_oomtestapp6.mmp +t_oomtestapp7.mmp +t_oomtestapp8.mmp +t_oomtestapp9.mmp +t_oomtestapp10.mmp diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,50 @@ +;Languages +&EN + +#{"t_oomtestapps"},(0x101FB3E7),1,0,0,TYPE=SA + +;Localised Vendor name +%{"t_oomtestapps EN"} + +; Vendor name +: "t_oomtestapps" + +"\epoc32\release\armv5\urel\t_oomtestapp.exe"-"!:\sys\bin\t_oomtestapp.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp.rsc"-"!:\resource\apps\t_oomtestapp.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp2.exe"-"!:\sys\bin\t_oomtestapp2.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp2.rsc"-"!:\resource\apps\t_oomtestapp2.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp2_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp2_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp3.exe"-"!:\sys\bin\t_oomtestapp3.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp3.rsc"-"!:\resource\apps\t_oomtestapp3.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp3_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp3_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp4.exe"-"!:\sys\bin\t_oomtestapp4.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp4.rsc"-"!:\resource\apps\t_oomtestapp4.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp4_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp4_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp5.exe"-"!:\sys\bin\t_oomtestapp5.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp5.rsc"-"!:\resource\apps\t_oomtestapp5.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp5_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp5_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp6.exe"-"!:\sys\bin\t_oomtestapp6.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp6.rsc"-"!:\resource\apps\t_oomtestapp6.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp6_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp6_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp7.exe"-"!:\sys\bin\t_oomtestapp7.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp7.rsc"-"!:\resource\apps\t_oomtestapp7.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp7_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp7_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp8.exe"-"!:\sys\bin\t_oomtestapp8.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp8.rsc"-"!:\resource\apps\t_oomtestapp8.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp8_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp8_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp9.exe"-"!:\sys\bin\t_oomtestapp9.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp9.rsc"-"!:\resource\apps\t_oomtestapp9.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp9_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp9_reg.rsc" + +"\epoc32\release\armv5\urel\t_oomtestapp10.exe"-"!:\sys\bin\t_oomtestapp10.exe" +"\epoc32\data\z\resource\apps\t_oomtestapp10.rsc"-"!:\resource\apps\t_oomtestapp10.rsc" +"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp10_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp10_reg.rsc" diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.sisx Binary file sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.sisx has changed diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,60 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#include + +TARGET T_OOM_TESTAPP_NAME_EXE +TARGETTYPE exe +EPOCHEAPSIZE 0x10000 0x4000000 // Min 64KB, Max 64MB +UID 0x100039CE T_OOM_TESTAPP_UID +CAPABILITY WriteDeviceData AllFiles + +SOURCEPATH ../src +SOURCE t_oomtestappapplication.cpp +SOURCE t_oomtestappappview.cpp +SOURCE t_oomtestappappui.cpp +SOURCE t_oomtestappdocument.cpp + +SOURCEPATH ../data +START RESOURCE t_oomtestapp.rss +HEADER +TARGET T_OOM_TESTAPP_NAME +TARGETPATH resource/apps +END + +START RESOURCE t_oomtestapp_reg.rss +TARGET T_OOM_TESTAPP_NAME_REG +TARGETPATH /private/10003a3f/apps +END + +MW_LAYER_SYSTEMINCLUDE +T_OOM_TEST_APPDEFS_INCLUDE +USERINCLUDE ../inc + +LIBRARY euser.lib +LIBRARY apparc.lib +LIBRARY cone.lib +LIBRARY eikcore.lib +LIBRARY avkon.lib +LIBRARY efsrv.lib +LIBRARY oommonitor.lib +LIBRARY commondialogs.lib + +// End of File \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs +#include "../inc/appdefs/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp10.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp10.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs10 +#include "../inc/appdefs10/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp2.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs2 +#include "../inc/appdefs2/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp3.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp3.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs3 +#include "../inc/appdefs3/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp4.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp4.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs4 +#include "../inc/appdefs4/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp5.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp5.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs5 +#include "../inc/appdefs5/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp6.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp6.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs6 +#include "../inc/appdefs6/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp7.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp7.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs7 +#include "../inc/appdefs7/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp8.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp8.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs8 +#include "../inc/appdefs8/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp9.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp9.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs9 +#include "../inc/appdefs9/t_oomtestapp.hrh" +#include "t_oomtestapp.mmh" + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA01 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs10/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs10/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp10 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp10.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp10" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp10_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA0A + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs2/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs2/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp2 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp2.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp2" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp2_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA02 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs3/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs3/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp3 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp3.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp3" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp3_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA03 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs4/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs4/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp4 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp4.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp4" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp4_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA04 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs5/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs5/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp5 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp5.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp5" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp5_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA05 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs6/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs6/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp6 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp6.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp6" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp6_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA06 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs7/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs7/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp7 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp7.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp7" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp7_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA07 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs8/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs8/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp8 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp8.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp8" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp8_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA08 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs9/t_oomtestapp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs9/t_oomtestapp.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +#ifndef T_OOMTESTAPP_HRH +#define T_OOMTESTAPP_HRH + +#define T_OOM_TESTAPP_NAME t_oomtestapp9 +#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp9.exe +#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp9" +#define T_OOM_TESTAPP_NAME_REG t_oomtestapp9_reg +#define T_OOM_TESTAPP_UID 0xE6CFBA09 + +#endif // T_OOMTESTAPP_HRH + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappapplication.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappapplication.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,52 @@ +/* + ============================================================================ + Name : t_oomtestappApplication.h + Author : + Copyright : Your copyright notice + Description : Declares main application class. + ============================================================================ + */ + +#ifndef __T_OOMTESTAPPAPPLICATION_H__ +#define __T_OOMTESTAPPAPPLICATION_H__ + +// INCLUDES +#include + +// CLASS DECLARATION + +/** + * Ct_oomtestappApplication application class. + * Provides factory to create concrete document object. + * An instance of Ct_oomtestappApplication is the application part of the + * AVKON application framework for the t_oomtestapp example application. + */ +class Ct_oomtestappApplication : public CAknApplication + { +public: + Ct_oomtestappApplication(); + // Functions from base classes + + /** + * From CApaApplication, AppDllUid. + * @return Application's UID + */ + TUid AppDllUid() const; + + ~Ct_oomtestappApplication(); +protected: + // Functions from base classes + + /** + * From CApaApplication, CreateDocumentL. + * Creates Ct_oomtestappDocument document object. The returned + * pointer in not owned by the Ct_oomtestappApplication object. + * @return A pointer to the created document object. + */ + CApaDocument* CreateDocumentL(); + +private: + }; + +#endif // __T_OOMTESTAPPAPPLICATION_H__ +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappui.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappui.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,92 @@ +/* + ============================================================================ + Name : t_oomtestappAppUi.h + Author : + Copyright : Your copyright notice + Description : Declares UI class for application. + ============================================================================ + */ + +#ifndef __T_OOMTESTAPPAPPUI_h__ +#define __T_OOMTESTAPPAPPUI_h__ + +// INCLUDES +#include +#include + +// FORWARD DECLARATIONS +class Ct_oomtestappAppView; + +const TInt KKiloByte = 1024; + +// CLASS DECLARATION +/** + * Ct_oomtestappAppUi application UI class. + * Interacts with the user through the UI and request message processing + * from the handler class + */ +class Ct_oomtestappAppUi : public CAknAppUi + { +public: + + // Constructors and destructor + + /** + * ConstructL. + * 2nd phase constructor. + */ + void ConstructL(); + + /** + * Ct_oomtestappAppUi. + * C++ default constructor. This needs to be public due to + * the way the framework constructs the AppUi + */ + Ct_oomtestappAppUi(); + + /** + * ~Ct_oomtestappAppUi. + * Virtual Destructor. + */ + virtual ~Ct_oomtestappAppUi(); + + TInt AllocatedHeap() const; + + TPtrC Priority() const; + +private: + // Functions from base classes + + /** + * From CEikAppUi, HandleCommandL. + * Takes care of command handling. + * @param aCommand Command to be handled. + */ + void HandleCommandL(TInt aCommand); + + /** + * HandleStatusPaneSizeChange. + * Called by the framework when the application status pane + * size is changed. + */ + void HandleStatusPaneSizeChange(); + +private: + // Data + + /** + * The application view + * Owned by Ct_oomtestappAppUi + */ + Ct_oomtestappAppView* iAppView; + + ROomMonitorSession iOomSession; + + TAny* iMem; + + ROomMonitorSession::TOomPriority iPriority; + + }; + +#endif // __T_OOMTESTAPPAPPUI_h__ +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappview.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappview.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,81 @@ +/* + ============================================================================ + Name : t_oomtestappAppView.h + Author : + Copyright : Your copyright notice + Description : Declares view class for application. + ============================================================================ + */ + +#ifndef __T_OOMTESTAPPAPPVIEW_h__ +#define __T_OOMTESTAPPAPPVIEW_h__ + +// INCLUDES +#include + +class Ct_oomtestappAppUi; + +// CLASS DECLARATION +class Ct_oomtestappAppView : public CCoeControl + { +public: + // New methods + + /** + * NewL. + * Two-phased constructor. + * Create a Ct_oomtestappAppView object, which will draw itself to aRect. + * @param aRect The rectangle this view will be drawn to. + * @return a pointer to the created instance of Ct_oomtestappAppView. + */ + static Ct_oomtestappAppView* NewL(const TRect& aRect, Ct_oomtestappAppUi& aAppUi); + + /** + * ~Ct_oomtestappAppView + * Virtual Destructor. + */ + virtual ~Ct_oomtestappAppView(); + +public: + // Functions from base classes + + /** + * From CCoeControl, Draw + * Draw this Ct_oomtestappAppView to the screen. + * @param aRect the rectangle of this view that needs updating + */ + void Draw(const TRect& aRect) const; + + /** + * From CoeControl, SizeChanged. + * Called by framework when the view size is changed. + */ + virtual void SizeChanged(); + +private: + // Constructors + + /** + * ConstructL + * 2nd phase constructor. + * Perform the second phase construction of a + * Ct_oomtestappAppView object. + * @param aRect The rectangle this view will be drawn to. + */ + void ConstructL(const TRect& aRect); + + /** + * Ct_oomtestappAppView. + * C++ default constructor. + */ + Ct_oomtestappAppView( Ct_oomtestappAppUi& aAppUi ); + +private: + Ct_oomtestappAppUi& iAppUi; + + const CFont* iFont; // not own + + }; + +#endif // __T_OOMTESTAPPAPPVIEW_h__ +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappcmd.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappcmd.hrh Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,27 @@ +/* +============================================================================ + Name : t_oomtestappcmd.hrh + Author : + Copyright : Your copyright notice + Description : This file contains all the resources for the t_oomtestapp. +============================================================================ +*/ + + +#ifndef T_OOMTESTAPPCMD_HRH +#define T_OOMTESTAPPCMD_HRH + +enum TOomTestAppCmds + { + EOomTestAppSelectConfig = 1000, + EOomTestAppToggleSystem, + EOomTestAppAllocMemory, + EOomTestAppFreeMemory, + EOomTestAppAllocMemWithPermission, + EOomTestAppSetPriority, + EOomTestAppSetPriorityNormal, + EOomTestAppSetPriorityHigh, + EOomTestAppSetPriorityBusy + }; + +#endif // T_OOMTESTAPPCMD_HRH diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappdocument.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappdocument.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,91 @@ +/* + ============================================================================ + Name : t_oomtestappDocument.h + Author : + Copyright : Your copyright notice + Description : Declares document class for application. + ============================================================================ + */ + +#ifndef __T_OOMTESTAPPDOCUMENT_h__ +#define __T_OOMTESTAPPDOCUMENT_h__ + +// INCLUDES +#include + +// FORWARD DECLARATIONS +class Ct_oomtestappAppUi; +class CEikApplication; + +// CLASS DECLARATION + +/** + * Ct_oomtestappDocument application class. + * An instance of class Ct_oomtestappDocument is the Document part of the + * AVKON application framework for the t_oomtestapp example application. + */ +class Ct_oomtestappDocument : public CAknDocument + { +public: + // Constructors and destructor + + /** + * NewL. + * Two-phased constructor. + * Construct a Ct_oomtestappDocument for the AVKON application aApp + * using two phase construction, and return a pointer + * to the created object. + * @param aApp Application creating this document. + * @return A pointer to the created instance of Ct_oomtestappDocument. + */ + static Ct_oomtestappDocument* NewL(CEikApplication& aApp); + + /** + * NewLC. + * Two-phased constructor. + * Construct a Ct_oomtestappDocument for the AVKON application aApp + * using two phase construction, and return a pointer + * to the created object. + * @param aApp Application creating this document. + * @return A pointer to the created instance of Ct_oomtestappDocument. + */ + static Ct_oomtestappDocument* NewLC(CEikApplication& aApp); + + /** + * ~Ct_oomtestappDocument + * Virtual Destructor. + */ + virtual ~Ct_oomtestappDocument(); + +public: + // Functions from base classes + + /** + * CreateAppUiL + * From CEikDocument, CreateAppUiL. + * Create a Ct_oomtestappAppUi object and return a pointer to it. + * The object returned is owned by the Uikon framework. + * @return Pointer to created instance of AppUi. + */ + CEikAppUi* CreateAppUiL(); + +private: + // Constructors + + /** + * ConstructL + * 2nd phase constructor. + */ + void ConstructL(); + + /** + * Ct_oomtestappDocument. + * C++ default constructor. + * @param aApp Application creating this document. + */ + Ct_oomtestappDocument(CEikApplication& aApp); + + }; + +#endif // __T_OOMTESTAPPDOCUMENT_h__ +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappapplication.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappapplication.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,68 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// INCLUDE FILES +#include +#include "t_oomtestappDocument.h" +#include "t_oomtestappApplication.h" +#include "t_oomtestapp.hrh" + +// ============================ MEMBER FUNCTIONS =============================== + +Ct_oomtestappApplication::Ct_oomtestappApplication() + { + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappApplication::CreateDocumentL() +// Creates CApaDocument object +// ----------------------------------------------------------------------------- +// +CApaDocument* Ct_oomtestappApplication::CreateDocumentL() + { + return Ct_oomtestappDocument::NewL(*this); + } + +Ct_oomtestappApplication::~Ct_oomtestappApplication() + { + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappApplication::AppDllUid() +// Returns application UID +// ----------------------------------------------------------------------------- +// +TUid Ct_oomtestappApplication::AppDllUid() const + { + // Return the UID for the t_oomtestapp application + return TUid::Uid( T_OOM_TESTAPP_UID ); + } + +EXPORT_C CApaApplication* NewApplication() + { + return new Ct_oomtestappApplication; + } + +GLDEF_C TInt E32Main() + { + return EikStart::RunApplication(NewApplication); + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappui.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappui.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,260 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// INCLUDE FILES +#include +#include +#include +#include +#include +#include +#include "t_oomtestappcmd.hrh" +#include "t_oomtestappApplication.h" +#include "t_oomtestappAppUi.h" +#include "t_oomtestappAppView.h" + +_LIT( KOomConfigTargetFile, "c:\\private\\10207218\\oomconfig.xml" ); +_LIT( KOomPriorityNormal, "normal" ); +_LIT( KOomPriorityHigh, "high" ); +_LIT( KOomPriorityBusy, "busy" ); +const TInt KInitialAllocSize = 2048; + +// --------------------------------------------------------------------------- +// AskPathL +// --------------------------------------------------------------------------- +// +static TBool AskPathL( TDes& aPath ) + { + TParsePtr parse( aPath ); + TPtrC rootFolder = parse.DriveAndPath(); + TBool ret = AknCommonDialogsDynMem::RunSelectDlgLD( + AknCommonDialogsDynMem::EMemoryTypePhone | + AknCommonDialogsDynMem::EMemoryTypeMMC, + aPath, + rootFolder, + R_MEMORY_SELECTION, + R_FILE_SELECTION ); + return ret; + } + + +// ============================ MEMBER FUNCTIONS =============================== + + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppUi::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void Ct_oomtestappAppUi::ConstructL() + { + // Initialise app UI with standard value. + BaseConstructL(CAknAppUi::EAknEnableSkin); + + User::LeaveIfError( iOomSession.Connect() ); + + // Create view object + iAppView = Ct_oomtestappAppView::NewL(ClientRect(), *this); + + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppUi::Ct_oomtestappAppUi() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +// +Ct_oomtestappAppUi::Ct_oomtestappAppUi() + { + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppUi::~Ct_oomtestappAppUi() +// Destructor. +// ----------------------------------------------------------------------------- +// +Ct_oomtestappAppUi::~Ct_oomtestappAppUi() + { + delete iAppView; + iOomSession.Close(); + User::Free(iMem); + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppUi::HandleCommandL() +// Takes care of command handling. +// ----------------------------------------------------------------------------- +// +void Ct_oomtestappAppUi::HandleCommandL(TInt aCommand) + { + switch (aCommand) + { + case EOomTestAppSelectConfig: + { + TFileName fileName; + if ( AskPathL( fileName ) ) + { + RFs& fs( iEikonEnv->FsSession() ); + fs.MkDirAll( KOomConfigTargetFile ); // Ignore error + CFileMan* fileMan = CFileMan::NewL( fs ); + CleanupStack::PushL( fileMan ); + User::LeaveIfError( fileMan->Copy( fileName, KOomConfigTargetFile ) ); + CleanupStack::PopAndDestroy( fileMan ); + } + break; + } + case EOomTestAppToggleSystem: + { + iEikonEnv->SetSystem( !(iEikonEnv->IsSystem()) ); + iAppView->DrawDeferred(); + break; + } + case EOomTestAppAllocMemory: + { + TInt size(KInitialAllocSize); + CAknNumberQueryDialog* query = CAknNumberQueryDialog::NewL(size); + if ( query->ExecuteLD( R_ALLOC_QUERY ) ) + { + User::Free(iMem); + iMem = NULL; + size *= KKiloByte; + iMem = User::AllocL(size); + iAppView->DrawDeferred(); + } + break; + } + case EOomTestAppFreeMemory: + { + User::Free(iMem); + iMem = NULL; + iAppView->DrawDeferred(); + break; + } + case EOomTestAppAllocMemWithPermission: + { + TInt size(KInitialAllocSize); + CAknNumberQueryDialog* query = CAknNumberQueryDialog::NewL(size); + if ( query->ExecuteLD( R_ALLOC_QUERY ) ) + { + User::Free(iMem); + iMem = NULL; + size *= KKiloByte; + if ( iPriority != ROomMonitorSession::EOomPriorityBusy ) + { + // Prevent OOM to close this app while it is freeing memory + iOomSession.SetOomPriority(ROomMonitorSession::EOomPriorityBusy); + } + iOomSession.RequestFreeMemory( size ); + if ( iPriority != ROomMonitorSession::EOomPriorityBusy ) + { + // Allow OOM to close this app again + iOomSession.SetOomPriority(iPriority); + } + iMem = User::AllocL(size); + iAppView->DrawDeferred(); + } + break; + } + case EOomTestAppSetPriorityNormal: + { + iPriority = ROomMonitorSession::EOomPriorityNormal; + iOomSession.SetOomPriority(iPriority); + iAppView->DrawDeferred(); + break; + } + case EOomTestAppSetPriorityHigh: + { + iPriority = ROomMonitorSession::EOomPriorityHigh; + iOomSession.SetOomPriority(iPriority); + iAppView->DrawDeferred(); + break; + } + case EOomTestAppSetPriorityBusy: + { + iPriority = ROomMonitorSession::EOomPriorityBusy; + iOomSession.SetOomPriority(iPriority); + iAppView->DrawDeferred(); + break; + } + case EEikCmdExit: + case EAknSoftkeyExit: // Fall through + { + Exit(); + break; + } + default: + { + break; + } + } + } + +// ----------------------------------------------------------------------------- +// Called by the framework when the application status pane +// size is changed. Passes the new client rectangle to the +// AppView +// ----------------------------------------------------------------------------- +// +void Ct_oomtestappAppUi::HandleStatusPaneSizeChange() + { + iAppView->SetRect(ClientRect()); + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppUi::AllocatedHeap +// ----------------------------------------------------------------------------- +// +TInt Ct_oomtestappAppUi::AllocatedHeap() const + { + TInt ret( 0 ); + RHeap& heap( User::Heap() ); + heap.AllocSize( ret ); + return ret; + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppUi::Priority +// ----------------------------------------------------------------------------- +// +TPtrC Ct_oomtestappAppUi::Priority() const + { + switch ( iPriority ) + { + case ROomMonitorSession::EOomPriorityNormal: + { + return KOomPriorityNormal(); + } + case ROomMonitorSession::EOomPriorityHigh: + { + return KOomPriorityHigh(); + } + case ROomMonitorSession::EOomPriorityBusy: + { + return KOomPriorityBusy(); + } + default: + { + break; + } + } + return KNullDesC(); + } + + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappview.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,134 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// INCLUDE FILES +#include +#include +#include +#include "t_oomtestappAppUi.h" +#include "t_oomtestappAppView.h" + +_LIT( KTextSystemOn, "System on" ); +_LIT( KTextSystemOff, "System off" ); +const TInt KTextBufferSize = 100; + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppView::NewL() +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +Ct_oomtestappAppView* Ct_oomtestappAppView::NewL(const TRect& aRect, Ct_oomtestappAppUi& aAppUi) + { + Ct_oomtestappAppView* self = new ( ELeave ) Ct_oomtestappAppView( aAppUi ); + CleanupStack::PushL(self); + self->ConstructL( aRect ); + CleanupStack::Pop(self); + return self; + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppView::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void Ct_oomtestappAppView::ConstructL(const TRect& aRect) + { + // Create a window for this application view + CreateWindowL(); + + // Set the windows size + SetRect(aRect); + + iFont = AknLayoutUtils::FontFromId( EAknLogicalFontPrimarySmallFont ); + + // Activate the window, which makes it ready to be drawn + ActivateL(); + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppView::Ct_oomtestappAppView() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +// +Ct_oomtestappAppView::Ct_oomtestappAppView( Ct_oomtestappAppUi& aAppUi ) : + iAppUi( aAppUi ) + { + // No implementation required + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppView::~Ct_oomtestappAppView() +// Destructor. +// ----------------------------------------------------------------------------- +// +Ct_oomtestappAppView::~Ct_oomtestappAppView() + { + // No implementation required + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppView::Draw() +// Draws the display. +// ----------------------------------------------------------------------------- +// +void Ct_oomtestappAppView::Draw(const TRect& /*aRect*/) const + { + // Get the standard graphics context + CWindowGc& gc = SystemGc(); + + // Gets the control's extent + TRect drawRect(Rect()); + + // Clears the screen + gc.Clear(drawRect); + + gc.UseFont(iFont); + + TBuf buffer; + TInt allocSize( iAppUi.AllocatedHeap() / KKiloByte ); + TPtrC priority( iAppUi.Priority() ); + if ( CEikonEnv::Static()->IsSystem() ) + { + buffer.Format( _L("%S : Heap %d KB : Priority %S"), + &(KTextSystemOn()), allocSize, &priority ); + } + else + { + buffer.Format( _L("%S : Heap %d KB : Priority %S"), + &(KTextSystemOff()), allocSize, &priority ); + } + TPoint textPos( 0, drawRect.Height() / 2 ); + gc.DrawText( buffer, textPos ); + gc.DiscardFont(); + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappAppView::SizeChanged() +// Called by framework when the view size is changed. +// ----------------------------------------------------------------------------- +// +void Ct_oomtestappAppView::SizeChanged() + { + DrawDeferred(); + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappdocument.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappdocument.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,96 @@ +/* +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// INCLUDE FILES +#include "t_oomtestappAppUi.h" +#include "t_oomtestappDocument.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// Ct_oomtestappDocument::NewL() +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +Ct_oomtestappDocument* Ct_oomtestappDocument::NewL(CEikApplication& aApp) + { + Ct_oomtestappDocument* self = NewLC(aApp); + CleanupStack::Pop(self); + return self; + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappDocument::NewLC() +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +Ct_oomtestappDocument* Ct_oomtestappDocument::NewLC(CEikApplication& aApp) + { + Ct_oomtestappDocument* self = new (ELeave) Ct_oomtestappDocument(aApp); + + CleanupStack::PushL(self); + self->ConstructL(); + return self; + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappDocument::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void Ct_oomtestappDocument::ConstructL() + { + // No implementation required + } + +// ----------------------------------------------------------------------------- +// Ct_oomtestappDocument::Ct_oomtestappDocument() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +// +Ct_oomtestappDocument::Ct_oomtestappDocument(CEikApplication& aApp) : + CAknDocument(aApp) + { + // No implementation required + } + +// --------------------------------------------------------------------------- +// Ct_oomtestappDocument::~Ct_oomtestappDocument() +// Destructor. +// --------------------------------------------------------------------------- +// +Ct_oomtestappDocument::~Ct_oomtestappDocument() + { + // No implementation required + } + +// --------------------------------------------------------------------------- +// Ct_oomtestappDocument::CreateAppUiL() +// Constructs CreateAppUi. +// --------------------------------------------------------------------------- +// +CEikAppUi* Ct_oomtestappDocument::CreateAppUiL() + { + // Create the application user interface, and return a pointer to it; + // the framework takes ownership of this object + return new (ELeave) Ct_oomtestappAppUi; + } + +// End of File diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/adv/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/adv/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/adv/conf/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/adv/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/adv/data/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/adv/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/adv/group/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/adv/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/adv/init/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/adv/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/BWINS/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/basic/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/BWINS/MT_OomMonitorU.DEF --- a/sysresmonitoring/oommonitor/tsrc/public/basic/BWINS/MT_OomMonitorU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -EXPORTS - ?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * __cdecl CreateTestSuiteL(void) diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/basic/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/EABI/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/basic/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/EABI/MT_OomMonitorU.DEF --- a/sysresmonitoring/oommonitor/tsrc/public/basic/EABI/MT_OomMonitorU.DEF Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - _Z16CreateTestSuiteLv @ 1 NONAME - diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_COomMonitorPlugin.cpp --- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_COomMonitorPlugin.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -// CLASS HEADER -#include "MT_COomMonitorPlugin.h" - -// EXTERNAL INCLUDES -#include -#include -#include -#include - - - -MT_COomMonitorPlugin* MT_COomMonitorPlugin::NewL() - { - MT_COomMonitorPlugin* self = MT_COomMonitorPlugin::NewLC(); - CleanupStack::Pop(); - - return self; - } - -MT_COomMonitorPlugin* MT_COomMonitorPlugin::NewLC() - { - MT_COomMonitorPlugin* self = new( ELeave ) MT_COomMonitorPlugin(); - CleanupStack::PushL( self ); - - self->ConstructL(); - - return self; - } - -// Destructor (virtual by CBase) -MT_COomMonitorPlugin::~MT_COomMonitorPlugin() - { - } - -// Default constructor -MT_COomMonitorPlugin::MT_COomMonitorPlugin() - { - } - -// Second phase construct -void MT_COomMonitorPlugin::ConstructL() - { - // The ConstructL from the base class CEUnitTestSuiteClass must be called. - // It generates the test case table. - CEUnitTestSuiteClass::ConstructL(); - } - -// METHODS - -void MT_COomMonitorPlugin::BasicSetupL( ) - { - iMonitor = CMemoryMonitor::NewL(); - } - - -void MT_COomMonitorPlugin::BasicTeardown( ) - { - delete iMonitor; - iMonitor = NULL; - } - -void MT_COomMonitorPlugin::SetupL( ) - { - BasicSetupL(); - - const TUid KMyAppUid = { 0x01234567}; - iCOomMonitorPlugin = CAppOomMonitorPlugin::NewL( KMyAppUid ); - } - - -void MT_COomMonitorPlugin::Teardown( ) - { - BasicTeardown(); - - delete iCOomMonitorPlugin; - iCOomMonitorPlugin = NULL; - } - - -void MT_COomMonitorPlugin::T_CAppOomMonitorPlugin_NewLL( ) - { - const TUid KMyAppUid = { 0x01234567}; - CAppOomMonitorPlugin* plugin = CAppOomMonitorPlugin::NewL( KMyAppUid ); - CleanupStack::PushL( plugin ); - - EUNIT_ASSERT_DESC( plugin, "CAppOomMonitorPlugin instance not created!" ); - CleanupStack::PopAndDestroy( plugin ); - } - -void MT_COomMonitorPlugin::T_COomMonitorPlugin_FreeRamL( ) - { - // private function in CAppOomMonitorPlugin, couldn't be tested - //iCOomMonitorPlugin->FreeRam( ); - } - -void MT_COomMonitorPlugin::T_COomMonitorPlugin_MemoryGoodL( ) - { - // private function in CAppOomMonitorPlugin, couldn't be tested - //iCOomMonitorPlugin->MemoryGood( ); - } - -void MT_COomMonitorPlugin::T_COomMonitorPlugin_FsSessionL( ) - { - iCOomMonitorPlugin->FsSession( ); - } - -void MT_COomMonitorPlugin::T_COomMonitorPlugin_WsSessionL( ) - { - iCOomMonitorPlugin->WsSession( ); - } - -void MT_COomMonitorPlugin::T_COomMonitorPlugin_ExtensionInterfaceL( ) - { - CTestOomMonitorPlugin* plugin = new(ELeave) CTestOomMonitorPlugin; - CleanupStack::PushL(plugin); - plugin->ConstructL(); - - const TUid KTestUid = { 0x01234567 }; // a nonsense UID for testing - TAny* any = NULL; - plugin->ExtensionInterface( KTestUid, any ); - - CleanupStack::PopAndDestroy(plugin); - } - - -// TEST TABLE -EUNIT_BEGIN_TEST_TABLE( - MT_COomMonitorPlugin, - "COomMonitorPlugin test suite", - "MODULE" ) - -EUNIT_TEST( - "NewL - test", - "COomMonitorPlugin", - "CAppOomMonitorPlugin NewL and COomMonitorPlugin Constructor, Destructor", - "FUNCTIONALITY", - BasicSetupL, T_CAppOomMonitorPlugin_NewLL, BasicTeardown) - -EUNIT_TEST( - "FsSession - test", - "COomMonitorPlugin", - "FsSession", - "FUNCTIONALITY", - SetupL, T_COomMonitorPlugin_FsSessionL, Teardown) - -EUNIT_TEST( - "WsSession - test", - "COomMonitorPlugin", - "WsSession", - "FUNCTIONALITY", - SetupL, T_COomMonitorPlugin_WsSessionL, Teardown) - -EUNIT_TEST( - "ExtensionInterface - test", - "COomMonitorPlugin", - "ExtensionInterface", - "FUNCTIONALITY", - SetupL, T_COomMonitorPlugin_ExtensionInterfaceL, Teardown) - -EUNIT_END_TEST_TABLE - -// END OF FILE diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_COomMonitorPlugin.h --- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_COomMonitorPlugin.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,122 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __MT_COOMMONITORPLUGIN_H__ -#define __MT_COOMMONITORPLUGIN_H__ - -// EXTERNAL INCLUDES -#include -#include -#include - -// INTERNAL INCLUDES - - -// FORWARD DECLARATIONS - - -// CLASS DEFINITION -NONSHARABLE_CLASS( MT_COomMonitorPlugin ) - : public CEUnitTestSuiteClass - { - public: // Constructors and destructors - - /** - * Two phase construction - */ - static MT_COomMonitorPlugin* NewL(); - static MT_COomMonitorPlugin* NewLC(); - /** - * Destructor - */ - ~MT_COomMonitorPlugin(); - - private: // Constructors and destructors - - MT_COomMonitorPlugin(); - void ConstructL(); - - private: // New methods - - - void SetupL(); - - void Teardown(); - - void BasicSetupL(); - - void BasicTeardown(); - - void T_CAppOomMonitorPlugin_NewLL(); - - void T_COomMonitorPlugin_FreeRamL(); - - void T_COomMonitorPlugin_MemoryGoodL(); - - void T_COomMonitorPlugin_FsSessionL(); - - void T_COomMonitorPlugin_WsSessionL(); - - void T_COomMonitorPlugin_ExtensionInterfaceL(); - - - private: // Data - - CAppOomMonitorPlugin* iCOomMonitorPlugin; - CMemoryMonitor* iMonitor; - - EUNIT_DECLARE_TEST_TABLE; - - }; - - -NONSHARABLE_CLASS( CTestOomMonitorPlugin ) : public COomMonitorPlugin - { -public: - CTestOomMonitorPlugin() - { - } - - ~CTestOomMonitorPlugin() - { - } - - void ConstructL() - { - COomMonitorPlugin::ConstructL(); - } - -public: - void FreeRam() - { - } - - void MemoryGood() - { - } - - void ExtensionInterface(TUid aInterfaceId, TAny*& aImplementaion) - { - COomMonitorPlugin::ExtensionInterface(aInterfaceId, aImplementaion); - } - }; - - -#endif // __MT_COOMMONITORPLUGIN_H__ - -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor.cpp --- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,167 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -// CLASS HEADER -#include "MT_OomMonitor.h" - -// EXTERNAL INCLUDES -#include -#include -#include - -// INTERNAL INCLUDES - - -// CONSTRUCTION -MT_OomMonitor* MT_OomMonitor::NewL() - { - MT_OomMonitor* self = MT_OomMonitor::NewLC(); - CleanupStack::Pop(); - - return self; - } - -MT_OomMonitor* MT_OomMonitor::NewLC() - { - MT_OomMonitor* self = new( ELeave ) MT_OomMonitor(); - CleanupStack::PushL( self ); - - self->ConstructL(); - - return self; - } - -// Destructor (virtual by CBase) -MT_OomMonitor::~MT_OomMonitor() - { - } - -// Default constructor -MT_OomMonitor::MT_OomMonitor() - { - } - -// Second phase construct -void MT_OomMonitor::ConstructL() - { - // The ConstructL from the base class CEUnitTestSuiteClass must be called. - // It generates the test case table. - CEUnitTestSuiteClass::ConstructL(); - } - -// METHODS - -void MT_OomMonitor::EmptySetupL( ) - { - } - -void MT_OomMonitor::EmptyTeardown( ) - { - } - -void MT_OomMonitor::SetupL( ) - { - iROomMonitorSession.Connect(); - } - - -void MT_OomMonitor::Teardown( ) - { - iROomMonitorSession.Close(); - } - - -void MT_OomMonitor::T_ROomMonitorSession_ConnectL( ) - { - EUNIT_ASSERT_DESC( iROomMonitorSession.Connect( ) == KErrNone, "Session should have been connected"); - iROomMonitorSession.Close(); - } - -void MT_OomMonitor::T_ROomMonitorSession_RequestFreeMemoryL( ) - { - TInt rtn = iROomMonitorSession.RequestFreeMemory( 1024 ); - EUNIT_ASSERT_DESC( rtn == KErrNone || rtn == KErrNoMemory, "OOM monitor should free 1024 bytes"); - } - -void MT_OomMonitor::T_ROomMonitorSession_RequestFreeMemory2L( ) - { - TRequestStatus status; - iROomMonitorSession.RequestFreeMemory( 1024, status ); - User::WaitForRequest( status ); - EUNIT_ASSERT_DESC( status == KErrNone || status == KErrNoMemory, "OOM monitor should free 1024 bytes"); - } - -void MT_OomMonitor::T_ROomMonitorSession_CancelRequestFreeMemoryL( ) - { - TRequestStatus status; - iROomMonitorSession.RequestFreeMemory( 1024, status ); - iROomMonitorSession.CancelRequestFreeMemory( ); - User::WaitForRequest( status ); - } - -void MT_OomMonitor::T_ROomMonitorSession_ThisAppIsNotExitingL( ) - { - iROomMonitorSession.ThisAppIsNotExiting( 1 ); - } - - -// TEST TABLE -EUNIT_BEGIN_TEST_TABLE( - MT_OomMonitor, - "ROomMonitorSession test suite", - "MODULE" ) - -EUNIT_TEST( - "Connect - test", - "ROomMonitorSession", - "Connect", - "FUNCTIONALITY", - EmptySetupL, T_ROomMonitorSession_ConnectL, EmptyTeardown) - -EUNIT_TEST( - "RequestFreeMemory -synchronous test", - "ROomMonitorSession", - "RequestFreeMemory - synchronous version", - "FUNCTIONALITY", - SetupL, T_ROomMonitorSession_RequestFreeMemoryL, Teardown) - -EUNIT_TEST( - "RequestFreeMemory - asynchronous test", - "ROomMonitorSession", - "RequestFreeMemory - asynchronous version", - "FUNCTIONALITY", - SetupL, T_ROomMonitorSession_RequestFreeMemory2L, Teardown) - -EUNIT_TEST( - "CancelRequestFreeMemory - test", - "ROomMonitorSession", - "CancelRequestFreeMemory", - "FUNCTIONALITY", - SetupL, T_ROomMonitorSession_CancelRequestFreeMemoryL, Teardown) - -EUNIT_TEST( - "ThisAppIsNotExiting -test", - "ROomMonitorSession", - "ThisAppIsNotExiting", - "FUNCTIONALITY", - SetupL, T_ROomMonitorSession_ThisAppIsNotExitingL, Teardown) - - -EUNIT_END_TEST_TABLE - -// END OF FILE diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor.h --- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor.h Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __MT_OOMMONITOR_H__ -#define __MT_OOMMONITOR_H__ - -// EXTERNAL INCLUDES -#include -#include -#include - -// INTERNAL INCLUDES - - -// FORWARD DECLARATIONS - - -// CLASS DEFINITION -/** - * Auto-generated EUnit test suite - * - */ -NONSHARABLE_CLASS( MT_OomMonitor ) - : public CEUnitTestSuiteClass - { - public: // Constructors and destructors - - /** - * Two phase construction - */ - static MT_OomMonitor* NewL(); - static MT_OomMonitor* NewLC(); - /** - * Destructor - */ - ~MT_OomMonitor(); - - private: // Constructors and destructors - - MT_OomMonitor(); - void ConstructL(); - - private: // New methods - - void EmptySetupL(); - - void EmptyTeardown(); - - void SetupL(); - - void Teardown(); - - void T_ROomMonitorSession_ConnectL(); - - void T_ROomMonitorSession_RequestFreeMemoryL(); - - void T_ROomMonitorSession_RequestFreeMemory2L(); - - void T_ROomMonitorSession_CancelRequestFreeMemoryL(); - - void T_ROomMonitorSession_ThisAppIsNotExitingL(); - - - private: // Data - - ROomMonitorSession iROomMonitorSession; - EUNIT_DECLARE_TEST_TABLE; - - }; - -#endif // __MT_OOMMONITOR_H__ - -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor_DllMain.cpp --- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor_DllMain.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -// CLASS HEADER -#include "MT_OomMonitor.h" -#include "MT_COomMonitorPlugin.h" - -// EXTERNAL INCLUDES -#include - -EXPORT_C MEUnitTest* CreateTestSuiteL() - { - CEUnitTestSuite* rootSuite = CEUnitTestSuite::NewLC( _L("OomMonitor API tests") ); - - rootSuite->AddL( MT_OomMonitor::NewLC() ); - CleanupStack::Pop(); - - rootSuite->AddL( MT_COomMonitorPlugin::NewLC() ); - CleanupStack::Pop(); - - CleanupStack::Pop( rootSuite ); - return rootSuite; - } -/* -#ifndef EKA2 -GLDEF_C TInt E32Dll( TDllReason ) - { - return KErrNone; - } -#endif -*/ -// END OF FILE diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/stub_MemoryMonitor.cpp --- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/stub_MemoryMonitor.cpp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -#include -#include - -CMemoryMonitor* CMemoryMonitor::NewL() - { - CMemoryMonitor* self = new(ELeave) CMemoryMonitor(); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - return self; - } - -CMemoryMonitor::CMemoryMonitor():iCurrentTask(iWs) - { - SetMemoryMonitorTls(this); - } - -void CMemoryMonitor::ConstructL() - { - - } - -CMemoryMonitor::~CMemoryMonitor() - { - } diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/conf/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/basic/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/data/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/basic/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/group/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/basic/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/group/MT_OomMonitor.mmp --- a/sysresmonitoring/oommonitor/tsrc/public/basic/group/MT_OomMonitor.mmp Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -#include - -TARGET MT_OomMonitor.dll -TARGETTYPE dll -UID 0x1000af5a 0x01700000 - -CAPABILITY ALL -TCB -DRM -VENDORID VID_DEFAULT - -SOURCEPATH ../MT_OomMonitor -SOURCE MT_OomMonitor.cpp -SOURCE MT_COomMonitorPlugin.cpp -SOURCE stub_MemoryMonitor.cpp - -// Sources required by the test suite -SOURCEPATH ../MT_OomMonitor -SOURCE MT_OomMonitor_DllMain.cpp - -USERINCLUDE ../MT_OomMonitor - -MW_LAYER_SYSTEMINCLUDE - -SYSTEMINCLUDE /epoc32/include/Digia/EUnit - -// System include folders required by the tested code - - -LIBRARY EUnit.lib -LIBRARY EUnitUtil.lib -LIBRARY euser.lib -LIBRARY oommonitor.lib -LIBRARY ws32.lib -LIBRARY apgrfx.lib // TApaTask - -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/group/bld.inf --- a/sysresmonitoring/oommonitor/tsrc/public/basic/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -/* -* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -PRJ_PLATFORMS - ARMV5 GCCE WINSCW - -PRJ_EXPORTS - -PRJ_MMPFILES - - -PRJ_TESTMMPFILES -MT_OomMonitor.mmp - - -// End of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/init/Distribution.Policy.S60 --- a/sysresmonitoring/oommonitor/tsrc/public/basic/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 sysresmonitoring/oommonitor/tsrc/public/basic/test.xml --- a/sysresmonitoring/oommonitor/tsrc/public/basic/test.xml Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ - - - oommonitor Automated Tests - - - - - - - - - - - - - - - - - - - makedir - - - - - - - - - install - - - - - - - - - - - execute - - - - - - - - makedir - - - - - - - - execute - - - - - - - - - - - execute - - - - - - - - - fetch-log - - - - - - - - - - - ATS3Drop/images/sydo_oommonitor_ats3_image.fpsx - ATS3Drop/images/sydo_oommonitor_ats3_image_udaerase.fpsx - - ATS3Drop/armv5_urel/MT_OomMonitor.dll - - - - SendEmailAction - - - - - - - - - - FileStoreAction - - - - - diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/Distribution.Policy.S60 --- a/systemsettings/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/Distribution.Policy.S60 --- a/systemsettings/GSAccessoryPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/cenrep/Distribution.Policy.S60 --- a/systemsettings/GSAccessoryPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/conf/distribution.policy.s60 --- a/systemsettings/GSAccessoryPlugin/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/data/Distribution.Policy.S60 --- a/systemsettings/GSAccessoryPlugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss --- a/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Mon Feb 08 13:38:38 2010 +0000 +++ b/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Thu Jun 24 13:52:58 2010 +0100 @@ -68,11 +68,10 @@ { menu_pane = r_gs_menu_item_help; }, - //fix for single click and removing "set as default" from option in menu - /* MENU_TITLE + MENU_TITLE { menu_pane = r_acc_menu_item_set_as_default; - },*/ + }, MENU_TITLE { menu_pane = r_gs_menu_item_open; @@ -84,8 +83,7 @@ // R_ACC_MENU_ITEM_SET_AS_DEFAULT //---------------------------------------------------------------------------- // -//fix for single click and removing "set as default" from option in menu -/* RESOURCE MENU_PANE r_acc_menu_item_set_as_default +RESOURCE MENU_PANE r_acc_menu_item_set_as_default { items = { @@ -96,7 +94,7 @@ flags = EEikMenuItemSpecific; } }; - } */ + } //---------------------------------------------------------------------------- // R_ACC_MAIN_VIEW_CAPTION diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/group/GSAccessoryPlugin.mmp --- a/systemsettings/GSAccessoryPlugin/group/GSAccessoryPlugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/systemsettings/GSAccessoryPlugin/group/GSAccessoryPlugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -104,3 +104,5 @@ #endif //__WINS LIBRARY hlplch.lib // "Help" options menu LIBRARY profileeng.lib // Profile Engine + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/group/bld.inf --- a/systemsettings/GSAccessoryPlugin/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/systemsettings/GSAccessoryPlugin/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -23,9 +23,9 @@ PRJ_EXPORTS ../cenrep/AccessoriesCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH( accessoriescrkeys.h ) -../rom/GSAccsPlugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( gsaccsplugin.iby ) -../rom/GSAccsPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( gsaccspluginresources.iby ) -../loc/GSAccsPlugin.loc MW_LAYER_LOC_EXPORT_PATH( gsaccsplugin.loc ) +// ../rom/GSAccsPlugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( gsaccsplugin.iby ) +// ../rom/GSAccsPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( gsaccspluginresources.iby ) +// ../loc/GSAccsPlugin.loc MW_LAYER_LOC_EXPORT_PATH( gsaccsplugin.loc ) // Configurations ../conf/GSAccessoriesPlugin.confml MW_LAYER_CONFML(gsaccessoriesplugin.confml) @@ -35,7 +35,7 @@ ../conf/GSAccessoriesPlugin_10207194.crml MW_LAYER_CRML(gsaccessoriesplugin_10207194.crml) PRJ_MMPFILES -GSAccessoryPlugin.mmp +// GSAccessoryPlugin.mmp PRJ_EXTENSIONS START EXTENSION s60/mifconv diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/group/distribution.policy.s60 --- a/systemsettings/GSAccessoryPlugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/inc/Distribution.Policy.S60 --- a/systemsettings/GSAccessoryPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/loc/Distribution.Policy.S60 --- a/systemsettings/GSAccessoryPlugin/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/rom/distribution.policy.s60 --- a/systemsettings/GSAccessoryPlugin/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/GSAccessoryPlugin/src/Distribution.Policy.S60 --- a/systemsettings/GSAccessoryPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorplugin.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorplugin.pro Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,26 @@ +# ##################################################################### +# Automatically generated by qmake (2.01a) Thu Mar 25 11:36:36 2010 +# ##################################################################### +TEMPLATE = lib +TARGET = accindicatorplugin +CONFIG += plugin +CONFIG += hb +INCLUDEPATH += . +DEPENDPATH += . +INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE + +# Input +HEADERS += inc/accindicator.h +SOURCES += src/accindicator.cpp +RESOURCES = +symbian { + TARGET.EPOCALLOWDLLDATA = 1 + TARGET.CAPABILITY = CAP_GENERAL_DLL + SYMBIAN_PLATFORMS = WINSCW ARMV5 + TARGET.UID3 = 0x2001FE6C + pluginstub.sources = accindicatorplugin.dll + pluginstub.path = /resource/plugins/indicators + DEPLOYMENT += pluginstub +} +BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include " \ + "rom/accindicatorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(accindicatorplugin.iby)" diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/accindicatorsettings.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/accindicatorsettings.pro Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,43 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Sun Apr 11 14:15:37 2010 +###################################################################### +TEMPLATE = app +TARGET = +DEPENDPATH += . inc resources src +INCLUDEPATH += . +CONFIG += Hb +INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE + +# Input +HEADERS += inc/tvoutview.h inc/headsetttyview.h +SOURCES += src/main.cpp src/tvoutview.cpp src/headsetttyview.cpp +RESOURCES += resources/resources.qrc + +LIBS += -lcentralrepository +LIBS += -laccclient +LIBS += -lacccontrol + +symbian { +TARGET.UID3 = 0x2002EA56 +SYMBIAN_PLATFORMS = WINSCW ARMV5 + +incBlock = \ + "$${LITERAL_HASH}if ( defined (__WINS__) || defined (WINSCW) )" \ + "LIBRARY gsserverenginestub.lib " \ + "$${LITERAL_HASH}else " \ + "LIBRARY gsserverengine.lib " \ + "$${LITERAL_HASH}endif" + + MMP_RULES += incBlock + } + +BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include " \ + "rom/accindicatorsettings.iby CORE_MW_LAYER_IBY_EXPORT_PATH(accindicatorsettings.iby)" \ + "conf/GSAccessoriesPlugin.confml MW_LAYER_CONFML(gsaccessoriesplugin.confml)" \ + "conf/GSAccessoriesPlugin_101F877D.crml MW_LAYER_CRML(gsaccessoriesplugin_101F877D.crml)" \ + "conf/GSAccessoriesPlugin_101F8779.crml MW_LAYER_CRML(gsaccessoriesplugin_101F8779.crml)" \ + "conf/GSAccessoriesPlugin_1020730B.crml MW_LAYER_CRML(gsaccessoriesplugin_1020730B.crml)" \ + "conf/GSAccessoriesPlugin_10207194.crml MW_LAYER_CRML(gsaccessoriesplugin_10207194.crml)" \ + "cenrep/AccessoriesCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH( accessoriescrkeys.h )" \ + "resources/wired_accessory.svg /epoc32/data/z/resource/accindicator/wired_accessory.svg" \ + "resources/wireless_accessory.svg /epoc32/data/z/resource/accindicator/wireless_accessory.svg" \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/cenrep/AccessoriesCRKeys.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/cenrep/AccessoriesCRKeys.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,311 @@ +/* +* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Header file for central repository keys, used in GSAccessoryPlugin, and GSServerEngine +* +*/ + +#ifndef ACCESSORIESCRKEYS_H +#define ACCESSORIESCRKEYS_H + +#include + +/** +* Accessory settings CR UID +*/ +const TUid KCRUidAccessorySettings = {0x101F8779}; + +/** +* Automatic answer in carkit +* +* Possible values are: +* 0 = No automatic answer in headset +* 1 = Automatic answer in headset +*/ +const TUint32 KSettingsCarKitAutomaticAnswer = 0x00000001; + +/** +* Automatic answer in headset +* +* Possible values are: +* 0 = No automatic answer in headset +* 1 = Automatic answer in headset +*/ +const TUint32 KSettingsHeadsetAutomaticAnswer = 0x00000002; + +/** +* Automatic answer in bluetooth +* +* Possible values are: +* 0 = No automatic answer in bluetooth +* 1 = Automatic answer in bluetooth +*/ +const TUint32 KSettingsBTAudioAutomaticAnswer = 0x00000003; + +/** +* Information about if the loopset is in use. +* +* Possible values are: +* 0 = Loopset is not in use +* 1 = Loopset is in use +*/ +const TUint32 KSettingsLoopsetInUse = 0x00000004; + +/** +* Automatic answer in loopset +* +* Possible values are: +* 0 = No automatic answer in loopset +* 1 = Automatic answer in loopset +*/ +const TUint32 KSettingsLoopsetAutomaticAnswer = 0x00000005; + +/** +* Information about which accessory is in use. +* +* Possible values are: +* 0 = headset +* 1 = loopset +* 2 = TTY +**/ +const TUint32 KSettingsAccessoryInUse = 0x00000006; + +/** +* Automatic answer in music stand +* +* Possible values are: +* 0 = No automatic answer in music stand +* 1 = Automatic answer in music stand +*/ +const TUint32 KSettingsMusicStandAutomaticAnswer = 0x00000007; + +/** +* Automatic answer in car kit +* +* Possible values are: +* 0 = No automatic answer in car kit +* 1 = Automatic answer in car kit +*/ +const TUint32 KSettingsTTYAutomaticAnswer = 0x00000008; + +/** +* Use loopset +* +* Possible values are: +* 0 = Loopset not in use +* 1 = Loopset in use +*/ +const TUint32 KSettingsUseLoopset = 0x00000009; + +/** +* Wireless Carkit automatic answer +* +* Possible values are: +* 0 = Automatic answer is off +* 1 = Automatic answer is on +*/ +const TUint32 KSettingsWirelessCarkitAutomaticAnswer = 0x00000010; + +/** +* Headset Ringing Tone Routing +* +* Possible values are: +* 0 = Routing is Headset and Handset +* 1 = Routing is Headset +*/ +const TUint32 KSettingsHeadsetRingingToneRouting = 0x00000011; + +/** +* Headphones Ringing Tone Routing +* +* Possible values are: +* 0 = Routing is Headset and Handset +* 1 = Routing is Headset +*/ +const TUint32 KSettingsHeadphonesRingingToneRouting = 0x00000012; + +/** +* Default Accessory. +* Possible values are: +* 0 = Headset +* 1 = Headphones +* 2 = Wired Car kit +* 3 = Wireless carkit +* 4 = Music Stand +* 5 = Tvout +* 6 = Loopset +* 7 = Textphone +*/ +const TUint32 KSettingsAccDefaultInfo = 0x00000013; + +/** +* Wired carkit accessory support +* +* Possible values are: +* 0 = accessory is not supported +* 1 = accessory is supported +*/ +const TUint32 KSettingsAccWiredCarkitSupported = 0x00000014; + +/** +* Wireless carkit accessory support +* +* Possible values are: +* 0 = accessory is not supported +* 1 = accessory is supported +*/ +const TUint32 KSettingsAccWirelessCarkitSupported = 0x00000015; + +/** +* Loopset accessory support +* +* Possible values are: +* 0 = accessory is not supported +* 1 = accessory is supported +*/ +const TUint32 KSettingsAccLoopsetSupported = 0x00000016; + +/** +* Profile settings CR UID. +*/ +const TUid KCRUidProfileSettings = {0x101F877D}; + +/** +* Bluetooth default profile, profile id. +* +*/ +const TUint32 KSettingsBTDefaultProfile = 0x00000001; + +/** +* Headset default profile, profile id. +*/ +const TUint32 KSettingsHeadsetDefaultProfile = 0x00000002; + +/** +* TTY default profile, profile id. +*/ +const TUint32 KSettingsTTYDefaultProfile = 0x00000003; + +/** +* Loopset default profile, profile id. +*/ +const TUint32 KSettingsLoopsetDefaultProfile = 0x00000004; + +/** +* Music Stand default profile, profile id. +*/ +const TUint32 KSettingsMusicStandDefaultProfile = 0x00000005; + +/** +* Car Kit default profile, profile id. +*/ +const TUint32 KSettingsCarKitDefaultProfile = 0x00000006; + +/** +* Wireless Car Kit default profile, profile id. +*/ +const TUint32 KSettingsWirelessCarkitDefaultProfile = 0x00000007; + +/** +* Headphones default profile, profile id. +*/ +const TUint32 KSettingsHeadphonesDefaultProfile = 0x00000008; + +/** +* Tv out default profile, profile id. +*/ +const TUint32 KSettingsTvOutDefaultProfile = 0x00000009; + +/** +* Settings for Lights features +*/ +const TUid KCRUidAccessoryLightSettings = {0x10207194}; + +/** +* Defines the display light duration for Music Stand accessory. +* +* 0 = (Normal) +* 1 = (Always ON) +*/ +const TUint32 KSettingsMusicStandLights = 0x00000001; + +/** +* Defines the display light duration for Car kit accessory. +* +* 0 = (Normal) +* 1 = (Always ON) +*/ +const TUint32 KSettingsCarKitLights = 0x00000002; + + +/** Following keys belong to category KCRUidTvoutSettings */ + +/** +* TV-out settings CR UID +*/ +const TUid KCRUidTvoutSettings = {0x1020730B}; + +/** +* TV-out aspect ratio. +* Possible values are: +* 0 = 4x3 +* 1 = 16x9 +*/ +const TUint32 KSettingsTvAspectRatio = 0x00000001; + +/** +* TV-out system info. +* Possible values are: +* 0 = PAL +* 1 = PALM +* 2 = NTSC +*/ +const TUint32 KSettingsTvSystemInfo = 0x00000002; + +/** +* TV-out default text. +* String value. +*/ +const TUint32 KSettingsTvDefaultText = 0x00000003; + + +/** +* TV-out Flicker Filter. +* Possible values are: +* 0 = Off +* 1 = On +*/ +const TUint32 KSettingsTvoutFlickerFilter = 0x00000004; + +/** +* TV-out Horizontal overscan +* Default value: 500 +*/ +const TUint32 KSettingsTvoutHorizontalOverscan = 0x00000005; + +/** +* TV-out Vertical overscan +* Default value: 500 +*/ +const TUint32 KSettingsTvoutVerticalOverscan = 0x00000006; + +/** +* PALM option visibility +* 0 = not visible (default) +* 1 = visible +*/ +const TUint32 KSettingsTvoutPalmVisibility = 0x00000007; + + + +#endif // ACCESSORIESCRKEYS_H diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin.confml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin.confml has changed diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F8779.crml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F8779.crml has changed diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F877D.crml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F877D.crml has changed diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_10207194.crml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_10207194.crml has changed diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_1020730B.crml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_1020730B.crml has changed diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/inc/headsetttyview.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/inc/headsetttyview.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: + * + */ + +#ifndef HEADSETTTYVIEW_H +#define HEADSETTTYVIEW_H + +#include +#include +#include +#include +#include + +class CRepository; +class CGSServerEngine; + +class HeadsetTtyView : public QObject + { + Q_OBJECT + +public: + HeadsetTtyView(HbMainWindow *window,int); + ~HeadsetTtyView(); + +private slots: + void currentIndexModified(int); +private: + int currentValue; + TInt defaultaccessory; + + // Handle to the Central Repository. + CRepository* iAccessoryRepository; + + /** Accessory server connection. */ + RAccessoryServer iAccServer; + + /** Accessory settings connection. */ + RAccessorySettings iAccessorySettings; + +public: + }; + +#endif // HEADSETTTYVIEW_H diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/inc/tvoutview.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/inc/tvoutview.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: + * + */ + +#ifndef TVOUTVIEW_H +#define TVOUTVIEW_H + +#include +#include +#include + +class TvOutView : public QObject + { + Q_OBJECT + +public: + TvOutView(HbMainWindow *window,int); + ~TvOutView(); + +private slots: + void currentIndexModified(int); +private: + int currentValue; + CGSServerEngine* iServerEngine; + +public: + }; + +#endif // TVOUTVIEW_H diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/resources/headset.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/headset.docml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wire_connect.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wire_connect.svg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,70 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wlan.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wlan.svg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/resources/resources.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/resources.qrc Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,10 @@ + + + headset.docml + tvout.docml + + + wired_accessory.svg + wireless_accessory.svg + + diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/resources/tvout.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/tvout.docml Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/resources/wired_accessory.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/wired_accessory.svg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,70 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/resources/wireless_accessory.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/wireless_accessory.svg Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/rom/accindicatorsettings.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/rom/accindicatorsettings.iby Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#ifndef __ACCINDICATORSETTINGS_IBY__ +#define __ACCINDICATORSETTINGS_IBY__ + +REM DLL +file = ABI_DIR\BUILD_DIR\accindicatorsettings.exe \sys\bin\accindicatorsettings.exe +data = \epoc32\data\z\resource\apps\accindicatorsettings.rsc \resource\apps\accindicatorsettings.rsc +data = \epoc32\data\z\private\10003a3f\import\apps\accindicatorsettings_reg.rsc \private\10003a3f\import\apps\accindicatorsettings_reg.rsc +data=\epoc32\data\z\resource\accindicator\wired_accessory.svg \resource\accindicator\wired_accessory.svg +data=\epoc32\data\z\resource\accindicator\wireless_accessory.svg \resource\accindicator\wireless_accessory.svg +#endif \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/src/headsetttyview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/headsetttyview.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,122 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Name : headsetttyview.cpp +* +* Description: +* +* +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "headsetttyview.h" + +HeadsetTtyView::HeadsetTtyView(HbMainWindow *window,int accessoryType) + { + // Handle to the central repository. + iAccessoryRepository = CRepository::NewL( KCRUidAccessorySettings ); + + TInt error = iAccServer.Connect(); + if(error != KErrNone) + { + qDebug() << "Failed to connect to accessory server"; + return; + } + error = iAccessorySettings.CreateSubSession( iAccServer ); + if(error != KErrNone) + { + qDebug() << "Failed to connect to accessory sub session"; + return; + } + + HbDocumentLoader loader; + bool viewLoaded(false); + loader.load(":/xml/headset.docml", &viewLoaded); + Q_ASSERT_X(viewLoaded, "MainView", "Invalid xml file"); + + HbLabel *image; + HbLabel *acctype; + // set the image to be displayed. + if( accessoryType == KPCWired || accessoryType == KPCUSB ) //wired + { + image = qobject_cast(loader.findWidget("image")); + image->setIcon(HbIcon(":/images/wired_accessory.svg")); + } + else // wireless + { + image = qobject_cast(loader.findWidget("image")); + image->setIcon(HbIcon(":/images/wireless_accessory.svg")); + } + + HbComboBox *comboHandler = qobject_cast(loader.findWidget("combobox")); + QStringList comboItems; + comboItems <<"HeadSet" <<"TTY"; + comboHandler->addItems(comboItems); + + connect(comboHandler , SIGNAL(currentIndexChanged(int)) , this , SLOT(currentIndexModified(int))); + + User::LeaveIfError( iAccessoryRepository->Get(KSettingsAccDefaultInfo, defaultaccessory )); + + // set the name to be displayed along with the image. + if( defaultaccessory == 0) // HeadSet + { + acctype = qobject_cast(loader.findWidget("label")); + acctype->setPlainText("HeadSet"); + acctype->setTextWrapping(Hb::TextWordWrap); + comboHandler->setCurrentIndex(0); // set headset as default + } + else + { + acctype = qobject_cast(loader.findWidget("label")); + acctype->setPlainText("TTY"); + acctype->setTextWrapping(Hb::TextWordWrap); + comboHandler->setCurrentIndex(1); // set TTY as default + } + + // heading for the combobox for user selection + acctype = qobject_cast(loader.findWidget("label_2")); + acctype->setPlainText("Accessory Type"); + acctype->setTextWrapping(Hb::TextWordWrap); + + window->addView(loader.findWidget("view")); + } + +HeadsetTtyView::~HeadsetTtyView() + { + iAccessorySettings.CloseSubSession(); + iAccServer.Disconnect(); + delete iAccessoryRepository; + } + +void HeadsetTtyView::currentIndexModified(int var) + { + if(var == 0) // make headset as default + { + User::LeaveIfError((iAccessoryRepository->Set(KSettingsAccDefaultInfo, 0))); // 0 is for Headset + iAccessorySettings.SetHWDeviceSettingsL( KASHeadset ); + } + else + { + User::LeaveIfError((iAccessoryRepository->Set(KSettingsAccDefaultInfo, 7))); // 7 is for TTY + iAccessorySettings.SetHWDeviceSettingsL( KASTTY ); + } + } diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/src/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/main.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: Process launched by the accessory indicator plugin to + * show the view and user can change the settings. + * + */ + +#include + +#include "headsetttyview.h" +#include "tvoutview.h" + +int main(int argc, char *argv[]) + { + HbApplication app(argc, argv); + int retVal; + // Get the params from the process. + QStringList args(app.arguments()); + int accessoryMode = QString(args.at(1)).toInt(); // HeadSet,TTY,TV-OUT + int accessoryType = QString(args.at(2)).toULong();// Wired or Wireless + + HbMainWindow *window = new HbMainWindow(); + + // If accessory mode is Tv-Out load tvout.docml or else load headset.docml + QObject *view; + if( accessoryMode == EAccModeTVOut ) + { + view = new TvOutView(window,accessoryType); + } + else + { + view = new HeadsetTtyView(window,accessoryType); + } + + window->show(); + retVal = app.exec(); + delete window; + delete view; + return retVal; + } diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/accindicatorsettings/src/tvoutview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/tvoutview.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: Shows the view of the TV-OUT accessory. + * + */ + +#include "tvoutview.h" + +#include +#include +#include +#include +#include +#include + +TvOutView::TvOutView(HbMainWindow *window,int accessoryType) + { + HbDocumentLoader loader; + bool viewLoaded(false); + loader.load(":/xml/tvout.docml", &viewLoaded); + Q_ASSERT_X(viewLoaded, "AccSettings", "Invalid docml file"); + + HbLabel *label; + if( accessoryType == KPCWired || accessoryType == KPCUSB ) // wired + { + label = qobject_cast(loader.findWidget("image")); + label->setIcon(HbIcon(":/images/wired_accessory.svg")); + } + else // wireless + { + label = qobject_cast(loader.findWidget("image")); + label->setIcon(HbIcon(":/images/wireless_accessory.svg")); + } + + label = qobject_cast(loader.findWidget("label")); + label->setPlainText("Tv-Out"); + label->setTextWrapping(Hb::TextWordWrap); + + label = qobject_cast(loader.findWidget("label_4")); + label->setPlainText("TV Aspect Ratio"); + label->setTextWrapping(Hb::TextWordWrap); + + HbComboBox *comboHandler = qobject_cast(loader.findWidget("combobox")); + + // prepare the list of items to be there in combobox. + QStringList comboItems; + comboItems <<"4:3" <<"16:9"; + comboHandler->addItems(comboItems); + + //set the current index of combobox to the current AspectRatio. + iServerEngine = CGSServerEngine::NewL(); + currentValue = iServerEngine->AspectRatioL(); + comboHandler->setCurrentIndex(currentValue); + + //If the index changed in the combobox update the AspectRatio of the TV-Out Settings. + QObject::connect(comboHandler , SIGNAL(currentIndexChanged(int)) , this , SLOT(currentIndexModified(int))); + + window->addView(loader.findWidget("view")); + + } + +TvOutView::~TvOutView() + { + if(iServerEngine) + { + delete iServerEngine; + } + } + +void TvOutView::currentIndexModified(int modifiedSlot) + { + iServerEngine->SetAspectRatioL( modifiedSlot ); + } diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/inc/accindicator.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/inc/accindicator.h Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: Accessory Indicator class + * + */ + +#ifndef ACCINDICATOR_H +#define ACCINDICATOR_H + +#include + +#include +#include + +#include +#include + +#include + +/** + * Accessory indicator class. + * Handles client request and shows the indications. + */ +class AccIndicatorPlugin : public HbIndicatorInterface, public HbIndicatorPluginInterface +{ + Q_OBJECT + Q_INTERFACES(HbIndicatorPluginInterface) +public: + + AccIndicatorPlugin(); + ~AccIndicatorPlugin(); +public: + //from HbindicatorInterface + bool handleInteraction(InteractionType type); + QVariant indicatorData(int role) const; + +public: + //from HbIndicatorPluginInterface + QStringList indicatorTypes() const; + bool accessAllowed(const QString &indicatorType, + const HbSecurityInfo *securityInfo) const; + HbIndicatorInterface* createIndicator(const QString &indicatorType); + int error() const; + +protected: + //from HbindicatorInterface + bool handleClientRequest(RequestType type, const QVariant ¶meter); + +private: + void prepareDisplayName(); + +private: + + QString mDisplayName; + QProcess mProcess; + TAccMode mAccMode; + int mAccType; + QStringList mIndicatorTypes; + QStringList mArgs; + +private slots: + void processError(QProcess::ProcessError err); // handler for error codes + +private: + Q_DISABLE_COPY(AccIndicatorPlugin) + int mError; + }; + +#endif // ACCINDICATOR_H + diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/rom/accindicatorplugin.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/rom/accindicatorplugin.iby Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,23 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#ifndef __ACCINDICATORPLUGIN_IBY__ +#define __ACCINDICATORPLUGIN_IBY__ + +REM DLL +file=ABI_DIR\UREL\accindicatorplugin.dll SHARED_LIB_DIR\accindicatorplugin.dll UNPAGED +data=\epoc32\data\z\resource\plugins\indicators\accindicatorplugin.qtplugin \resource\plugins\indicators\accindicatorplugin.qtplugin +#endif \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/accindicatorplugin/src/accindicator.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/src/accindicator.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -0,0 +1,251 @@ +/* + * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: + * + */ +#include "accindicator.h" + +#include +#include +#include + +Q_EXPORT_PLUGIN(AccIndicatorPlugin) +const static char IndicatorType[] = "com.nokia.accessory.indicatorplugin/1.0"; +QString KAccMode = "AccMode"; +QString KAccType = "AccType"; + +AccIndicatorPlugin::AccIndicatorPlugin() : +HbIndicatorInterface(IndicatorType, + HbIndicatorInterface::GroupPriorityLow, + InteractionActivated) + { + mIndicatorTypes << "com.nokia.accessory.indicatorplugin/1.0"; + } + +AccIndicatorPlugin::~AccIndicatorPlugin() + { + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::indicatorTypes +// returns the indicator types handled by this plugin +// ---------------------------------------------------------------------------- + +QStringList AccIndicatorPlugin::indicatorTypes() const + { + return mIndicatorTypes; + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::createIndicator +// creates an indicator. +// ---------------------------------------------------------------------------- + +HbIndicatorInterface* AccIndicatorPlugin::createIndicator( + const QString &indicatorType) + { + Q_UNUSED(indicatorType) + return this; + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::error +// returns the error code. +// ---------------------------------------------------------------------------- + +int AccIndicatorPlugin::error() const + { + return mError; + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::accessAllowed +// check for the access rights of the client. As there are no restrictions for +// this plugin it always returns true. +// ---------------------------------------------------------------------------- + +bool AccIndicatorPlugin::accessAllowed(const QString &indicatorType, + const HbSecurityInfo *securityInfo) const + { + Q_UNUSED(indicatorType) + Q_UNUSED(securityInfo) + + return true; + } + +// ---------------------------------------------------------------------------- +// AccIndicator::handleInteraction +// called when the user interacts with the indicator.Enable the interaction only +// for headset,tty and tv-out for user to change the settings. +// ---------------------------------------------------------------------------- +bool AccIndicatorPlugin::handleInteraction(InteractionType type) + { + bool handled = false; + if (type == InteractionActivated) + { + // If it is 3-pole ( i.e., HeadSet or TTY ) and TV-Out enable the handleInteraction() to change the settings. + if(mAccMode == EAccModeWiredHeadset || mAccMode == EAccModeWirelessHeadset || mAccMode == EAccModeTextDevice || mAccMode == EAccModeTVOut ) + { + QObject::connect( &mProcess, SIGNAL(error(QProcess::ProcessError)), + this, SLOT(processError(QProcess::ProcessError))); + + QVariant mode,type; + mode.setValue((int)mAccMode); + type.setValue((int)mAccType); + mArgs.append(mode.toString()); + mArgs.append(type.toString()); + + // Launch the process to show the view. + mProcess.start("accindicatorsettings" , mArgs); + handled = true; + } + } + return handled; + } + +// ---------------------------------------------------------------------------- +// AccIndicator::indicatorData +// returns the name and icon to be displayed in the universal indicator menu. +// ---------------------------------------------------------------------------- +QVariant AccIndicatorPlugin::indicatorData(int role) const + { + switch(role) + { + //for displaying the string in indicator. + case PrimaryTextRole: + { + QString type(mDisplayName); + return type; + } + //for displaying the icon in indicator. + case DecorationNameRole: + { + QString iconName; + if(mAccType == KPCWired || mAccType == KPCUSB) + { + iconName = QString("z:/resource/accindicator/wired_accessory.svg"); + } + else if (mAccType == KPCBluetooth || mAccType == KPCInfraRed) + { + iconName = QString("z:/resource/accindicator/wireless_accessory.svg"); + } + return iconName; + } + default: + return QVariant(); + } + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::handleClientRequest +// this function gets called when client activates plugin +// ---------------------------------------------------------------------------- +bool AccIndicatorPlugin::handleClientRequest( RequestType type, + const QVariant ¶meter) + { + bool handled(false); + switch (type) { + case RequestActivate: + { + // Get the params(acctype and mode) from the hbindicator.activate() which is called from sysap. + + QVariantMap mapValues = parameter.toMap(); + if(mapValues.contains(KAccMode)) + { + mAccMode = static_cast(mapValues.value(KAccMode).toInt()); + } + if(mapValues.contains(KAccType)) + { + mAccType = mapValues.value(KAccType).toInt(); + } + + // prepare the name to be displayed in the universal indicator menu. + prepareDisplayName(); + emit dataChanged(); + handled = true; + } + break; + case RequestDeactivate: + { + // reset data + mDisplayName = QString(); + emit deactivate(); + } + break; + default: + break; + } + return handled; + } + +// ---------------------------------------------------------------------------- +// AccIndicator::prepareDisplayName +// prepare the name to be displayed in the indicator menu. +// ---------------------------------------------------------------------------- +void AccIndicatorPlugin::prepareDisplayName() + { + mDisplayName.clear(); + switch(mAccMode) + { + case EAccModeWiredHeadset: + mDisplayName.append(QString("Wired Headset")); + break; + case EAccModeWirelessHeadset: + mDisplayName.append(QString("Wireless Headset")); + break; + case EAccModeWiredCarKit: + mDisplayName.append(QString("Wired CarKit")); + break; + case EAccModeWirelessCarKit: + mDisplayName.append(QString("Wireless Carkit")); + break; + case EAccModeTextDevice: + mDisplayName.append(QString("TTY")); + break; + case EAccModeLoopset: + mDisplayName.append(QString("LoopSet")); + break; + case EAccModeMusicStand: + mDisplayName.append(QString("Music Stand")); + break; + case EAccModeTVOut: + mDisplayName.append(QString("TV Out")); + break; + case EAccModeHeadphones: + mDisplayName.append(QString("Head Phones")); + break; + default : + mDisplayName.append(QString("Unknown")); + } + } + +// ---------------------------------------------------------------------------- +// AccIndicator::processError +// handle the error conditions reurned by the QProcess. +// ---------------------------------------------------------------------------- + +void AccIndicatorPlugin::processError(QProcess::ProcessError err) + { + switch (err) { + case QProcess::FailedToStart: + case QProcess::Crashed: + case QProcess::Timedout: + case QProcess::ReadError: + case QProcess::WriteError: + case QProcess::UnknownError: + break; + default: + break; + } + } diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/group/Distribution.Policy.S60 --- a/systemsettings/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/cenrep/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/conf/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/data/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/group/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/group/bld.inf --- a/systemsettings/gssensorplugin/group/bld.inf Mon Feb 08 13:38:38 2010 +0000 +++ b/systemsettings/gssensorplugin/group/bld.inf Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -25,14 +25,14 @@ ../conf/sensorplugin.confml MW_LAYER_CONFML(sensorplugin.confml) ../conf/sensorplugin_10282DF0.crml MW_LAYER_CRML(sensorplugin_10282DF0.crml) -../loc/gssensorplugin.loc MW_LAYER_LOC_EXPORT_PATH(gssensorplugin.loc) +// ../loc/gssensorplugin.loc MW_LAYER_LOC_EXPORT_PATH(gssensorplugin.loc) // Iby file exports -../rom/gssensorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(gssensorplugin.iby) -../rom/gssenpluginresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(gssenpluginresources.iby) +// ../rom/gssensorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(gssensorplugin.iby) +// ../rom/gssenpluginresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(gssenpluginresources.iby) PRJ_MMPFILES -gssensorplugin.mmp +// gssensorplugin.mmp PRJ_EXTENSIONS diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/group/gssensorplugin.cfg --- a/systemsettings/gssensorplugin/group/gssensorplugin.cfg Mon Feb 08 13:38:38 2010 +0000 +++ b/systemsettings/gssensorplugin/group/gssensorplugin.cfg Thu Jun 24 13:52:58 2010 +0100 @@ -15,7 +15,6 @@ * */ - #ifndef GSSENSORPLUGIN_CFG #define GSSENSORPLUGIN_CFG diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/group/gssensorplugin.mmp --- a/systemsettings/gssensorplugin/group/gssensorplugin.mmp Mon Feb 08 13:38:38 2010 +0000 +++ b/systemsettings/gssensorplugin/group/gssensorplugin.mmp Thu Jun 24 13:52:58 2010 +0100 @@ -74,11 +74,13 @@ LIBRARY egul.lib // For GulIcon in checkbox icons LIBRARY eikctl.lib // For checkbox icons -LIBRARY CommonEngine.lib // For RConeResourceLoader -LIBRARY FeatMgr.lib // Feature manager -LIBRARY CentralRepository.lib // for CenRep +LIBRARY commonengine.lib // For RConeResourceLoader +LIBRARY featmgr.lib // Feature manager +LIBRARY centralrepository.lib // for CenRep LIBRARY aknskins.lib // for enhanced skinning LIBRARY hlplch.lib // for "Help" options menu -LIBRARY GSFramework.lib // For base classes -LIBRARY GSListBox.lib // For CGSListBoxItemTextArray -LIBRARY GSEcomPlugin.lib // For base classes +LIBRARY gsframework.lib // For base classes +LIBRARY gslistbox.lib // For CGSListBoxItemTextArray +LIBRARY gsecomplugin.lib // For base classes + +SMPSAFE diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/inc/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/loc/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/rom/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/src/Distribution.Policy.S60 --- a/systemsettings/gssensorplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/src/gssenbasecontainer.cpp --- a/systemsettings/gssensorplugin/src/gssenbasecontainer.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/systemsettings/gssensorplugin/src/gssenbasecontainer.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -189,7 +189,11 @@ // cleanup checkboxOnIcon, checkboxOffIcon, iconArray CleanupStack::Pop( checkboxOffIcon ); CleanupStack::Pop( checkboxOnIcon ); - CleanupStack::Pop( iconArray ); + + if(iconArray) + { + CleanupStack::Pop( iconArray ); + } TRACE_( "[GSSensorPlugin] CGSSenBaseContainer::AddCheckboxIconsL() - return" ); } diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/gssensorplugin/src/gssensorplugin.cpp --- a/systemsettings/gssensorplugin/src/gssensorplugin.cpp Mon Feb 08 13:38:38 2010 +0000 +++ b/systemsettings/gssensorplugin/src/gssensorplugin.cpp Thu Jun 24 13:52:58 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -235,8 +235,8 @@ case EGSSenMenuExit: { CheckExitStatusL(); - // Proceed with the command - aCommand = EAknCmdExit; + aCommand = EAknCmdExit; //"break" is removed to continue the flow to default case with the exit command + // coverity[MISSING_BREAK] } default: iAppUi->HandleCommandL( aCommand ); diff -r a4d95d2c2540 -r 2fee514510e5 systemsettings/inc/Distribution.Policy.S60 --- a/systemsettings/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/Include/distribution.policy.s60 --- a/tzpcside/tzcompiler/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/Release/Data/distribution.policy.s60 --- a/tzpcside/tzcompiler/Release/Data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/Release/distribution.policy.s60 --- a/tzpcside/tzcompiler/Release/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/Source/distribution.policy.s60 --- a/tzpcside/tzcompiler/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/documentation/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc Binary file tzpcside/tzcompiler/documentation/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc has changed diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/documentation/distribution.policy.s60 --- a/tzpcside/tzcompiler/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/group/app-services_tzcompiler.mrp diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/group/distribution.policy.s60 --- a/tzpcside/tzcompiler/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/TestTzCompiler Description Document.doc Binary file tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/TestTzCompiler Description Document.doc has changed diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/group/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/inc/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/src/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test1/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test10/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test10/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test11/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test11/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test12/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test12/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test13/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test13/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test2/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test3/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test3/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test4/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test4/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test5/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test5/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test6/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test6/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test7/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test7/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test8/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test8/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test9/distribution.policy.s60 --- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test9/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzdatabase/data/distribution.policy.s60 --- a/tzservices/tzdatabase/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzdatabase/group/app-services_tzdb.mrp diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzdatabase/group/distribution.policy.s60 --- a/tzservices/tzdatabase/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzloc/bwins/distribution.policy.s60 --- a/tzservices/tzloc/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzloc/documentation/SGL.GT0284.216 - Time Zone Services CR1606 How-To.doc Binary file tzservices/tzloc/documentation/SGL.GT0284.216 - Time Zone Services CR1606 How-To.doc has changed diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzloc/documentation/distribution.policy.s60 --- a/tzservices/tzloc/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzloc/eabi/distribution.policy.s60 --- a/tzservices/tzloc/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -7 \ No newline at end of file diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzloc/group/app-services_timezonelocalization.mrp diff -r a4d95d2c2540 -r 2fee514510e5 tzservices/tzloc/group/backup_registration.xml --- a/tzservices/tzloc/group/backup_registration.xml Mon Feb 08 13:38:38 2010 +0000 +++ b/tzservices/tzloc/group/backup_registration.xml Thu Jun 24 13:52:58 2010 +0100 @@ -1,10 +1,10 @@