# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1273842073 -10800 # Node ID 6a787171e1ded690a75e65edb6508f33544523eb # Parent b0b858956ed546d9b63d183f23f4058ab51eebdb Revision: 201017 Kit: 201019 diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp --- a/appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/apfile/apfmimecontentpolicy.cpp Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apfile/apfmimecontentpolicy.rss --- a/appfw/apparchitecture/apfile/apfmimecontentpolicy.rss Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apgrfx/APGCLI.CPP --- a/appfw/apparchitecture/apgrfx/APGCLI.CPP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/apgrfx/APGCLI.CPP Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apgrfx/apgcommonutils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/apgrfx/apgcommonutils.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apgrfx/apgupdate.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/apgrfx/apgupdate.cpp Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/aplist/aplappinforeader.cpp --- a/appfw/apparchitecture/aplist/aplappinforeader.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/aplist/aplappinforeader.cpp Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/aplist/aplappinforeader.h --- a/appfw/apparchitecture/aplist/aplappinforeader.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/aplist/aplappinforeader.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/aplist/aplapplist.cpp --- a/appfw/apparchitecture/aplist/aplapplist.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/aplist/aplapplist.cpp Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/aplist/aplapplist.h --- a/appfw/apparchitecture/aplist/aplapplist.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/aplist/aplapplist.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/aplist/aplapplistitem.cpp --- a/appfw/apparchitecture/aplist/aplapplistitem.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/aplist/aplapplistitem.cpp Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/aplist/aplapplistitem.h --- a/appfw/apparchitecture/aplist/aplapplistitem.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/aplist/aplapplistitem.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apserv/APSCLSV.H --- a/appfw/apparchitecture/apserv/APSCLSV.H Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/apserv/APSCLSV.H Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apserv/APSSERV.CPP --- a/appfw/apparchitecture/apserv/APSSERV.CPP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/apserv/APSSERV.CPP Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apserv/APSSES.CPP --- a/appfw/apparchitecture/apserv/APSSES.CPP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/apserv/APSSES.CPP Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apserv/APSSES.H --- a/appfw/apparchitecture/apserv/APSSES.H Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/apserv/APSSES.H Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/apserv/apsserv.h --- a/appfw/apparchitecture/apserv/apsserv.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/apserv/apsserv.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/APFILEU.DEF --- a/appfw/apparchitecture/bwins/APFILEU.DEF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/bwins/APFILEU.DEF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/APGRFXU.DEF --- a/appfw/apparchitecture/bwins/APGRFXU.DEF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/bwins/APGRFXU.DEF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/APSERVU.DEF --- a/appfw/apparchitecture/bwins/APSERVU.DEF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/bwins/APSERVU.DEF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF --- a/appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/apfile_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/apfile_legacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/apgrfx_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/apgrfx_legacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/aplist_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/aplist_legacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/aplistu.def --- a/appfw/apparchitecture/bwins/aplistu.def Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/bwins/aplistu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/apserv_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/apserv_legacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/bwins/ticonforleaks_leagacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/bwins/ticonforleaks_leagacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/conf/apparchitecture_closedcontentextinfo.confml Binary file appfw/apparchitecture/conf/apparchitecture_closedcontentextinfo.confml has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/conf/apparchitecture_closedcontentextinfo_10003a3f.crml Binary file appfw/apparchitecture/conf/apparchitecture_closedcontentextinfo_10003a3f.crml has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/APFILEU.DEF --- a/appfw/apparchitecture/eabi/APFILEU.DEF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/eabi/APFILEU.DEF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/APGRFXU.DEF --- a/appfw/apparchitecture/eabi/APGRFXU.DEF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/eabi/APGRFXU.DEF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/APSERVU.DEF --- a/appfw/apparchitecture/eabi/APSERVU.DEF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/eabi/APSERVU.DEF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF --- a/appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/apfile_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/apfile_legacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/apgrfx_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/apgrfx_legacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/aplist_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/aplist_legacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/aplistu.def --- a/appfw/apparchitecture/eabi/aplistu.def Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/eabi/aplistu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/apserv_legacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/apserv_legacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/eabi/ticonforleaks_leagacyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/eabi/ticonforleaks_leagacyu.def Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/group/APFILE.MMP --- a/appfw/apparchitecture/group/APFILE.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/group/APFILE.MMP Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/group/APGRFX.MMP --- a/appfw/apparchitecture/group/APGRFX.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/group/APGRFX.MMP Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/group/APLIST.MMP --- a/appfw/apparchitecture/group/APLIST.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/group/APLIST.MMP Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/group/APSERV.MMP --- a/appfw/apparchitecture/group/APSERV.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/group/APSERV.MMP Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/group/BLD.INF --- a/appfw/apparchitecture/group/BLD.INF Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/group/BLD.INF Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/group/apparc.iby --- a/appfw/apparchitecture/group/apparc.iby Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/group/apparc.iby Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -27,8 +27,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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/group/apparctest_new.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/group/apparctest_new.iby Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/inc/APGCLI.H --- a/appfw/apparchitecture/inc/APGCLI.H Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/inc/APGCLI.H Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -24,6 +24,12 @@ #include #include +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include "apgupdate.h" +//#include +#include +#endif + // classes referenced class RFile; class MArrayFiller; @@ -65,7 +71,6 @@ RPointerArray iItems; }; - /** A session with the application architecture server. The server provides access to a cached list of the applications on the device. @@ -234,6 +239,7 @@ IMPORT_C TInt RollbackNonNativeApplicationsUpdates(); IMPORT_C TInt GetAppType(TUid& aTypeUid, TUid aAppUid) const; IMPORT_C TInt ForceRegistration(const RPointerArray& aRegFiles); + private: // Reserved for future use IMPORT_C virtual void RApaLsSession_Reserved1(); IMPORT_C virtual void RApaLsSession_Reserved2(); @@ -245,6 +251,12 @@ */ IMPORT_C void ForceCommitNonNativeApplicationsUpdatesL(); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + IMPORT_C TInt UpdateAppListL(RArray& aAppUpdateInfo); + IMPORT_C TInt ForceRegistration(const RPointerArray& aForceRegAppsInfo); + IMPORT_C TInt UpdatedAppsInfoL(RArray& aUpdatedApps); +#endif + private: void DoGetAppOwnedFilesL(CDesCArray& aArrayToFill, TUid aAppUid) const; void DoGetAppViewsL(CApaAppViewArray& aArrayToFill, TUid aAppUid) const; @@ -267,9 +279,17 @@ void DoStartAppL(const CApaCommandLine& aCommandLine, TThreadId* aThreadId, TRequestStatus* aRequestStatusForRendezvous); static void GetMainThreadIdL(TThreadId& aThreadId, const RProcess& aProcess); static void DeletePointerToPointerToTAny(TAny* aPointerToPointerToTAny); + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK static CBufFlat* CreateRegFilesBufferL(const RPointerArray& aRegFiles); +#endif + static void CleanupOperation(TAny* aAny); +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + CBufFlat* CreateAppUpdateInfoBufferL(RArray& aAppUpdateInfo); + CBufFlat* CreateForceRegAppInfoBufferL(const RPointerArray& aForceRegAppsInfo); +#endif private: // data friend class CApaLsSessionExtension; CApaLsSessionExtension* iExtension; diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/inc/apgupdate.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/inc/apgupdate.h Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,55 @@ +// 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.h +// + +#ifndef __APGUPDATE_H__ +#define __APGUPDATE_H__ + +#include +#include +#include + + +/* + * Contains application uid and corresponding action performed by installer. + * @publishedAll + */ +class TApaAppUpdateInfo + { +public: + /* + * Defines actions performed by installers on an application. + * @publishedAll + */ + enum TApaAppAction + { + //Application is installed or upgraded. + EAppPresent, + //Application is uninstalled. + EAppNotPresent, + //Application information is changed. + EAppInfoChanged + }; + +public: + IMPORT_C void InternalizeL(RReadStream& aReadStream); + IMPORT_C void ExternalizeL(RWriteStream& aWriteStream) const; + IMPORT_C TApaAppUpdateInfo(TUid aAppUid, TApaAppUpdateInfo::TApaAppAction aAction); + IMPORT_C TApaAppUpdateInfo(); +public: + TUid iAppUid; + TApaAppAction iAction; + }; +#endif //__APGUPDATE_H__ diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tdata/10003a3f.txt Binary file appfw/apparchitecture/tdata/10003a3f.txt has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tdata/1028583d.txt Binary file appfw/apparchitecture/tdata/1028583d.txt has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tdata/forcegtestapp1.frg1 diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tdata/forcegtestapp2.frg2 diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tdata/scr.db Binary file appfw/apparchitecture/tdata/scr.db has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tdata/scr_test.db Binary file appfw/apparchitecture/tdata/scr_test.db has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/App_ctrl_loc.RSS --- a/appfw/apparchitecture/tef/App_ctrl_loc.RSS Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/App_ctrl_loc.RSS Fri May 14 16:01:13 2010 +0300 @@ -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,7 +28,7 @@ { caption="Test icon"; number_of_icons=1; - icon_file="Z:\\Resource\\Apps\\APP_CTRL.MBM"; + icon_file="C:\\Resource\\Apps\\APP_CTRL.MBM"; } }; } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/SimpleApparcTestApp.mmp --- a/appfw/apparchitecture/tef/SimpleApparcTestApp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/SimpleApparcTestApp.mmp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2000-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" @@ -36,14 +36,14 @@ // Application exe specific resource which is localised to the application RESOURCE SimpleApparcTestApp.rss start resource SimpleApparcTestApp.rss -targetpath /resource/apps +targetpath /apparctestregfiles lang sc end // Application exe registration resource file START RESOURCE SimpleApparcTestApp_Reg.RSS -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles lang sc END diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TAppEmbeddableOnly_v2.mmp --- a/appfw/apparchitecture/tef/TAppEmbeddableOnly_v2.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TAppEmbeddableOnly_v2.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -36,11 +36,12 @@ //reg added for Datacaging START RESOURCE TAppEmbeddableOnly_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END START RESOURCE 10004c5C.rss -TARGET tappembeddableonly.rsc +TARGET /tappembeddableonly.rsc +targetpath /apparctestregfiles END diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TAppEmbeddableUiNotStandAlone_v2.mmp --- a/appfw/apparchitecture/tef/TAppEmbeddableUiNotStandAlone_v2.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TAppEmbeddableUiNotStandAlone_v2.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -36,11 +36,12 @@ //reg added for Datacaging START RESOURCE TAppEmbeddableUiNotStandAlone_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END START RESOURCE 10004c5E.rss -TARGET tappembeddableuinotstandalone.rsc +TARGET /tappembeddableuinotstandalone.rsc +targetpath /apparctestregfiles END LIBRARY apparc.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TAppEmbeddableUiOrStandAlone_embedded.mmp --- a/appfw/apparchitecture/tef/TAppEmbeddableUiOrStandAlone_embedded.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TAppEmbeddableUiOrStandAlone_embedded.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -35,7 +35,8 @@ //SYSTEMINCLUDE /epoc32/include/ecom START RESOURCE 10004c5D.rss -TARGET tappembeddableuiorstandalone_embedded.rsc +TARGET /tappembeddableuiorstandalone_embedded.rsc +targetpath /apparctestregfiles END diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TAppEmbeddableUiOrStandalone_standalone.mmp --- a/appfw/apparchitecture/tef/TAppEmbeddableUiOrStandalone_standalone.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TAppEmbeddableUiOrStandalone_standalone.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -37,7 +37,7 @@ //reg added for Datacaging START RESOURCE TAppEmbeddableUiOrStandAlone_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END LIBRARY euser.lib apparc.lib eikcore.lib cone.lib //added cone.lib from original? diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TAppEmbeddable_embedded.mmp --- a/appfw/apparchitecture/tef/TAppEmbeddable_embedded.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TAppEmbeddable_embedded.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -35,7 +35,9 @@ START RESOURCE 10004c5B.rss -TARGET tappembeddable_embedded.rsc +// TARGET /apparctestregfiles/tappembeddable_embedded.rsc //bpermi +TARGET /tappembeddable_embedded.rsc +targetpath /apparctestregfiles END LIBRARY apparc.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TAppEmbeddable_standalone.mmp --- a/appfw/apparchitecture/tef/TAppEmbeddable_standalone.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TAppEmbeddable_standalone.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -38,7 +38,7 @@ //reg added for Datacaging START RESOURCE TAppEmbeddable_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END LIBRARY euser.lib apparc.lib eikcore.lib cone.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TAppInstall/TestAppInstall.mmp --- a/appfw/apparchitecture/tef/TAppInstall/TestAppInstall.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TAppInstall/TestAppInstall.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -38,11 +38,11 @@ START RESOURCE TestAppInstall.rss HEADER -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles end START RESOURCE TestAppInstall_reg.rss -TARGETPATH /apparctest +TARGETPATH /apparctestregfiles END LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TAppNotEmbeddable_v2.mmp --- a/appfw/apparchitecture/tef/TAppNotEmbeddable_v2.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TAppNotEmbeddable_v2.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -36,7 +36,7 @@ //reg added for Datacaging START RESOURCE TAppNotEmbeddable_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TApparcTestApp.mmp --- a/appfw/apparchitecture/tef/TApparcTestApp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TApparcTestApp.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -44,15 +44,15 @@ START RESOURCE tapparctestapp.rss HEADER -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles END START RESOURCE tapparctestapp_reg.rss -TARGETPATH /private/10003a3f/import/apps +TARGETPATH /apparctestregfiles END START RESOURCE tapparctestapp_loc.rss -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles LANG sc END diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TEndTaskTestApp/EndTaskTestApp.mmp --- a/appfw/apparchitecture/tef/TEndTaskTestApp/EndTaskTestApp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TEndTaskTestApp/EndTaskTestApp.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -42,14 +42,14 @@ // Registration file SOURCEPATH . START RESOURCE EndTask_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END // Application resource file SOURCEPATH . START RESOURCE EndTaskTestApp.rss HEADER -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles END SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TIconLoaderAndIconArrayForLeaks.mmp --- a/appfw/apparchitecture/tef/TIconLoaderAndIconArrayForLeaks.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TIconLoaderAndIconArrayForLeaks.mmp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -38,9 +38,15 @@ source APGWGNAM.CPP apgcli.cpp APGPRIV.CPP apgstart.cpp apgrecog.cpp source apgnotif.cpp APSCLI.CPP apgconstdata.cpp source apsecutils.cpp + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +SOURCE apgupdate.cpp +#endif + SOURCEPATH ../apparc source apaid.cpp apastd.cpp + USERINCLUDE . USERINCLUDE ../apgrfx USERINCLUDE ../apserv @@ -57,9 +63,17 @@ library sysutil.lib #endif +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +library scrclient.lib +#endif + macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER -deffile TICONFORLEAKS.DEF +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + deffile ticonforleaks.def +#else + deffile ticonforleaks_legacy.def +#endif SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TNonNative/TNNApp1.mmp --- a/appfw/apparchitecture/tef/TNonNative/TNNApp1.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TNonNative/TNNApp1.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -38,7 +38,7 @@ resource TNNApp1_reg.rss start resource TNNApp1_reg.rss -targetpath /private/10003a3f/apps +targetpath /apparctestregfiles lang sc end diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TNonNative/TNNApp2.mmp --- a/appfw/apparchitecture/tef/TNonNative/TNNApp2.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TNonNative/TNNApp2.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -32,7 +32,7 @@ resource TNNApp2_reg.rss start resource TNNApp2_reg.rss -targetpath /private/10003a3f/apps +targetpath /apparctestregfiles lang sc end diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TRApaLsSessionStartAppTestApp_v2.mmp --- a/appfw/apparchitecture/tef/TRApaLsSessionStartAppTestApp_v2.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TRApaLsSessionStartAppTestApp_v2.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -34,7 +34,7 @@ // Application exe registration resource file START RESOURCE TRApaLsSessionStartAppTestApp_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END SOURCE TRApaLsSessionStartAppTestApp.cpp diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TSTAPP_standalone.MMP --- a/appfw/apparchitecture/tef/TSTAPP_standalone.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TSTAPP_standalone.MMP Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -44,20 +44,20 @@ //reg added for Datacaging START RESOURCE tstapp_reg.rss -TARGETPATH /private/10003a3f/import/apps +TARGETPATH /apparctestregfiles END START RESOURCE TSTAPP.rss -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles END START RESOURCE tstapp_loc.rss -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles LANG SC 01 02 03 04 05 END START BITMAP tstapp.mbm -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles SOURCEPATH ../tdatasrc SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp @@ -66,19 +66,19 @@ END START BITMAP tstapp02.m02 -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles SOURCEPATH ../tdatasrc SOURCE c8,1 def25.bmp def25m.bmp def25.bmp def25m.bmp def50.bmp def50m.bmp END START BITMAP tstappview01.m01 -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles SOURCEPATH ../tdatasrc SOURCE c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp END START BITMAP tstappview02.k -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles SOURCEPATH ../tdatasrc SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp @@ -86,13 +86,13 @@ END START BITMAP tstappview01.m02 -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles SOURCEPATH ../tdatasrc SOURCE c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp END START BITMAP tstappview -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles SOURCEPATH ../tdatasrc SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TStartDocApp_v2.mmp --- a/appfw/apparchitecture/tef/TStartDocApp_v2.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TStartDocApp_v2.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -28,7 +28,7 @@ SOURCE TStartDocApp.cpp START RESOURCE TStartDocApp_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END USERINCLUDE . diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/TWindowChaining.h --- a/appfw/apparchitecture/tef/TWindowChaining.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/TWindowChaining.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -44,6 +44,6 @@ const TInt KQueryChainChild1 = 428; const TInt KQueryChainChild2 = 429; -_LIT(KWinChainChildAppFileName, "z:\\sys\\bin\\t_winchainLaunch.exe"); +_LIT(KWinChainChildAppFileName, "c:\\sys\\bin\\t_winchainLaunch.exe"); #endif // __TWINDOWCHAINING_H__ diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_AppList.cpp --- a/appfw/apparchitecture/tef/T_AppList.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_AppList.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -23,6 +23,12 @@ #include #include "T_AppList.h" +#include "T_SisFileInstaller.h" + +_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis"); +_LIT(KApparcTestAppComponent, "TApparcTestApp"); + + CTestAppListStep::CTestAppListStep() { @@ -60,6 +66,23 @@ TEST(ret==KErrNone); } +TVerdict CTestAppListStep::doTestStepPreambleL() + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CTestAppListStep::doTestStepPostambleL() + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KApparcTestAppComponent); + + return TestStepResult(); + } TVerdict CTestAppListStep::doTestStepL() { @@ -75,3 +98,5 @@ INFO_PRINTF1(_L("Test Finished")); return TestStepResult(); } + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_AppList.h --- a/appfw/apparchitecture/tef/T_AppList.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_AppList.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -38,6 +38,8 @@ CTestAppListStep(); ~CTestAppListStep(); void TestAppList(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); private: RTestableApaLsSession iApaLsSession; diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_AppListFileUpdateStep.cpp --- a/appfw/apparchitecture/tef/T_AppListFileUpdateStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_AppListFileUpdateStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -34,12 +34,13 @@ #include #include "T_AppListFileUpdateStep.h" +#include "T_SisFileInstaller.h" -_LIT(KTestAppZPath,"Z:\\ApparcTest\\TestAppInstall_reg.RSC"); +_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis"); +_LIT(KApparcTestAppComponent, "TApparcTestApp"); + _LIT(KAppListFileName,"C:\\private\\10003a3f\\AppsListCache\\AppsList.bin"); _LIT(KAppTimeFormat,"%:0%H%:1%T%:2%S%:3"); -_LIT(KAppDirectory,"C:\\Private\\10003a3f\\Import\\apps\\"); -_LIT(KTestAppObsolutePath1,"C:\\Private\\10003a3f\\Import\\apps\\TestAppInstall_reg.RSC"); const TInt KMaxTimeCount = 18; // 18 * 10 is 180 Seconds @@ -128,9 +129,6 @@ void CT_AppListFileUpdateStep::TestTimeStampL() { - // Create KAppDirectory - TInt err = iUtils.CreateDirectoryL(KAppDirectory); - TEST(err == KErrNone || err == KErrAlreadyExists); // Wait until KAppListFileName is present and check that the file has been created indeed TBool present = CheckForFilePresent(); @@ -143,8 +141,11 @@ // Install an application INFO_PRINTF1(_L("Install application...")); - InstallApplicationL(KTestAppObsolutePath1); - + + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile); + // wait 5 seconds for the app to be properly installed User::After(5 * 1000000); @@ -162,34 +163,10 @@ // Uninstall & delete... INFO_PRINTF1(_L("Uninstalling application...")); - DeleteApplicationL(KTestAppObsolutePath1); + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KApparcTestAppComponent); } -/* -Delete a registration resource file (TestAppInstall.rsc) in the path "C:\private\10003a3f\import\apps" . -*/ -void CT_AppListFileUpdateStep::DeleteApplicationL(const TDesC& aAppName) - { - INFO_PRINTF2(_L("Deleting file '%S'"), &aAppName); - - TInt ret = iUtils.SetReadOnly(aAppName, 0); - TEST(ret == KErrNone); - ret = iUtils.DeleteFileL(aAppName); - TEST(ret == KErrNone); - } - - -/* -Copy a registration resource file (TestAppInstall.rsc) in the path "c:\private\10003a3f\import\apps" . -*/ -void CT_AppListFileUpdateStep::InstallApplicationL(const TDesC& aAppName) - { - INFO_PRINTF3(_L("Copying file '%S' to folder '%S'"), &aAppName, &KTestAppZPath); - - TInt ret = iUtils.CopyFileL(KTestAppZPath, aAppName); - TEST(ret == KErrNone); - } /* @@ -247,10 +224,13 @@ // Do a rescan and check that the file exists again. INFO_PRINTF1(_L("Do a rescan and check that the file exists again....")); - RPointerArray dummy; - TEST(iSession.ForceRegistration(dummy) == KErrNone); + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile); + present = CheckForFilePresent(); TEST(present); + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KApparcTestAppComponent); } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_AppListFileUpdateStep.h --- a/appfw/apparchitecture/tef/T_AppListFileUpdateStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_AppListFileUpdateStep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -40,8 +40,6 @@ private: void TestTimeStampL(); void AppsListModifiedTimeL(TTime &); - void DeleteApplicationL(const TDesC&); - void InstallApplicationL(const TDesC&); private: void TestDeleteAppListFileL(); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_CaptionStep.cpp --- a/appfw/apparchitecture/tef/T_CaptionStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_CaptionStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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" @@ -57,6 +57,7 @@ #include "appfwk_test.h" #include "ticoncaptionoverride.h" //KUidTestIconCapOverride defined here #include "TIconLoaderAndIconArrayForLeaks.h" +#include "T_SisFileInstaller.h" // @@ -89,11 +90,21 @@ // Cenrep configuration details for English language _LIT(KCenRepCaption, "CRTstCap UK"); _LIT(KCenRepShortCaption, "CRTC UK"); -_LIT(KCenRepIconFilename, "Z:\\resource\\apps\\ticoncapoverride.mbm"); +_LIT(KCenRepIconFilename, "C:\\resource\\apps\\ticoncapoverride.mbm"); + +_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis"); +_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone"); + +_LIT(KTstAppTiconcaptionoverrideSisFile, "z:\\apparctest\\apparctestsisfiles\\ticoncaptionoverride.sis"); +_LIT(KTstAppTiconcaptionoverrideComponent, "ticoncaptionoverride"); + +_LIT(KForceRegAppSisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegApp1.sis"); +_LIT(KForceRegAppComponent, "ForceRegApp1"); const TUid KUidIconCaptionRepository = {0x1028583d}; // Central Repository UID. const TInt KTextSize = 100; +const TInt KDelay = 4000000; // // // CT_CaptionStep @@ -104,41 +115,61 @@ void CT_CaptionStep::ChangeLocaleL(TLanguage aLanguage) { #ifdef SYMBIAN_DISTINCT_LOCALE_MODEL - _LIT(KLitLocaleDllNameBase, "elocl_lan"); - _LIT(KLitLocaleDllNameExtension, ".loc"); + _LIT(KLitLanguageLocaleDllNameBase, "elocl_lan"); + //Region and collation code values are hard coded, as the check, after changing the locale is made for the language only. + _LIT(KLitRegionLocaleDllNameBase, "elocl_reg.826"); + _LIT(KLitCollationLocaleDllNameBase, "elocl_col.001"); + _LIT(ThreeDigExt,".%03d"); + TExtendedLocale localeDll; + const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6)); + TBuf<16> languageLocaleDllName(KLitLanguageLocaleDllNameBase); + languageLocaleDllName.AppendFormat(ThreeDigExt, aLanguage); + TBuf<16> regionLocaleDllName(KLitRegionLocaleDllNameBase); + TBuf<16> collationLocaleDllName(KLitCollationLocaleDllNameBase); + // Try to load the locale dll + TInt error=localeDll.LoadLocale(languageLocaleDllName, regionLocaleDllName, collationLocaleDllName); + + if (error==KErrNotFound) + { + // Locale dll is not found for the asked language. + ERR_PRINTF2(_L("Failed to find the locale dll for %d"), aLanguage); + } + + User::LeaveIfError(error); + localeDll.SaveSystemSettings(); #else _LIT(KLitLocaleDllNameBase, "ELOCL"); - _LIT(KLitLocaleDllNameExtension, ".LOC"); -#endif - RLibrary localeDll; - TBuf<16> localeDllName(KLitLocaleDllNameBase); + _LIT(TwoDigExt,".%02d"); + + RLibrary localeDll; CleanupClosePushL(localeDll); + const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6)); -#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL - _LIT(ThreeDigExt,".%03d"); - localeDllName.AppendFormat(ThreeDigExt, aLanguage); -#else - _LIT(TwoDigExt,".%02d"); - localeDllName.AppendFormat(TwoDigExt, aLanguage); -#endif - + TBuf<16> localeDllName(KLitLocaleDllNameBase); + localeDllName.AppendFormat(TwoDigExt, language); + + // Try to load the locale dll TInt error=localeDll.Load(localeDllName, uidType); if (error==KErrNotFound) { - localeDllName=KLitLocaleDllNameBase; - localeDllName.Append(KLitLocaleDllNameExtension); - error=localeDll.Load(localeDllName, uidType); + // Locale dll is not found for the asked language. + ERR_PRINTF2(_L("Failed to find the locale dll for %d"), language); } + User::LeaveIfError(error); - -#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL - TExtendedLocale myExtendedLocale; - User::LeaveIfError(myExtendedLocale.LoadLocaleAspect(localeDllName)); - User::LeaveIfError(myExtendedLocale.SaveSystemSettings()); -#else User::LeaveIfError(UserSvr::ChangeLocale(localeDllName)); + CleanupStack: opAndDestroy(); // localeDll #endif - CleanupStack::PopAndDestroy(&localeDll); + + // Check if the device locale has changed + if (aLanguage == User::Language()) + { + SetTestStepResult(EPass); + } + else + { + ERR_PRINTF3(_L("Failed to change the locale to %d whereas the current locale is"), aLanguage, User::Language()); + } } @@ -182,12 +213,11 @@ }; // Change the locale - ChangeLocaleL(languageToTest); - TEST(User::Language() == languageToTest); - - // Force the applist to be updated (so test app gets new language settings) - RPointerArray dummy; - User::LeaveIfError(iLs.ForceRegistration(dummy)); + if(languageToTest != User::Language()) + { + ChangeLocaleWaitForApplistUpdate(languageToTest); + TEST(User::Language() == languageToTest); + } // Do the same set of tests for each language TestCApaSystemControlListL(); @@ -199,7 +229,9 @@ } // restore original locale, just in case... - ChangeLocaleL(language); + if(User::Language() != language) + ChangeLocaleWaitForApplistUpdate(language); + TEST(User::Language() == language); } @@ -408,7 +440,7 @@ { INFO_PRINTF1(_L("Testing TApaAppInfo streams... ")); - TApaAppInfo appInfoShort(KUidTestApp, _L("z:\\sys\\bin\\tstapp.exe"), _L("TstCap UK"),_L("TC UK")); + TApaAppInfo appInfoShort(KUidTestApp, _L("c:\\sys\\bin\\tstapp.exe"), _L("TstCap UK"),_L("TC UK")); TEST(appInfoShort.iShortCaption.Compare(_L("TC UK"))==0); TFileName tempFile=_L("c:\\system\\test\\TC_temp.txt"); @@ -470,8 +502,7 @@ TEST(User::Language() == ELangEnglish); // Force the applist to be updated (so test app gets new language settings) - RPointerArray dummy; - User::LeaveIfError(iLs.ForceRegistration(dummy)); + ForceApplistUpdate(); // SetAppShortCaption should return KErrNotFound if it could not find the app INFO_PRINTF1(_L(".....setting short caption for an unknown app")); @@ -509,18 +540,16 @@ // Check short caption remains updated after a refresh of the applist INFO_PRINTF1(_L(".....checking short caption remains updated after a refresh of the applist")); - User::LeaveIfError(iLs.ForceRegistration(dummy)); + ForceApplistUpdate(); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption1); // Check short caption remains updated after a locale change INFO_PRINTF1(_L(".....checking short caption remains updated after a locale change")); - ChangeLocaleL(ELangJapanese); + ChangeLocaleWaitForApplistUpdate(ELangJapanese); TEST(User::Language() == ELangJapanese); // Japanese locale exists in epoc32 tree but not defined in test app - User::LeaveIfError(iLs.ForceRegistration(dummy)); - ChangeLocaleL(ELangEnglish); // back to English to see what happened in between + ChangeLocaleWaitForApplistUpdate(ELangEnglish); // back to English to see what happened in between TEST(User::Language() == ELangEnglish); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption1); @@ -530,17 +559,15 @@ TEST(err == KErrNone); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption1); // English, the current app language, doesn't change... - ChangeLocaleL(ELangFrench); + ChangeLocaleWaitForApplistUpdate(ELangFrench); TEST(User::Language() == ELangFrench); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption2); // Set short caption of an app for a language which the app does not include (ELangAmerican) INFO_PRINTF1(_L(".....setting short caption of an app for a language which the app does not include")); - ChangeLocaleL(ELangAmerican); + ChangeLocaleWaitForApplistUpdate(ELangAmerican); TEST(User::Language() == ELangAmerican); - User::LeaveIfError(iLs.ForceRegistration(dummy)); err = iLs.SetAppShortCaption(KShortCaption2, ELangAmerican, KUidTestApp); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption1); // American takes the default...so English...which has just been updated. @@ -551,37 +578,31 @@ TEST(err == KErrNone); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption1); // American takes the default...so English...which has just been updated. - ChangeLocaleL(ELangEnglish); + ChangeLocaleWaitForApplistUpdate(ELangEnglish); TEST(User::Language() == ELangEnglish); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption1); // English set individually ===> not updated by ELangNone - ChangeLocaleL(ELangFrench); + ChangeLocaleWaitForApplistUpdate(ELangFrench); TEST(User::Language() == ELangFrench); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption2); // French set individually ===> not updated by ELangNone - ChangeLocaleL(ELangGerman); + ChangeLocaleWaitForApplistUpdate(ELangGerman); TEST(User::Language() == ELangGerman); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption3); // German takes the one set by ELangNone - ChangeLocaleL(ELangItalian); + ChangeLocaleWaitForApplistUpdate(ELangItalian); TEST(User::Language() == ELangItalian); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption3); // Italian takes the one set by ELangNone - ChangeLocaleL(ELangSpanish); + ChangeLocaleWaitForApplistUpdate(ELangSpanish); TEST(User::Language() == ELangSpanish); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption3); // Spanish takes the one set by ELangNone // Set short caption of an app for a language which was set by the previous ELangNone INFO_PRINTF1(_L(".....setting short caption of an app which was set by the previous ELangNone")); - ChangeLocaleL(ELangItalian); + ChangeLocaleWaitForApplistUpdate(ELangItalian); TEST(User::Language() == ELangItalian); - User::LeaveIfError(iLs.ForceRegistration(dummy)); err = iLs.SetAppShortCaption(KShortCaption4, ELangItalian, KUidTestApp); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption4); @@ -592,35 +613,30 @@ TEST(err == KErrNone); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption4); // Italian set individually ===> not updated by ELangNone - ChangeLocaleL(ELangEnglish); + ChangeLocaleWaitForApplistUpdate(ELangEnglish); TEST(User::Language() == ELangEnglish); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption1); // English set individually ===> not updated by ELangNone - ChangeLocaleL(ELangFrench); + ChangeLocaleWaitForApplistUpdate(ELangFrench); TEST(User::Language() == ELangFrench); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption2); // French set individually ===> not updated by ELangNone - ChangeLocaleL(ELangGerman); + ChangeLocaleWaitForApplistUpdate(ELangGerman); TEST(User::Language() == ELangGerman); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption5); // German takes the one set by ELangNone - ChangeLocaleL(ELangSpanish); + ChangeLocaleWaitForApplistUpdate(ELangSpanish); TEST(User::Language() == ELangSpanish); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption5); // Spanish takes the one set by ELangNone - ChangeLocaleL(ELangAmerican); + ChangeLocaleWaitForApplistUpdate(ELangAmerican); TEST(User::Language() == ELangAmerican); - User::LeaveIfError(iLs.ForceRegistration(dummy)); iLs.GetAppInfo(appInfo, KUidTestApp); TEST(appInfo.iShortCaption == KShortCaption1); // American takes the default...so English...which has just been updated. // restore original settings.... INFO_PRINTF1(_L(".....restoring original settings")); - ChangeLocaleL(language); + ChangeLocaleWaitForApplistUpdate(language); TEST(User::Language() == language); // restore original short captions for all langs....(h4 doesn't perform reboots between tests) TEST(iLs.SetAppShortCaption(KTestTApaAppInfoShortCaptionEnglish, ELangEnglish, KUidTestApp) == KErrNone); @@ -662,9 +678,11 @@ { INFO_PRINTF1(_L("APPFWK-APPARC-0087:TestIconCaptionOverridesL started...")); - //Change the system language to English before starting the tests - TRAPD(ret,ChangeLocaleL(ELangEnglish)); - TEST(ret == KErrNone); + //Change the system language to English before starting the tests + TRAPD(ret,ChangeLocaleL(ELangEnglish)); + TEST(ret == KErrNone); + TEST(User::Language() == ELangEnglish); + ForceApplistUpdate(); TApaAppInfo appInfo; //Get test app's information @@ -778,10 +796,8 @@ //tests whether the process with WriteDeviceData capability can update the configuration settings. TEST(error == KErrNone); - // Force the applist to be updated (so test app gets new language settings) - RPointerArray dummy; - User::LeaveIfError(iLs.ForceRegistration(dummy)); - + ForceApplistUpdate(); + TApaAppInfo appInfo; //Get test app's information iLs.GetAppInfo(appInfo, KUidTestIconCapOverride); @@ -797,8 +813,8 @@ //sets the short caption back to the actual for other tests to work error = cenRep->Set(shortCapKey,KCenRepShortCaption); - // Force the applist to be updated (so test app gets new language settings) - User::LeaveIfError(iLs.ForceRegistration(dummy)); + // Force the applist to be updated (so test app gets new language settings) + ForceApplistUpdate(); CleanupStack::PopAndDestroy(cenRep); //cenRep object INFO_PRINTF1(_L("APPFWK-APPARC-0089:TestCenRepChangeNotificationL finished...")); @@ -836,12 +852,12 @@ //French _LIT(KCaptionFrench, "CRTstCap FR"); _LIT(KShortCaptionFrench, "CRTC FR"); - _LIT(KIconFilenameFrench, "Z:\\resource\\apps\\svg_icon.svg"); + _LIT(KIconFilenameFrench, "C:\\resource\\apps\\svg_icon.svg"); //German _LIT(KCaptionGerman, "TstCap GE"); _LIT(KShortCaptionGerman, "TC GE"); - _LIT(KIconFilenameGerman, "Z:\\resource\\apps\\ticoncapoverride.mbm"); + _LIT(KIconFilenameGerman, "C:\\resource\\apps\\ticoncapoverride.mbm"); TApaAppInfo appInfo; RFile file; @@ -855,9 +871,7 @@ TEST(User::Language() == ELangFrench);//check language is set to French. - // Force the applist to be updated (so test app gets new language settings) - RPointerArray dummy; - User::LeaveIfError(iLs.ForceRegistration(dummy)); + ForceApplistUpdate(); //Get test app's information iLs.GetAppInfo(appInfo, KUidTestIconCapOverride); @@ -896,7 +910,7 @@ TEST(User::Language() == ELangGerman);//check language is set to German. // Force the applist to be updated (so test app gets new language settings) - User::LeaveIfError(iLs.ForceRegistration(dummy)); + ForceApplistUpdate(); //Get test app's information iLs.GetAppInfo(appInfo, KUidTestIconCapOverride); @@ -940,7 +954,7 @@ TEST(User::Language() == ELangEnglish);//check language is set to English. // Force the applist to be updated (so test app gets new language settings) - User::LeaveIfError(iLs.ForceRegistration(dummy)); + ForceApplistUpdate(); //Get test app's information iLs.GetAppInfo(appInfo, KUidTestIconCapOverride); @@ -973,7 +987,7 @@ INFO_PRINTF2(_L("----Expected icon filename==>%S"), &printString); INFO_PRINTF2(_L("----Retrieved icon filename==>%S"), &fileName); TEST(fileName.Compare(KCenRepIconFilename)==0); - + file.Close(); INFO_PRINTF1(_L("APPFWK-APPARC-0090:TestIconCaptionOverridesWithChangeLangL finished...")); } @@ -1011,6 +1025,42 @@ TestApiPrecedenceOverCenRepConfigInfoL(); } +void CT_CaptionStep::ForceApplistUpdate() +{ + // Force the applist to be updated (so test app gets new language settings) + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegAppSisFile); + sisFileInstaller.InstallSisL(KForceRegAppSisFile); + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KForceRegAppComponent); +} + +void CT_CaptionStep::ChangeLocaleWaitForApplistUpdate(TLanguage aLanguage) + { + TRequestStatus status; + iLs.SetNotify(EFalse, status); + ChangeLocaleL(aLanguage); + User::WaitForRequest(status); + } + +TVerdict CT_CaptionStep::doTestStepPreambleL() + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppTiconcaptionoverrideSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppTiconcaptionoverrideSisFile); + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_CaptionStep::doTestStepPostambleL() + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KTstAppStandAloneComponent); + sisFileInstaller.UninstallSisL(KTstAppTiconcaptionoverrideComponent); + return TestStepResult(); + } + TVerdict CT_CaptionStep::doTestStepL() { INFO_PRINTF1(_L("Test T_Caption step started....\n")); @@ -1019,6 +1069,11 @@ TEST(iFs.Connect() == KErrNone); TEST(iLs.Connect() == KErrNone); + // Change the locale + ChangeLocaleL(ELangEnglish); + TEST(User::Language() == ELangEnglish); + ForceApplistUpdate(); + // run language tests for the test caption TRAPD(r, DoLanguageTestL()); TEST(r==KErrNone); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_CaptionStep.h --- a/appfw/apparchitecture/tef/T_CaptionStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_CaptionStep.h Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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" @@ -42,6 +42,8 @@ public: CT_CaptionStep(); ~CT_CaptionStep(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); private: void DoLanguageTestL(); @@ -58,6 +60,8 @@ void TestCenRepChangeNotificationL(); void TestIconCaptionOverridesWithChangeLangL(); void TestIconCaptionOverridesMemoryLeaksL(); + void ForceApplistUpdate(); + void ChangeLocaleWaitForApplistUpdate(TLanguage aLanguage); private: RFs iFs; RTestableApaLsSession iLs; diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_CmdlnStep.CPP --- a/appfw/apparchitecture/tef/T_CmdlnStep.CPP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_CmdlnStep.CPP Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -24,6 +24,10 @@ #include "T_CmdlnStep.h" #include "testableapalssession.h" +#include "T_SisFileInstaller.h" + +_LIT(KTEnvSlotsAppSisFile, "z:\\apparctest\\apparctestsisfiles\\T_EnvSlots.sis"); +_LIT(KTEnvSlotsAppComponent, "T_EnvSlots"); /** @SYMTestCaseID T-CmdlnStep-testSecureCmdLinesL @@ -638,6 +642,10 @@ Override of base class virtual */ { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTEnvSlotsAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTEnvSlotsAppSisFile); + SetTestStepResult(EPass); return TestStepResult(); } @@ -648,6 +656,9 @@ Override of base class virtual */ { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KTEnvSlotsAppComponent); + return TestStepResult(); } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_CmdlnStep.h --- a/appfw/apparchitecture/tef/T_CmdlnStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_CmdlnStep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -69,7 +69,7 @@ _LIT(KTLogFileAccess,"TestLogFile"); _LIT(KEnvFilePath,"c:\\Logs\\TestExecute\\EnvSlots.txt"); -_LIT(KTAppName,"Z:\\sys\\bin\\T_EnvSlots.exe"); +_LIT(KTAppName,"C:\\sys\\bin\\T_EnvSlots.exe"); _LIT(KTDocName,"C:\\System\\data\\temp.test"); _LIT(KTempDir,"C:\\System\\data\\"); _LIT(KTNoDocName,"C:\\Logs\\TestExecute\\NotFound.aaa"); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_ControlPanelTest.cpp --- a/appfw/apparchitecture/tef/T_ControlPanelTest.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_ControlPanelTest.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -48,15 +48,16 @@ #if !defined(__E32TEST_H__) #include #endif +#include "T_SisFileInstaller.h" _LIT(KCompleted, "Completed."); -_LIT(KRSCDIR,"C:\\Resource\\apps\\"); -_LIT(KRSCREGDIR,"C:\\private\\10003a3f\\import\\apps\\"); +_LIT(KCtrlApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\app_CTRL2.sis"); +_LIT(KCtrlApp2Component, "app_CTRL2"); + _LIT(KNEWCTLPATH,"C:\\sys\\bin\\app_CTRL2.exe"); -_LIT(KSRCRESOURCEPATH,"Z:\\private\\10003a3f\\import\\apps\\App_CTRL2_reg.Rsc"); -_LIT(KDESTRESOURCEPATH,"C:\\private\\10003a3f\\import\\apps\\App_CTRL2_reg.Rsc"); + LOCAL_D TInt SimulateKeyL(TAny*) { @@ -87,17 +88,6 @@ return KErrNone; } -void CT_ControlPanelTestStep::RemoveFilesFromCDrive() - { - TInt ret = iTestServ.SetReadOnly(KDESTRESOURCEPATH,0); //remove READ ONLY option - TEST(ret==KErrNone); - - TRAP(ret,iTestServ.DeleteFileL(KDESTRESOURCEPATH)); - TEST(ret==KErrNone); - } - - - /** Auxiliary Fn for Test Case ID T-ControlPanelStep-testControls1L, T-ControlPanelStep-testControls2L, T-ControlPanelStep-testControls3L @@ -209,15 +199,15 @@ { INFO_PRINTF1(_L("In testControls2L......")); - iTestServ.CreateDirectoryL(KRSCDIR); - iTestServ.CreateDirectoryL(KRSCREGDIR); + INFO_PRINTF1(_L("Application installing to C Drive......")); - TInt ret=iTestServ.CopyFileL(KSRCRESOURCEPATH,KDESTRESOURCEPATH); - TEST(ret==KErrNone); - - INFO_PRINTF1(_L("Files Copied to C Drive......")); - INFO_PRINTF1(_L("Updating the list ......")); - iControlCount=iControlList->UpdateCount(); + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KCtrlApp2SisFile); + sisFileInstaller.InstallSisL(KCtrlApp2SisFile); + + INFO_PRINTF1(_L("Updating the list ......")); + TInt ret; + iControlCount=iControlList->UpdateCount(); while(iControlList->UpdateCount()<=iControlCount) { TRAP(ret, iControlList->UpdateL()); @@ -238,8 +228,9 @@ TFileName name=iControlList->Control(iIndex)->FileName(); TEST(name.CompareF(KNEWCTLPATH)==0); - RemoveFilesFromCDrive(); - INFO_PRINTF1(_L("Removed the file from C Drive......")); + + sisFileInstaller.UninstallSisL(KCtrlApp2Component); + INFO_PRINTF1(_L("Removed application from C Drive......")); INFO_PRINTF1(_L("Updating the list ......")); iControlCount=iControlList->UpdateCount(); while(iControlList->UpdateCount()<=iControlCount) @@ -449,6 +440,14 @@ // connect to the test utils server User::LeaveIfError(iTestServ.Connect()); + RApaLsSession ls; + User::LeaveIfError(ls.Connect()); + + TRequestStatus status; + ls.SetNotify(ETrue, status); + User::WaitForRequest(status); + ls.Close(); + // Run the tests...w TRAPD(ret,DoStepTestsInCallbackL()) TEST(ret==KErrNone); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_DataMappingPersistenceA.cpp --- a/appfw/apparchitecture/tef/T_DataMappingPersistenceA.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_DataMappingPersistenceA.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -19,7 +19,9 @@ */ #include "T_DataMappingPersistenceA.h" +#include "T_SisFileInstaller.h" +_LIT(KServerApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp2.sis"); /** * Constructor @@ -44,7 +46,11 @@ */ TVerdict CT_DataMappingPersistenceATestStep::doTestStepPreambleL() { - SetTestStepResult(EPass); + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp2SisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KServerApp2SisFile); + + SetTestStepResult(EPass); TInt error = iSession.Connect(); TEST(error==KErrNone); return TestStepResult(); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_DataMappingPersistenceC.cpp --- a/appfw/apparchitecture/tef/T_DataMappingPersistenceC.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_DataMappingPersistenceC.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -20,7 +20,9 @@ #include "T_DataMappingPersistenceC.h" +#include "T_SisFileInstaller.h" +_LIT(KServerApp2Component, "serverapp2"); /** @@ -58,6 +60,9 @@ */ TVerdict CT_DataMappingPersistenceCTestStep::doTestStepPostambleL() { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KServerApp2Component); + return TestStepResult(); } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP --- a/appfw/apparchitecture/tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -42,11 +42,11 @@ userinclude ../../../uiftestfw/inc start resource T_DataPrioritySystem1_reg.rss -targetpath /private/10003a3f/apps +targetpath /apparctestregfiles end start resource T_DataPrioritySystem1_loc.rss -targetpath /resource/apps +targetpath /apparctestregfiles end LIBRARY cone.lib ws32.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP --- a/appfw/apparchitecture/tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -42,11 +42,11 @@ userinclude ../../../uiftestfw/inc start resource T_DataPrioritySystem2_reg.rss -targetpath /private/10003a3f/apps +targetpath /apparctestregfiles end start resource T_DataPrioritySystem2_loc.rss -targetpath /resource/apps +targetpath /apparctestregfiles end LIBRARY cone.lib ws32.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.cpp --- a/appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -28,6 +28,14 @@ #include "tstapp.h" #include "testableapalssession.h" #include "appfwk_test.h" +#include "T_SisFileInstaller.h" + +_LIT(KTestTrustedPriorityApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\TestTrustedPriorityApp2.sis"); +_LIT(KTestTrustedPriorityApp2Component, "TestTrustedPriorityApp2"); + +_LIT(KTestUntrustedPriorityApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\TestUnTrustedPriorityApp2.sis"); +_LIT(KTestUntrustedPriorityApp2Component, "TestUnTrustedPriorityApp2"); + /** @SYMTestCaseID APPFWK-APPARC-0036 @@ -115,6 +123,24 @@ { } +TVerdict CT_DataTypeMappingWithSid1::doTestStepPreambleL() + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestUntrustedPriorityApp2SisFile); + sisFileInstaller.InstallSisL(KTestUntrustedPriorityApp2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestTrustedPriorityApp2SisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTestTrustedPriorityApp2SisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_DataTypeMappingWithSid1::doTestStepPostambleL() + { + return TestStepResult(); + } + + TVerdict CT_DataTypeMappingWithSid1::doTestStepL() { INFO_PRINTF1(_L("APPFWK-APPARC-0036: DataTypeMappingWithSid1 - Started")); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.h --- a/appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.h Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -39,6 +39,8 @@ { public: CT_DataTypeMappingWithSid1(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); void ExecuteL(RApaLsSession& aLs); private: diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_EndTaskStep.cpp --- a/appfw/apparchitecture/tef/T_EndTaskStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_EndTaskStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -27,6 +27,10 @@ #include "appfwk_test.h" #include "T_EndTaskStep.h" #include "TEndTaskTestApp/EndTaskTestAppExternalInterface.h" +#include "T_SisFileInstaller.h" + +_LIT(KEndTaskAppSisFile, "z:\\apparctest\\apparctestsisfiles\\EndTaskTestApp.sis"); +_LIT(KEndTaskAppComponent, "EndTaskTestApp"); CTEndTaskStep::CTEndTaskStep() { @@ -271,6 +275,32 @@ return result; } +/** + * @return - TVerdict code + * Override of base class virtual + */ +TVerdict CTEndTaskStep::doTestStepPreambleL() + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KEndTaskAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KEndTaskAppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +/** + * @return - TVerdict code + * Override of base class virtual + */ +TVerdict CTEndTaskStep::doTestStepPostambleL() + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KEndTaskAppComponent); + + return TestStepResult(); + } + TVerdict CTEndTaskStep::doTestStepL() { INFO_PRINTF1(_L("TEndTaskStep test started....")); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_EndTaskStep.h --- a/appfw/apparchitecture/tef/T_EndTaskStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_EndTaskStep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -30,6 +30,8 @@ { public: CTEndTaskStep(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); void ExecuteL(); private: diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.H --- a/appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.H Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.H Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -44,7 +44,7 @@ _LIT(KTLogFileAccess,"TestLogFile"); _LIT(KFilePath,"c:\\logs\\TestExecute\\EnvSlots.txt"); -_LIT(KTAppName,"Z:\\sys\\bin\\T_EnvSlots.exe"); +_LIT(KTAppName,"C:\\sys\\bin\\T_EnvSlots.exe"); _LIT(KTDocName,"C:\\System\\data\\temp.test"); _LIT(KTEnvSlots,"T_EnvSlots"); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.MMP --- a/appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.MMP Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -40,11 +40,11 @@ userinclude ../../../uiftestfw/inc start resource T_EnvSlots_reg.rss -targetpath /private/10003a3f/apps +targetpath /apparctestregfiles end start resource T_EnvSlots_loc.rss -targetpath /resource/apps +targetpath /apparctestregfiles end LIBRARY cone.lib ws32.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_Foreground.cpp --- a/appfw/apparchitecture/tef/T_Foreground.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_Foreground.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -54,10 +54,15 @@ #include #include "t_foreground.h" +#include "T_SisFileInstaller.h" _LIT(KAppName, "SimpleApparcTestApp"); -_LIT(KAppFileName, "z:\\sys\\bin\\SimpleApparcTestApp.exe"); +_LIT(KAppFileName, "c:\\sys\\bin\\SimpleApparcTestApp.exe"); _LIT(KAppFile, "c:\\logs\\testApp.txt"); + +_LIT(KSimpleAppSisFile, "z:\\apparctest\\apparctestsisfiles\\SimpleApparcTestApp.sis"); +_LIT(KSimpleAppComponent, "SimpleApparcTestApp"); + const TInt KNonExistantWgId = KErrNotFound; // @@ -304,6 +309,25 @@ } +TVerdict CTestForegroundStep::doTestStepPreambleL() + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile); + sisFileInstaller.InstallSisL(KSimpleAppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CTestForegroundStep::doTestStepPostambleL() + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KSimpleAppComponent); + + return TestStepResult(); + } + + TVerdict CTestForegroundStep::doTestStepL() // main function called by E32 { INFO_PRINTF1(_L("Test Started")); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_Foreground.h --- a/appfw/apparchitecture/tef/T_Foreground.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_Foreground.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -61,6 +61,8 @@ public: CTestForegroundStep(); ~CTestForegroundStep(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); void ConstructAppL(CCoeEnv* aCoe); private: diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_LocaleStep.cpp --- a/appfw/apparchitecture/tef/T_LocaleStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_LocaleStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -35,13 +35,19 @@ #include #include #include "T_LocaleStep.h" +#include "T_SisFileInstaller.h" const TUid KUidTestApp = { 10 }; //uid of tstapp. const TUid KUidCustomiseDefaultIconApp = {0x10208181}; // uid of CustomiseDefaultIconApp. -const TInt KDelayForOnDemand = 20000; //a small delay +const TInt KDelayForOnDemand = 4000000; //a small delay const TInt KDelay = 4000000; // Most apparc tests have 2.5 secs wait time to let apparc update the app-list, but on safer side let us give 4 secs. const TInt KViewCount = 3; // Total no of views in tstapp +_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis"); +_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone"); + +_LIT(KTstCustomiseDefaultIconAppSisFile, "z:\\apparctest\\apparctestsisfiles\\CustomiseDefaultIconApp.sis"); +_LIT(KTstCustomiseDefaultIconAppComponent, "CustomiseDefaultIconApp"); /** Auxiliary Fn for Test Case ID T-LocaleStep-TestAllLanguages @@ -51,7 +57,7 @@ */ void CT_LocaleStep::ChangeLocaleL(TLanguage aLanguage) - { + {/* #ifdef SYMBIAN_DISTINCT_LOCALE_MODEL _LIT(KLitLocaleDllNameBase, "elocl_lan"); _LIT(KLitLocaleDllNameExtension, ".loc"); @@ -87,7 +93,64 @@ #else User::LeaveIfError(UserSvr::ChangeLocale(localeDllName)); #endif - CleanupStack::PopAndDestroy(); // localeDll + CleanupStack::PopAndDestroy(); // localeDll */ + +#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL + _LIT(KLitLanguageLocaleDllNameBase, "elocl_lan"); + //Region and collation code values are hard coded, as the check, after changing the locale is made for the language only. + _LIT(KLitRegionLocaleDllNameBase, "elocl_reg.826"); + _LIT(KLitCollationLocaleDllNameBase, "elocl_col.001"); + _LIT(ThreeDigExt,".%03d"); + TExtendedLocale localeDll; + const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6)); + TBuf<16> languageLocaleDllName(KLitLanguageLocaleDllNameBase); + languageLocaleDllName.AppendFormat(ThreeDigExt, aLanguage); + TBuf<16> regionLocaleDllName(KLitRegionLocaleDllNameBase); + TBuf<16> collationLocaleDllName(KLitCollationLocaleDllNameBase); + // Try to load the locale dll + TInt error=localeDll.LoadLocale(languageLocaleDllName, regionLocaleDllName, collationLocaleDllName); + + if (error==KErrNotFound) + { + // Locale dll is not found for the asked language. + ERR_PRINTF2(_L("Failed to find the locale dll for %d"), aLanguage); + } + + User::LeaveIfError(error); + localeDll.SaveSystemSettings(); +#else + _LIT(KLitLocaleDllNameBase, "ELOCL"); + _LIT(TwoDigExt,".%02d"); + + RLibrary localeDll; + CleanupClosePushL(localeDll); + + const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6)); + TBuf<16> localeDllName(KLitLocaleDllNameBase); + localeDllName.AppendFormat(TwoDigExt, language); + + // Try to load the locale dll + TInt error=localeDll.Load(localeDllName, uidType); + if (error==KErrNotFound) + { + // Locale dll is not found for the asked language. + ERR_PRINTF2(_L("Failed to find the locale dll for %d"), language); + } + + User::LeaveIfError(error); + User::LeaveIfError(UserSvr::ChangeLocale(localeDllName)); + CleanupStack::PopAndDestroy(); // localeDll +#endif + + // Check if the device locale has changed + if (aLanguage == User::Language()) + { + SetTestStepResult(EPass); + } + else + { + ERR_PRINTF3(_L("Failed to change the locale to %d whereas the current locale is"), aLanguage, User::Language()); + } } // CheckIcons is a function used in testcase TestLocaleDefaultIconL to check the size of the default icons @@ -758,6 +821,11 @@ Override of base class virtual */ { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstCustomiseDefaultIconAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstCustomiseDefaultIconAppSisFile); SetTestStepResult(EPass); return TestStepResult(); } @@ -768,6 +836,9 @@ Override of base class virtual */ { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KTstAppStandAloneComponent); + sisFileInstaller.UninstallSisL(KTstCustomiseDefaultIconAppComponent); return TestStepResult(); } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_NotifStep.cpp --- a/appfw/apparchitecture/tef/T_NotifStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_NotifStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -42,6 +42,11 @@ #include "appfwk_test_utils.h" #include "T_NotifStep.h" +#include "T_SisFileInstaller.h" + +_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis"); +_LIT(KApparcTestAppComponent, "TApparcTestApp"); + _LIT(KImportAppsDir,"c:\\private\\10003a3f\\import\\apps\\"); _LIT(KResourceAppsDir,"c:\\resource\\apps\\"); @@ -140,9 +145,10 @@ { // Force the applist to be updated //To ensure that server has time to count all applications in the system - RPointerArray dummy; - User::LeaveIfError(iSession.ForceRegistration(dummy)); - + TRequestStatus status; + iSession.SetNotify(ETrue, status); + User::WaitForRequest(status); + TInt theAppCount = 0; TInt theErr1 = iSession.AppCount(theAppCount); TEST(theErr1==KErrNone); @@ -155,10 +161,12 @@ CleanupStack::PushL(notif); obs->iNotifier=notif; INFO_PRINTF1(_L("Creating and deleting apps for notification")); - CreateAppL(_L("AAA")); + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile); CActiveScheduler::Start(); - + TInt theAppCount1 = 0; theErr1 = iSession.AppCount(theAppCount1); TEST((theAppCount1 - 1) == theAppCount); @@ -169,13 +177,12 @@ CleanupStack::PushL(notif); obs->iNotifier = notif; INFO_PRINTF1(_L("Deleting the application")); - DeleteAppL(_L("AAA")); - + sisFileInstaller.UninstallSisL(KApparcTestAppComponent); CActiveScheduler::Start(); CleanupStack::PopAndDestroy(notif); - User::LeaveIfError(iSession.ForceRegistration(dummy)); theErr1 = iSession.AppCount(theAppCount1); + TEST(theErr1==KErrNone); TEST(theAppCount1 == theAppCount); @@ -476,24 +483,33 @@ TEST(KErrNone == iSession.Connect()); TEST(KErrNone == iUtils.Connect()); + TApaAppInfo info; + TUid uid = {0x100048F3}; + TInt err = iSession.GetAppInfo(info, uid); + if(err == KErrNone) + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KApparcTestAppComponent); + } + // run the testcode (inside an alloc heaven harness) __UHEAP_MARK; iUtils.Connect(); -#if defined (__WINSCW__) - INFO_PRINTF1(_L("T-NotifStep-TTestIconFileNotificationL Test Started...")); - TRAP(ret,TestIconFileNotificationL()); - TEST(ret==KErrNone); - INFO_PRINTF2(_L("TestIconFileNotificationL() finished with return code '%d'\n"), ret); -#endif +//#if defined (__WINSCW__) +// INFO_PRINTF1(_L("T-NotifStep-TTestIconFileNotificationL Test Started...")); +// TRAP(ret,TestIconFileNotificationL()); +// TEST(ret==KErrNone); +// INFO_PRINTF2(_L("TestIconFileNotificationL() finished with return code '%d'\n"), ret); +//#endif INFO_PRINTF1(_L("T-NotifStep-TestAppNotificationL Test Started...")); TRAP(ret,TestAppNotificationL()); TEST(ret==KErrNone); INFO_PRINTF2(_L("TestAppNotificationL() finished with return code '%d'\n"), ret); - INFO_PRINTF1(_L("TestForceRegistrationNotificationL Test Started...")); - TRAP(ret, TestForceRegistrationNotificationL()); - TEST(ret==KErrNone); - INFO_PRINTF2(_L("TestForceRegistrationNotificationL() finished with return code '%d'\n"), ret); +// INFO_PRINTF1(_L("TestForceRegistrationNotificationL Test Started...")); +// TRAP(ret, TestForceRegistrationNotificationL()); +// TEST(ret==KErrNone); +// INFO_PRINTF2(_L("TestForceRegistrationNotificationL() finished with return code '%d'\n"), ret); iUtils.Close(); __UHEAP_MARKEND; diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_ProStep.cpp --- a/appfw/apparchitecture/tef/T_ProStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_ProStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -50,6 +50,14 @@ #if !defined(__E32TEST_H__) #include #endif +#include "T_SisFileInstaller.h" + +_LIT(KMCtrlAppV2SisFile, "z:\\apparctest\\apparctestsisfiles\\m_ctrl_v2.sis"); +_LIT(KMCtrlAppV2Component, "m_ctrl_v2"); + +_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis"); +_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone"); + TInt PanicTestThread(TAny* aOption); @@ -61,16 +69,9 @@ ELast }; - -_LIT(KCTLDIR,"C:\\private\\10003a3f\\import\\apps\\"); -_LIT(KSOURCEPATH,"z:\\private\\10003a3f\\import\\apps\\m_ctrl_reg.rsc"); -_LIT(KNEWCTLPATH,"C:\\private\\10003a3f\\import\\apps\\m_ctrl_reg.rsc"); _LIT(KNEWPATH,"C:\\cm.txt"); _LIT(KEMPTYFILEPATH,"z:\\system\\data\\Testpath\\FilterTests\\testfile1.txt"); -_LIT(KRSCDIR,"C:\\Resource\\apps\\"); -_LIT(KLOCPATH,"z:\\Resource\\apps\\M_ctrl_loc.rsc"); -_LIT(KNEWLOCPATH,"C:\\Resource\\apps\\M_ctrl_loc.rsc"); _LIT(KCTRLNAME,"C:\\sys\\bin\\m_ctrl.exe"); TFileName ctlPath=_L("z:\\sys\\bin\\m_ctrl.exe"); @@ -1015,14 +1016,10 @@ RSmlTestUtils testSession; User::LeaveIfError(testSession.Connect()); - testSession.CreateDirectoryL(KCTLDIR); - testSession.CreateDirectoryL(KRSCDIR); - - TInt ret=testSession.CopyFileL(KSOURCEPATH,KNEWCTLPATH); - TEST(ret==KErrNone); - ret=testSession.CopyFileL(KLOCPATH,KNEWLOCPATH); - TEST(ret==KErrNone); - + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KMCtrlAppV2SisFile); + sisFileInstaller.InstallSisL(KMCtrlAppV2SisFile); + TInt ret; TInt controlCount=iControlList->UpdateCount(); while(iControlList->UpdateCount()<=controlCount) { @@ -1048,11 +1045,8 @@ } // hide the control and do an update - there should be changes - testSession.SetReadOnly(KNEWCTLPATH,0); // remove the read only attribute - ret=testSession.DeleteFileL(KNEWCTLPATH); - TEST(ret==KErrNone); - testSession.SetReadOnly(KNEWLOCPATH,0); // remove the read only attribute - ret=testSession.DeleteFileL(KNEWLOCPATH); + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KMCtrlAppV2Component); + TEST(ret==KErrNone); controlCount=iControlList->UpdateCount(); while(iControlList->UpdateCount()<=controlCount) @@ -1145,6 +1139,13 @@ { INFO_PRINTF1(_L("Testing CApaSystemControlList")); + RApaLsSession ls; + User::LeaveIfError(ls.Connect()); + + TRequestStatus status; + ls.SetNotify(ETrue, status); + User::WaitForRequest(status); + //Create a session with F & B server TInt ret = RFbsSession::Connect(); TEST(ret == KErrNone); @@ -1300,38 +1301,29 @@ */ void CT_ProStep::DoAppListInvalidTestL(RApaLsSession& aLs) { - _LIT(KTempAppDir, "C:\\private\\10003a3f\\import\\apps\\"); - _LIT(KTempRegPath, "C:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc"); + TFullName regPath=_L("z:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc"); CFileMan* fileMan = CFileMan::NewL (iFs); CleanupStack::PushL(fileMan); INFO_PRINTF1(_L("Copy tstapp files to C: drive.......")); - TInt ret = iFs.MkDirAll(KTempAppDir); - TEST(ret==KErrNone || ret==KErrAlreadyExists); - TEST(fileMan->Copy(regPath, KTempRegPath)==KErrNone); //Just to start the idle update. - User::After(8000000); + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile); INFO_PRINTF1(_L("Get app list.......")); + TInt ret; ret = aLs.GetAllApps(); TEST(ret==KErrNone); INFO_PRINTF1(_L("Remove temp files from C: drive.......")); - TRequestStatus status; - TTime tempTime(0); // added tempTime to avoid asynch CFileMan::Attribs request completing with KErrArgument - TInt err=fileMan->Attribs(KTempAppDir,0,KEntryAttReadOnly, tempTime, CFileMan::ERecurse, status); - TEST(err==KErrNone); - User::WaitForRequest(status); - TEST(status.Int() == KErrNone); - TEST(fileMan->Delete(KTempRegPath)==KErrNone); //Just to start the idle update. - TEST(fileMan->RmDir(KTempAppDir)==KErrNone); - User::After(8000000); - + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KTstAppStandAloneComponent); INFO_PRINTF1(_L("Testing GetNextApp() never returns RApaLsSession::EAppListInvalid.")); TApaAppInfo info; + while(ret==KErrNone) { ret=aLs.GetNextApp(info); @@ -1535,7 +1527,7 @@ iFs.Connect(); setup(); - + TRAPD(ret,DoStepTestsInCallbackL()) TEST(ret==KErrNone); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_ProcStep.cpp --- a/appfw/apparchitecture/tef/T_ProcStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_ProcStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -22,6 +22,9 @@ */ #include "T_ProcStep.h" +#include "T_SisFileInstaller.h" + + const TInt KTProcTerminatingChildI = 1246; const TInt KTProcTerminatingChildII = 1247; const TInt KTProcTerminatingChildIII = 1248; @@ -1376,6 +1379,18 @@ INFO_PRINTF1(_L("End - testIdNotAvailableToChildL ----------- \n")); } + +TVerdict CT_ProcStep::doTestStepPreambleL() + { + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_ProcStep::doTestStepPostambleL() + { + return TestStepResult(); + } + TVerdict CT_ProcStep::doTestStepL() /** @return - TVerdict code diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_ProcStep.h --- a/appfw/apparchitecture/tef/T_ProcStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_ProcStep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -37,6 +37,7 @@ _LIT8(KTResultFail, "FAIL"); + //! A CT_ProcStep test class. /** Checks for child process existence when its parent terminates. */ @@ -46,6 +47,8 @@ public: CT_ProcStep(); ~CT_ProcStep(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); private: void testChildExistsL(void); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_RApaLsSessionStep.cpp --- a/appfw/apparchitecture/tef/T_RApaLsSessionStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_RApaLsSessionStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -61,8 +61,60 @@ #if !defined(__E32TEST_H__) #include #endif +#include "T_SisFileInstaller.h" -// Literals & Constants +_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis"); +_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone"); + +_LIT(KZeroSizeIconAppSisFile, "z:\\apparctest\\apparctestsisfiles\\zerosizedicontestapp.sis"); +_LIT(KZeroSizeIconAppComponent, "zerosizedicontestapp"); + +_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis"); +_LIT(KApparcTestAppComponent, "TApparcTestApp"); + +_LIT(KGroupNameTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_groupname.sis"); +_LIT(KGroupNameTestAppComponent, "T_groupname"); + +_LIT(KAppNotEmbeddableSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppNotEmbeddable_v2.sis"); +_LIT(KAppNotEmbeddableComponent, "TAppNotEmbeddable_v2"); + +_LIT(KAppEmbeddableOnlySisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableOnly_v2.sis"); +_LIT(KAppEmbeddableOnlyComponent, "TAppEmbeddableOnly_v2"); + +_LIT(KAppEmbeddableStandaloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddable_standalone.sis"); +_LIT(KAppEmbeddableStandaloneComponent, "TAppEmbeddable_standalone"); + +_LIT(KAppEmbeddableEmbeddedSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddable_embedded.sis"); +_LIT(KAppEmbeddableEmbeddedComponent, "TAppEmbeddable_embedded"); + +_LIT(KAppEmbeddableUiNotStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiNotStandAlone_v2.sis"); +_LIT(KAppEmbeddableUiNotStandAloneComponent, "TAppEmbeddableUiNotStandAlone_v2"); + +_LIT(KAppEmbeddableUiOrStandAloneEmbeddedSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiOrStandAlone_embedded.sis"); +_LIT(KAppEmbeddableUiOrStandAloneEmbeddedComponent, "TAppEmbeddableUiOrStandAlone_embedded"); + +_LIT(KAppEmbeddableUiOrStandAloneStandaloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiOrStandalone_standalone.sis"); +_LIT(KAppEmbeddableUiOrStandAloneStandaloneComponent, "TAppEmbeddableUiOrStandalone_standalone"); + +_LIT(KSimpleAppSisFile, "z:\\apparctest\\apparctestsisfiles\\SimpleApparcTestApp.sis"); +_LIT(KSimpleAppComponent, "SimpleApparcTestApp"); + +_LIT(KWinChainAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_winchainLaunch.sis"); +_LIT(KWinChainAppComponent, "t_winchainLaunch"); + +_LIT(KServerApp7SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp7.sis"); +_LIT(KServerApp7Component, "serverapp7"); + +_LIT(KTestTrustedPriorityApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\TestTrustedPriorityApp1.sis"); +_LIT(KTestTrustedPriorityApp1Component, "TestTrustedPriorityApp1"); + +_LIT(KTestUnTrustedPriorityApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\TestUnTrustedPriorityApp1.sis"); +_LIT(KTestUnTrustedPriorityApp1Component, "TestUnTrustedPriorityApp1"); + +_LIT(KTestTrustedPriorityApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\TestTrustedPriorityApp2.sis"); +_LIT(KTestTrustedPriorityApp2Component, "TestTrustedPriorityApp2"); + +// Literals & Constants _LIT(KCompleted, "Completed."); const TUint KBytesToRead=100; @@ -496,35 +548,19 @@ { INFO_PRINTF1(_L("Setting up Applist invalid test.")); - _LIT(KTempAppDir, "C:\\private\\10003a3f\\import\\apps\\"); - _LIT(KTempRegPath, "C:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc"); - TFullName regPath=_L("z:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc"); - - CFileMan* iAppListInvalidTestFileMan = CFileMan::NewL (iFs); - CleanupStack::PushL(iAppListInvalidTestFileMan); - - INFO_PRINTF1(_L("Copy tstapp files to C: drive.......")); - TInt rtn=iFs.MkDirAll(KTempAppDir); - TEST(rtn==KErrNone||rtn==KErrAlreadyExists); - TEST(iAppListInvalidTestFileMan->Copy(regPath, KTempRegPath)==KErrNone); //Just to start the idle update. + TRequestStatus status; + iLs.SetNotify(EFalse,status); + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile); + sisFileInstaller.InstallSisL(KTstAppStandAloneSisFile); INFO_PRINTF1(_L("Get app list.......")); TInt ret = iLs.GetAllApps(); TEST(ret==KErrNone); - - INFO_PRINTF1(_L("Remove temp files from C: drive.......")); - TRequestStatus status; - TTime tempTime(0); // added tempTime to avoid asynch CFileMan::Attribs request completing with KErrArgument - TEST(iAppListInvalidTestFileMan->Attribs(KTempAppDir,0,KEntryAttReadOnly, tempTime, CFileMan::ERecurse, status)==KErrNone); User::WaitForRequest(status); - TEST(status.Int() == KErrNone); - INFO_PRINTF1(_L("Deleting Reg file.......")); - TEST(iAppListInvalidTestFileMan->Delete(KTempRegPath)==KErrNone); //Just to start the idle update. - INFO_PRINTF1(_L("Removing App dir.......")); - TEST(iAppListInvalidTestFileMan->RmDir(KTempAppDir)==KErrNone); - CleanupStack::PopAndDestroy(iAppListInvalidTestFileMan); + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KTstAppStandAloneComponent); INFO_PRINTF1(KCompleted); } @@ -1746,12 +1782,13 @@ HBufC* fullIconFileName = NULL; ret = iLs.GetAppViewIcon(TUid::Uid(KGroupNameApp), viewInfo.iUid, fullIconFileName); - TEST(ret == KErrNone); - TEST(fullIconFileName != NULL); - INFO_PRINTF2(_L("The View icon's UID is - %X"), viewInfo.iUid); - TEST(!fullIconFileName->Compare(_L("file://c/resource/apps/tcheckiconapp.xyz"))); - INFO_PRINTF2(_L("View's icon file name is - %S"), fullIconFileName); - + + TEST(ret == KErrNone); + TEST(fullIconFileName != NULL); + INFO_PRINTF2(_L("The View icon's UID is - %X"), viewInfo.iUid); + TEST(!fullIconFileName->Compare(_L("file://c/resource/apps/tcheckiconapp.xyz"))); + INFO_PRINTF2(_L("View's icon file name is - %S"), fullIconFileName); + delete fullIconFileName; CleanupStack::PopAndDestroy(appViews); @@ -1827,7 +1864,7 @@ TInt err = iLs.GetAppIcon(TUid::Uid(KApparcTestApp), svgIconFile); TEST(err == KErrNone); - _LIT(KSVGIconFileName, "z:\\resource\\apps\\svg_icon.svg"); + _LIT(KSVGIconFileName, "c:\\resource\\apps\\svg_icon.svg"); //Get the name of the icon file TBuf svgIconFileName; svgIconFile.FullName(svgIconFileName); @@ -1895,27 +1932,15 @@ */ void CT_RApaLsSessionTestStep::TestAppListInstallationL() { - _LIT(KTestAppDestDir, "C:\\private\\10003a3f\\import\\apps\\" ); - _LIT(KTestAppSource, "Z:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc" ); - _LIT(KTestAppDest, "C:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc" ); - - _LIT(KTestWaitingForApplistUpdate,"Waiting %d microseconds for applist to be updated"); - const TInt KApplistUpdateTime = 10000000; // Copy App files around and delete them to check whether // the app list updates and stores the cache correctly. - RFs theFS; - theFS.Connect(); - - // Remove Test app from the file system - CFileMan* fileManager = CFileMan::NewL (theFS); - - INFO_PRINTF1(_L("Copying the app to C")); - TEST(KErrNone == fileManager->Copy (KTestAppSource, KTestAppDest, CFileMan::ERecurse)); - INFO_PRINTF2(KTestWaitingForApplistUpdate, KApplistUpdateTime); - User::After(KApplistUpdateTime); - + INFO_PRINTF1(_L("Installing the app from C")); + CSisFileInstaller sisInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile); + sisInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile); + TApaAppInfo aInfo; TEST(KErrNone == iLs.GetAppInfo (aInfo, KUidTestApp)); @@ -1925,18 +1950,8 @@ TEST(parse.Drive ().CompareF (KCdrive) == 0); INFO_PRINTF1(_L("Removing the app from C")); - TRequestStatus status; - TTime tempTime(0); // added tempTime to avoid asynch CFileMan::Attribs request completing with KErrArgument - TEST(fileManager->Attribs(KTestAppDest,0,KEntryAttReadOnly, tempTime, CFileMan::ERecurse, status)==KErrNone); - User::WaitForRequest(status); - TEST(status.Int() == KErrNone); - TEST(KErrNone == fileManager->Delete (KTestAppDest, CFileMan::ERecurse)); - INFO_PRINTF1(_L("Removing the app dir from C")); - TEST(fileManager->RmDir(KTestAppDestDir)==KErrNone); - - INFO_PRINTF2(KTestWaitingForApplistUpdate, KApplistUpdateTime); - User::After(KApplistUpdateTime); - + sisInstaller.UninstallSisAndWaitForAppListUpdateL(KTstAppStandAloneComponent); + // That should put the file in the right place TEST(KErrNone == iLs.GetAppInfo( aInfo, KUidTestApp)); @@ -1945,12 +1960,10 @@ INFO_PRINTF1(_L("Comparing App drive location is Z:... ")); TEST((parse1.Drive().CompareF(KZdrive)) == 0); - delete fileManager; - theFS.Close(); - INFO_PRINTF1(_L("Test TestAppListInstallationL completed")); } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK /** @SYMTestCaseID T-RApaLsSessionTestStep-TestAppListInstallation1L @@ -2039,6 +2052,7 @@ INFO_PRINTF1(_L("Test TestAppListInstallation1L completed")); } +#endif /** @SYMTestCaseID APPFWK-APPARC-0107 @@ -2063,18 +2077,6 @@ INFO_PRINTF1(_L("Test TestZeroSizedIconFileL Started..........")); - _LIT(KTestAppDestDir, "C:\\private\\10003a3f\\import\\apps\\" ); - _LIT(KTestAppResourceDir, "C:\\resource\\apps\\" ); - - _LIT(KTestAppSource, "Z:\\apparctest\\zerosizedicon_reg.rsc" ); - _LIT(KTestAppDest, "C:\\private\\10003a3f\\import\\apps\\zerosizedicon_reg.rsc" ); - - _LIT(KTestMbmSource, "Z:\\resource\\apps\\zerosizedicon.mbm"); - _LIT(KTestMbmDest, "C:\\resource\\apps\\zerosizedicon.mbm"); - - _LIT(KTestLocSource, "Z:\\apparctest\\zerosizedicon_loc.rsc"); - _LIT(KTestLocDest, "C:\\resource\\apps\\zerosizedicon_loc.rsc"); - TRequestStatus appScanCompleted=KRequestPending; iLs.SetNotify(EFalse,appScanCompleted); @@ -2082,33 +2084,17 @@ CleanupClosePushL(utils); TEST(KErrNone == utils.Connect()); - INFO_PRINTF1(_L("Creating directory C:\\private\\10003a3f\\import\\apps\\ folder")); - TInt err=utils.CreateDirectoryL(KTestAppDestDir); - TESTEL((err==KErrNone) || (err==KErrAlreadyExists),err); - - INFO_PRINTF1(_L("Creating directory C:\\resource\\apps\\ folder")); - err=utils.CreateDirectoryL(KTestAppResourceDir); - TESTEL((err==KErrNone) || (err==KErrAlreadyExists),err); - - INFO_PRINTF1(_L("Copying _reg.rsc to C:\\private\\10003a3f\\import\\apps\\ folder")); - User::LeaveIfError(utils.CopyFileL(KTestAppSource,KTestAppDest)); - INFO_PRINTF1(_L("Copying the mbm and _loc.rsc to C:\\resource\\apps\\ folder")); - User::LeaveIfError(utils.CopyFileL(KTestMbmSource,KTestMbmDest)); - User::LeaveIfError(utils.CopyFileL(KTestLocSource,KTestLocDest)); - + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KZeroSizeIconAppSisFile); + sisFileInstaller.InstallSisL(KZeroSizeIconAppSisFile); + User::WaitForRequest(appScanCompleted); TEST(appScanCompleted.Int()==MApaAppListServObserver::EAppListChanged); appScanCompleted=KRequestPending; iLs.SetNotify(EFalse,appScanCompleted); - INFO_PRINTF1(_L("Removing _reg.rsc from C:\\private\\10003a3f\\import\\apps\\ folder")); - TEST(KErrNone == DeleteFileL(utils, KTestAppDest)); - INFO_PRINTF1(_L("Removing the mbm and _loc.rsc from C:\\resource\\apps\\ folder")); - TEST(KErrNone == DeleteFileL(utils, KTestMbmDest)); - TEST(KErrNone == DeleteFileL(utils, KTestLocDest)); - INFO_PRINTF1(_L("Removing the C:\\private\\10003a3f\\import\\apps\\ dir ")); - TEST(KErrNone == utils.DeleteDirectoryL(KTestAppDestDir)); - + + sisFileInstaller.UninstallSisL(KZeroSizeIconAppComponent); User::WaitForRequest(appScanCompleted); CleanupStack::PopAndDestroy(&utils);//utils INFO_PRINTF1(_L("Test TestZeroSizedIconFileL completed")); @@ -2137,7 +2123,8 @@ return(err); } - + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK /** @SYMTestCaseID T-RApaLsSessionTestStep-TestAppFolderNonRomDrivesL @@ -2213,7 +2200,8 @@ INFO_PRINTF1(_L("Test scanning of app folder for non-ROM drives completed")); } - +#endif + /** @SYMTestCaseID T-RApaLsSessionTestStep-DoNumDefIconsTestL @@ -2445,7 +2433,7 @@ void CT_RApaLsSessionTestStep::TestDataPriorityForUnTrustedApps() { INFO_PRINTF1(_L("TestDataPriorityForUnTrustedApps about to start...")); - const TUid KUidUnTrustedApp = {0x10207f8C}; + const TUid KUidUnTrustedApp = {0x80207f8C}; const TUid KUidTrustedApp = {0x10207f8D}; TInt ret; TBool insertVal = EFalse; @@ -2527,24 +2515,29 @@ bufferAllocator->Create(TSize(200,1), EColor16M); CleanupStack::PopAndDestroy(bufferAllocator); - - HEAP_TEST_LS_SESSION(iLs, 0, 0, TestAppListInvalidL(), iLs.ClearAppInfoArray() ); + TRequestStatus status; + iLs.SetNotify(ETrue, status); + User::WaitForRequest(status); + + HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListInvalidL(), iLs.ClearAppInfoArray() ); //DONT_CHECK due to file system changes HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListInstallationL(), NO_CLEANUP); - HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListInstallation1L(), NO_CLEANUP); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListInstallation1L(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppFolderNonRomDrivesL(), NO_CLEANUP); +#endif HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestZeroSizedIconFileL(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iLs, 0, 0, IconLoadingTestCasesL(), NO_CLEANUP); - HEAP_TEST_LS_SESSION(iLs, 0, 0, AppInfoTestCasesL(), iLs.ClearAppInfoArray(); NO_CLEANUP); - HEAP_TEST_LS_SESSION(iLs, 0, 0, EmbeddedAppsTestCases(), iLs.ClearAppInfoArray() ); + HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, AppInfoTestCasesL(), iLs.ClearAppInfoArray(); NO_CLEANUP); + HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, EmbeddedAppsTestCases(), iLs.ClearAppInfoArray() ); HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, DoNumDefIconsTestL(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iLs, 0, 0, TestMatchesSecurityPolicy(), NO_CLEANUP); //DONT_CHECK since there's a new typestore HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestNotifyOnDataMappingChangeL(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iLs, 0, 0, TestAppListRecognizeDataBufferOnlyL(), iLs.FlushRecognitionCache() ); HEAP_TEST_LS_SESSION(iLs, 0, 0, TestAppListRecognizeDataPassedByBufferL(), iLs.FlushRecognitionCache() ); - HEAP_TEST_LS_SESSION(iLs, 0, 0, TestAppListRecognizeDataL(), iLs.FlushRecognitionCache() ); - HEAP_TEST_LS_SESSION(iLs, 0, 0, TestDataPriorityForUnTrustedApps(), NO_CLEANUP); + HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListRecognizeDataL(), iLs.FlushRecognitionCache() ); + HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestDataPriorityForUnTrustedApps(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iLs, 0, 0, TestDataPriorityForUnTrustedAppsRegFile(), NO_CLEANUP); TestIconLoaderAndIconArrayMemoryLeaksL(); } @@ -2586,16 +2579,65 @@ */ TVerdict CT_RApaLsSessionTestStep::doTestStepPreambleL() { + CSisFileInstaller sisFIleInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile); + sisFIleInstaller.InstallSisL(KApparcTestAppSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KGroupNameTestAppSisFile); + sisFIleInstaller.InstallSisL(KGroupNameTestAppSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppNotEmbeddableSisFile); + sisFIleInstaller.InstallSisL(KAppNotEmbeddableSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableOnlySisFile); + sisFIleInstaller.InstallSisL(KAppEmbeddableOnlySisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableStandaloneSisFile); + sisFIleInstaller.InstallSisL(KAppEmbeddableStandaloneSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableEmbeddedSisFile); + sisFIleInstaller.InstallSisL(KAppEmbeddableEmbeddedSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiNotStandAloneSisFile); + sisFIleInstaller.InstallSisL(KAppEmbeddableUiNotStandAloneSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiOrStandAloneEmbeddedSisFile); + sisFIleInstaller.InstallSisL(KAppEmbeddableUiOrStandAloneEmbeddedSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile); + sisFIleInstaller.InstallSisL(KSimpleAppSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KWinChainAppSisFile); + sisFIleInstaller.InstallSisL(KWinChainAppSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp7SisFile); + sisFIleInstaller.InstallSisL(KServerApp7SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestTrustedPriorityApp1SisFile); + sisFIleInstaller.InstallSisL(KTestTrustedPriorityApp1SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestUnTrustedPriorityApp1SisFile); + sisFIleInstaller.InstallSisL(KTestUnTrustedPriorityApp1SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestTrustedPriorityApp2SisFile); + sisFIleInstaller.InstallSisL(KTestTrustedPriorityApp2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiOrStandAloneStandaloneSisFile); + sisFIleInstaller.InstallSisAndWaitForAppListUpdateL(KAppEmbeddableUiOrStandAloneStandaloneSisFile); + SetTestStepResult(EPass); return TestStepResult(); } + /** @return - TVerdict code Override of base class virtual */ TVerdict CT_RApaLsSessionTestStep::doTestStepPostambleL() { + CSisFileInstaller sisFIleInstaller; + sisFIleInstaller.UninstallSisL(KApparcTestAppComponent); + sisFIleInstaller.UninstallSisL(KGroupNameTestAppComponent); + sisFIleInstaller.UninstallSisL(KAppNotEmbeddableComponent); + sisFIleInstaller.UninstallSisL(KAppEmbeddableOnlyComponent); + sisFIleInstaller.UninstallSisL(KAppEmbeddableStandaloneComponent); + sisFIleInstaller.UninstallSisL(KAppEmbeddableEmbeddedComponent); + sisFIleInstaller.UninstallSisL(KAppEmbeddableUiNotStandAloneComponent); + sisFIleInstaller.UninstallSisL(KAppEmbeddableUiOrStandAloneEmbeddedComponent); + sisFIleInstaller.UninstallSisL(KAppEmbeddableUiOrStandAloneStandaloneComponent); + sisFIleInstaller.UninstallSisL(KSimpleAppComponent); + sisFIleInstaller.UninstallSisL(KWinChainAppComponent); + sisFIleInstaller.UninstallSisL(KServerApp7Component); + sisFIleInstaller.UninstallSisL(KTestTrustedPriorityApp1Component); + sisFIleInstaller.UninstallSisL(KTestUnTrustedPriorityApp1Component); + sisFIleInstaller.UninstallSisL(KTestTrustedPriorityApp2Component); return TestStepResult(); } @@ -2603,7 +2645,15 @@ TVerdict CT_RApaLsSessionTestStep::doTestStepL() { INFO_PRINTF1(_L("Testing Apparc...T_RApaLsSession Test Cases Running...")); - + + TApaAppInfo info; + TUid uid = {0xABCD0000}; + TInt err = iLs.GetAppInfo(info, uid); + if(err == KErrNone) + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KZeroSizeIconAppComponent); + } TRAPD(ret,RunTestCasesL()) TEST(ret==KErrNone); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_RApaLsSessionStep.h --- a/appfw/apparchitecture/tef/T_RApaLsSessionStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_RApaLsSessionStep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -112,7 +112,9 @@ void TestAppListRecognizeDataPassedByBufferL(); void TestAppListInstallationL(); void TestAppListInstallation1L(); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK void TestAppFolderNonRomDrivesL(); +#endif void TestZeroSizedIconFileL(); void EmbeddedAppsTestCases(); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.cpp --- a/appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -29,6 +29,20 @@ #endif //SYMBIAN_ENABLE_SPLIT_HEADERS #include "testableapalssession.h" +#include "T_SisFileInstaller.h" + +_LIT(KRuleBasedApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\tRuleBasedApp1.sis"); +_LIT(KRuleBasedApp1Component, "tRuleBasedApp1"); + +_LIT(KRuleBasedApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\tRuleBasedApp2.sis"); +_LIT(KRuleBasedApp2Component, "tRuleBasedApp2"); + +_LIT(KRuleBasedApp3SisFile, "z:\\apparctest\\apparctestsisfiles\\tRuleBasedApp3.sis"); +_LIT(KRuleBasedApp3Component, "tRuleBasedApp3"); + +_LIT(KRuleBasedApp4SisFile, "z:\\apparctest\\apparctestsisfiles\\tRuleBasedApp4.sis"); +_LIT(KRuleBasedApp4Component, "tRuleBasedApp4"); + const TUint KNonNativeApplicationType = 0x10207f90; const TUint KNonNativeApplication = 0xA0000B6E; @@ -55,7 +69,9 @@ CleanupClosePushL(theLs); //DONT_CHECK since app list is updated +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK HEAP_TEST_LS_SESSION(theLs, 0, DONT_CHECK, TestLaunchNonNativeApplicationForRuleBasedL(theLs), NO_CLEANUP); +#endif //DONT_CHECK since result is unstable HEAP_TEST_LS_SESSION(theLs, 0, DONT_CHECK, LaunchAppTests1L(theLs), theLs.FlushRecognitionCache() ); HEAP_TEST_LS_SESSION(theLs, 0, 0, LaunchAppTests2L(theLs), theLs.FlushRecognitionCache() ); @@ -445,6 +461,38 @@ AppClosed(KUidApp4); } +TVerdict CTRuleBasedLaunchingStep::doTestStepPreambleL() + { + CSisFileInstaller sisFIleInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRuleBasedApp1SisFile); + sisFIleInstaller.InstallSisL(KRuleBasedApp1SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRuleBasedApp2SisFile); + sisFIleInstaller.InstallSisL(KRuleBasedApp2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRuleBasedApp3SisFile); + sisFIleInstaller.InstallSisL(KRuleBasedApp3SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRuleBasedApp4SisFile); + sisFIleInstaller.InstallSisAndWaitForAppListUpdateL(KRuleBasedApp4SisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + + +/** + @return - TVerdict code + Override of base class virtual + */ +TVerdict CTRuleBasedLaunchingStep::doTestStepPostambleL() + { + CSisFileInstaller sisFIleInstaller; + sisFIleInstaller.UninstallSisL(KRuleBasedApp1Component); + sisFIleInstaller.UninstallSisL(KRuleBasedApp2Component); + sisFIleInstaller.UninstallSisL(KRuleBasedApp3Component); + sisFIleInstaller.UninstallSisL(KRuleBasedApp4Component); + return TestStepResult(); + } + + TVerdict CTRuleBasedLaunchingStep::doTestStepL() { INFO_PRINTF1(_L("TRuleBasedLaunchingStep test started....")); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.h --- a/appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -31,6 +31,8 @@ { public: CTRuleBasedLaunchingStep(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); void ExecuteL(); private: diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_Serv2Step.CPP --- a/appfw/apparchitecture/tef/T_Serv2Step.CPP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_Serv2Step.CPP Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -48,6 +48,36 @@ #include #include "TAppEmbedUids.h" #include "appfwk_test_utils.h" +#include "T_SisFileInstaller.h" + +_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis"); +_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone"); + +_LIT(KAppEmbeddableEmbeddedSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddable_embedded.sis"); +_LIT(KAppEmbeddableEmbeddedComponent, "TAppEmbeddable_embedded"); + +_LIT(KAppNotEmbeddableV2SisFile, "z:\\apparctest\\apparctestsisfiles\\TAppNotEmbeddable_v2.sis"); +_LIT(KAppNotEmbeddableV2Component, "TAppNotEmbeddable_v2"); + +_LIT(KAppEmbeddableOnlyV2SisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableOnly_v2.sis"); +_LIT(KAppEmbeddableOnlyV2Component, "TAppEmbeddableOnly_v2"); + +_LIT(KAppEmbeddableStandaloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddable_standalone.sis"); +_LIT(KAppEmbeddableStandaloneComponent, "TAppEmbeddable_standalone"); + +_LIT(KAppEmbeddableUiNotStandAloneV2SisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiNotStandAlone_v2.sis"); +_LIT(KAppEmbeddableUiNotStandAloneV2Component, "TAppEmbeddableUiNotStandAlone_v2"); + +_LIT(KAppEmbeddableUiOrStandAloneEmbeddedSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiOrStandAlone_embedded.sis"); +_LIT(KAppEmbeddableUiOrStandAloneEmbeddedComponent, "TAppEmbeddableUiOrStandAlone_embedded"); + + +_LIT(KAppEmbeddableUiOrStandAloneStandaloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiOrStandAlone_standalone.sis"); +_LIT(KAppEmbeddableUiOrStandAloneStandaloneComponent, "TAppEmbeddableUiOrStandalone_standalone"); + +_LIT(KSimpleAppSisFile, "z:\\apparctest\\apparctestsisfiles\\SimpleApparcTestApp.sis"); +_LIT(KSimpleAppComponent, "SimpleApparcTestApp"); + // Constants const TInt KOneSecondDelay = 1000000; @@ -105,8 +135,11 @@ { _LIT(KLitAppPath,"z:\\sys\\bin\\tstapp.exe"); TFullName appPath(KLitAppPath); + + //Search for TestApp TApaAppInfo info; + TInt ret = aLs.GetAllApps(); TEST(ret==KErrNone); @@ -1387,27 +1420,12 @@ */ void CT_Serv2Step::DoInstallationTestL (RApaLsSession ls) { - _LIT(KTestAppDestDir, "C:\\private\\10003a3f\\import\\apps\\" ); - _LIT(KTestAppSource, "Z:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc" ); - _LIT(KTestAppDest, "C:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc" ); - _LIT(KTestWaitingForApplistUpdate,"\nWaiting %d microseconds for applist to be updated"); - const TInt KApplistUpdateTime = 8000000; - - // Copy App files around and delete them to check whether - // the app list updates and stores the cache correctly. - RFs theFs; - theFs.Connect(); - // Remove Test app from the file system - CFileMan* fileManager = CFileMan::NewL (theFs); - - INFO_PRINTF1(_L("Copying the app to C")); - TEST(KErrNone == fileManager->Copy (KTestAppSource, KTestAppDest, CFileMan::ERecurse)); - - INFO_PRINTF2(KTestWaitingForApplistUpdate, KApplistUpdateTime); - User::After(KApplistUpdateTime); - + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile); + TApaAppInfo aInfo; TEST(KErrNone == ls.GetAppInfo (aInfo, KUidTestApp)); @@ -1417,15 +1435,10 @@ TEST(parse.Drive ().CompareF (KCdrive) == 0); INFO_PRINTF1(_L("Removing the app from C")); - TTime tempTime(0); - fileManager->Attribs(KTestAppDest,0,KEntryAttReadOnly, tempTime, CFileMan::ERecurse); - TEST(KErrNone == fileManager->Delete (KTestAppDest, CFileMan::ERecurse)); - INFO_PRINTF1(_L("Removing the app dir from C")); - TEST(fileManager->RmDir(KTestAppDestDir)==KErrNone); + + - INFO_PRINTF2(KTestWaitingForApplistUpdate, KApplistUpdateTime); - User::After(KApplistUpdateTime); - + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KTstAppStandAloneComponent); // That should put the file in the right place TEST(KErrNone == ls.GetAppInfo( aInfo, KUidTestApp)); @@ -1433,9 +1446,7 @@ _LIT (KZdrive, "Z:"); INFO_PRINTF1(_L("Comparing App drive location is Z:... ")); TEST((parse1.Drive().CompareF(KZdrive)) == 0); - - delete fileManager; - theFs.Close(); + } // @@ -1757,6 +1768,24 @@ Override of base class virtual */ { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableEmbeddedSisFile); + sisFileInstaller.InstallSisL(KAppEmbeddableEmbeddedSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppNotEmbeddableV2SisFile); + sisFileInstaller.InstallSisL(KAppNotEmbeddableV2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableOnlyV2SisFile); + sisFileInstaller.InstallSisL(KAppEmbeddableOnlyV2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableStandaloneSisFile); + sisFileInstaller.InstallSisL(KAppEmbeddableStandaloneSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiNotStandAloneV2SisFile); + sisFileInstaller.InstallSisL(KAppEmbeddableUiNotStandAloneV2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiOrStandAloneEmbeddedSisFile); + sisFileInstaller.InstallSisL(KAppEmbeddableUiOrStandAloneEmbeddedSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile); + sisFileInstaller.InstallSisL(KSimpleAppSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiOrStandAloneStandaloneSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KAppEmbeddableUiOrStandAloneStandaloneSisFile); + SetTestStepResult(EPass); return TestStepResult(); } @@ -1767,6 +1796,16 @@ Override of base class virtual */ { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KAppEmbeddableEmbeddedComponent); + sisFileInstaller.UninstallSisL(KAppNotEmbeddableV2Component); + sisFileInstaller.UninstallSisL(KAppEmbeddableOnlyV2Component); + sisFileInstaller.UninstallSisL(KAppEmbeddableStandaloneComponent); + sisFileInstaller.UninstallSisL(KAppEmbeddableUiNotStandAloneV2Component); + sisFileInstaller.UninstallSisL(KAppEmbeddableUiOrStandAloneEmbeddedComponent); + sisFileInstaller.UninstallSisL(KAppEmbeddableUiOrStandAloneStandaloneComponent); + sisFileInstaller.UninstallSisL(KSimpleAppComponent); + return TestStepResult(); } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_ServiceRegistryStep.cpp --- a/appfw/apparchitecture/tef/T_ServiceRegistryStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_ServiceRegistryStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -25,16 +25,18 @@ #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include #endif - - +#include "T_SisFileInstaller.h" + +_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis"); +_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone"); -_LIT(KImportAppsDir,"c:\\private\\10003a3f\\import\\apps\\"); -_LIT(KAppRscSourcePath,"z:\\system\\data\\TestUpdRegAppUninstallation_reg.rsc"); -_LIT(KUpgradeAppRscSourcePath,"z:\\system\\data\\TestUpgradeUpdRegAppUninstallation_reg.rsc"); -_LIT(KAppRscTargetPath,"c:\\private\\10003a3f\\import\\apps\\TestUpdRegAppUninstallation_reg.rsc"); +_LIT(KServerApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp2.sis"); +_LIT(KServerApp2Component, "serverapp2"); + +_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis"); +_LIT(KApparcTestAppComponent, "TApparcTestApp"); _LIT8(KLitMimeType,"mime/updregappuninstall"); -_LIT8(KLitUpgradeAppMimeType,"mime/upgradeupdregappuninstall"); /** * Constructor @@ -58,6 +60,10 @@ */ TVerdict CT_ServiceRegistryTestStep::doTestStepPreambleL() { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp2SisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KServerApp2SisFile); + SetTestStepResult(EPass); return TestStepResult(); } @@ -68,6 +74,9 @@ */ TVerdict CT_ServiceRegistryTestStep::doTestStepPostambleL() { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KServerApp2Component); + return TestStepResult(); } @@ -95,6 +104,15 @@ RTestableApaLsSession ls; TEST(KErrNone == ls.Connect()); CleanupClosePushL(ls); + + TApaAppInfo info; + TUid uid = {0x100048F3}; + TInt err = ls.GetAppInfo(info, uid); + if(err == KErrNone) + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KApparcTestAppComponent); + } // Use DONT_CHECK because it complaints of heap unbalance (a CTypeStoreManager object, althought it is not actually leaked, // but reallocated in CApaAppListServer::DoUpdateTypeStoreL(void)). @@ -102,7 +120,9 @@ // a CApaFsMonitor object, which introduces an extra 0.25 second delay before invoking the callback. // *** See DEF101056 **** HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestAssociation1L(), NO_CLEANUP); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestAppForDataTypeAndServiceL(ls), NO_CLEANUP); +#endif HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestUpdateOfServiceRegistryOnAppUninstallationL(ls), NO_CLEANUP); HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestServiceRegistryOnAppUpgradeL(ls), NO_CLEANUP); @@ -279,42 +299,27 @@ CleanupClosePushL(fs); User::LeaveIfError(fs.Connect()); - TInt err = fs.CreateDirectoryL(KImportAppsDir); - TESTEL((err == KErrNone || err == KErrAlreadyExists), err); - INFO_PRINTF1(_L("c:\\private\\10003a3f\\import\\apps is created successfully or already exists")); - - //Make sure that the target file does not exist. - DeleteFileL(fs, KAppRscTargetPath); - - // Copy TestUpdRegAppUninstallation_reg.rsc from z:\ to c:\private\10003a3f\import\apps\. - err = fs.CopyFileL(KAppRscSourcePath, KAppRscTargetPath); - TEST(err == KErrNone); - INFO_PRINTF1(_L("Successfully copied TestUpdRegAppUninstallation_reg.rsc from Z:\\system\\data to c:\\private\\10003a3f\\import\\apps")); - - //Wait till the applist is updated. - WaitForAppListUpdateL(); - + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile); + CServiceRegistry* registry = CServiceRegistry::NewL(); CleanupStack::PushL(registry); - TUid appUid = {0x10207f80}; + TUid appUid = {0x100048f3}; TUid resultUid={KNullUidValue}; TDataType dataType (KLitMimeType); - //Test whether 0x10207f80 application is in application list. + //Test whether 0x100048f3 application is in application list. TApaAppInfo appInfo; TEST(aLs.GetAppInfo(appInfo,appUid)==KErrNone); - //Set 0x10207f80 as default application for "mime/updregappuninstall" MIME type. + //Set 0x100048f3 as default application for "mime/updregappuninstall" MIME type. registry->SetDefault(KOpenServiceUid,dataType, appUid); registry->GetDefault(KOpenServiceUid,dataType, resultUid); TEST(appUid==resultUid); - //Delete file c:\\private\\10003a3f\\import\\apps\\TestUpdRegAppUninstallation_reg.rsc - DeleteFileL(fs, KAppRscTargetPath); - - //Wait till the application list is updated. - WaitForAppListUpdateL(); + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KApparcTestAppComponent); //Check the application is removed from the application list TEST(aLs.GetAppInfo(appInfo,appUid)==KErrNotFound); @@ -353,62 +358,26 @@ { INFO_PRINTF1(_L("TestServiceRegistryOnAppUpgrade")); - RSmlTestUtils fs; - CleanupClosePushL(fs); - User::LeaveIfError(fs.Connect()); - - TInt err = fs.CreateDirectoryL(KImportAppsDir); - TESTEL((err == KErrNone || err == KErrAlreadyExists), err); - INFO_PRINTF1(_L("c:\\private\\10003a3f\\import\\apps is created successfully or already exists")); - - //Make sure that the target file does not exist. - DeleteFileL(fs, KAppRscTargetPath); - - // Copy TestUpdRegAppUninstallation_reg.rsc from z:\ to c:\private\10003a3f\import\apps\. - err = fs.CopyFileL(KAppRscSourcePath, KAppRscTargetPath); - TEST(err == KErrNone); - INFO_PRINTF1(_L("Successfully copied TestUpdRegAppUninstallation_reg.rsc from Z:\\system\\data to c:\\private\\10003a3f\\import\\apps")); - - //Wait till the applist is updated. - WaitForAppListUpdateL(); - CServiceRegistry* registry = CServiceRegistry::NewL(); CleanupStack::PushL(registry); - TUid appUid = {0x10207f80}; + TUid appUid = {0xA}; TUid resultUid={KNullUidValue}; TDataType dataType (KLitMimeType); - //Test whether 0x10207f80 application is in application list. + //Test whether 0xA application is in application list. TApaAppInfo appInfo; TEST(aLs.GetAppInfo(appInfo,appUid)==KErrNone); - //Set 0x10207f80 as default application for "mime/updregappuninstall" MIME type. + //Set 0xA as default application for "mime/updregappuninstall" MIME type. registry->SetDefault(KOpenServiceUid,dataType, appUid); registry->GetDefault(KOpenServiceUid,dataType, resultUid); TEST(appUid==resultUid); - TDataType upgDataType(KLitUpgradeAppMimeType); - err=aLs.AppForDataType(upgDataType,resultUid); - TEST(resultUid.iUid==KNullUidValue); - - DeleteFileL(fs, KAppRscTargetPath); + CSisFileInstaller sisFIleInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile); + sisFIleInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile); - err = fs.CopyFileL(KUpgradeAppRscSourcePath, KAppRscTargetPath); - TEST(err == KErrNone); - INFO_PRINTF1(_L("Successfully copied TestUpgradeUpdRegAppUninstallation_reg.rsc from Z:\\system\\data to c:\\private\\10003a3f\\import\\apps")); - - //Change the modified time of the file to current time - RFs aFs; - TEST(aFs.Connect()==KErrNone); - TTime modifiedTime(0); - modifiedTime.HomeTime(); - TEST(aFs.SetModified(KAppRscTargetPath, modifiedTime)==KErrNone); - aFs.Close(); - - //Wait till the applist is updated. - WaitForAppListUpdateL(); - //Check the application is not removed from the application list TEST(aLs.GetAppInfo(appInfo,appUid)==KErrNone); @@ -416,13 +385,9 @@ TEST(registry->GetDefault(KOpenServiceUid,dataType, resultUid)==KErrNone); TEST(resultUid==appUid); - err=aLs.AppForDataType(upgDataType,resultUid); - TEST((err==KErrNone) && (resultUid==appUid)); - - DeleteFileL(fs,KAppRscTargetPath); + sisFIleInstaller.UninstallSisL(KTstAppStandAloneComponent); CleanupStack::PopAndDestroy(registry); - CleanupStack::PopAndDestroy(&fs); } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_ServicesStep.cpp --- a/appfw/apparchitecture/tef/T_ServicesStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_ServicesStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -21,6 +21,8 @@ #include #include "T_ServicesStep.h" +#include "T_SisFileInstaller.h" + #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include #endif //SYMBIAN_ENABLE_SPLIT_HEADERS @@ -30,6 +32,37 @@ _LIT8(KLitPriorityText,"text/priority"); _LIT8(KLitCustom1Text, "text/custom1"); + +_LIT(KServerApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp2.sis"); +_LIT(KServerApp2Component, "serverapp2"); + +_LIT(KServerApp4SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp4.sis"); +_LIT(KServerApp4Component, "serverapp4"); + +_LIT(KServerApp6SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp6.sis"); +_LIT(KServerApp6Component, "serverapp6"); + +_LIT(KServerApp7SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp7.sis"); +_LIT(KServerApp7Component, "serverapp7"); + +_LIT(KOpenServiceApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\openservice1app.sis"); +_LIT(KOpenServiceApp1Component, "openservice1app"); + +_LIT(KOpenServiceApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\openservice2app.sis"); +_LIT(KOpenServiceApp2Component, "openservice2app"); + +_LIT(KCtrlPanelAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TCtrlPnlApp.sis"); +_LIT(KCtrlPanelAppComponent, "TCtrlPnlApp"); + +_LIT(KDataPrioritySystem1SisFile, "z:\\apparctest\\apparctestsisfiles\\T_DataPrioritySystem1.sis"); +_LIT(KDataPrioritySystem1Component, "T_DataPrioritySystem1"); + +_LIT(KDataPrioritySystem2SisFile, "z:\\apparctest\\apparctestsisfiles\\T_DataPrioritySystem2.sis"); +_LIT(KDataPrioritySystem2Component, "T_DataPrioritySystem2"); + +_LIT(KDataPrioritySystem3SisFile, "z:\\apparctest\\apparctestsisfiles\\T_DataPrioritySystem3.sis"); +_LIT(KDataPrioritySystem3Component, "T_DataPrioritySystem3"); + /** Constructor */ @@ -53,6 +86,28 @@ */ TVerdict CT_ServicesTestStep::doTestStepPreambleL() { + CSisFileInstaller sisInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp2SisFile); + sisInstaller.InstallSisL(KServerApp2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp4SisFile); + sisInstaller.InstallSisL(KServerApp4SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp6SisFile); + sisInstaller.InstallSisL(KServerApp6SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KOpenServiceApp1SisFile); + sisInstaller.InstallSisL(KOpenServiceApp1SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KOpenServiceApp2SisFile); + sisInstaller.InstallSisL(KOpenServiceApp2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KCtrlPanelAppSisFile); + sisInstaller.InstallSisL(KCtrlPanelAppSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KDataPrioritySystem1SisFile); + sisInstaller.InstallSisL(KDataPrioritySystem1SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KDataPrioritySystem2SisFile); + sisInstaller.InstallSisL(KDataPrioritySystem2SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KDataPrioritySystem3SisFile); + sisInstaller.InstallSisL(KDataPrioritySystem3SisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp7SisFile); + sisInstaller.InstallSisAndWaitForAppListUpdateL(KServerApp7SisFile); + SetTestStepResult(EPass); TInt error = iApaLsSession.Connect(); TEST(error==KErrNone); @@ -65,6 +120,17 @@ */ TVerdict CT_ServicesTestStep::doTestStepPostambleL() { + CSisFileInstaller sisInstaller; + sisInstaller.UninstallSisL(KServerApp2Component); + sisInstaller.UninstallSisL(KServerApp4Component); + sisInstaller.UninstallSisL(KServerApp6Component); + sisInstaller.UninstallSisL(KServerApp7Component); + sisInstaller.UninstallSisL(KOpenServiceApp1Component); + sisInstaller.UninstallSisL(KOpenServiceApp2Component); + sisInstaller.UninstallSisL(KCtrlPanelAppComponent); + sisInstaller.UninstallSisL(KDataPrioritySystem1Component); + sisInstaller.UninstallSisL(KDataPrioritySystem2Component); + sisInstaller.UninstallSisL(KDataPrioritySystem3Component); return TestStepResult(); } @@ -85,6 +151,7 @@ TInt CT_ServicesTestStep::RunTestCasesL() { HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery1L(), iApaLsSession.ClearAppInfoArray() ); +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery2L(), iApaLsSession.ClearAppInfoArray() ); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery3L(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery4L(), NO_CLEANUP); @@ -92,10 +159,13 @@ HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery6(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery7L(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery8L(), NO_CLEANUP); +#endif // The following two APIs InsertDataMappingL() & DeleteDataMappingL(), update the type store on the server side. // This update takes place on the server side while the test case is still running, which causes the heap check to fail. // To avoid the heap check on the server side, DONT_CHECK macro is used. +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK HEAP_TEST_LS_SESSION(iApaLsSession, 0, DONT_CHECK, TestServiceDiscovery9(), NO_CLEANUP ); +#endif HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery10L(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery11L(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery12L(), NO_CLEANUP); @@ -135,7 +205,7 @@ HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery24(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery25(), iApaLsSession.FlushRecognitionCache() ); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery27(), iApaLsSession.FlushRecognitionCache() ); - HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery28L(), NO_CLEANUP); + //HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery28L(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestOpenService1L(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestCtrlPnlAppL(), NO_CLEANUP); // The following two APIs InsertDataMappingL() & DeleteDataMappingL(), update the type store on the server side. diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_StartAppStep.cpp --- a/appfw/apparchitecture/tef/T_StartAppStep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_StartAppStep.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -24,10 +24,18 @@ #include "tstapp.h" #include "TRApaLsSessionStartAppTest.h" #include +#include "T_SisFileInstaller.h" _LIT(KCompleted, "Completed."); _LIT8(KLitPlainText,"text/plain"); +_LIT(KUnprotectedAppSisFile, "z:\\apparctest\\apparctestsisfiles\\UnProctectedUidApp.sis"); +_LIT(KUnprotectedAppComponent, "UnProctectedUidApp"); + +_LIT(KRApaLsSessionStartAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TRApaLsSessionStartAppTestApp_v2.sis"); +_LIT(KRApaLsSessionStartAppComponent, "TRApaLsSessionStartAppTestApp_v2"); + + const TInt KTUnProtectedAppTestPassed = 1234; class RIpcApparcFuzzTest : public RSessionBase @@ -108,6 +116,13 @@ */ TVerdict CT_StartAppTestStep::doTestStepPreambleL() { + CSisFileInstaller sisFileInstaller; + + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KUnprotectedAppSisFile); + sisFileInstaller.InstallSisL(KUnprotectedAppSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRApaLsSessionStartAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KRApaLsSessionStartAppSisFile); + SetTestStepResult(EPass); TInt error = iApaLsSession.Connect(); TEST(error==KErrNone); @@ -120,6 +135,11 @@ */ TVerdict CT_StartAppTestStep::doTestStepPostambleL() { + CSisFileInstaller sisFileInstaller; + + sisFileInstaller.UninstallSisL(KUnprotectedAppComponent); + sisFileInstaller.UninstallSisL(KRApaLsSessionStartAppComponent); + return TestStepResult(); } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_StartDocStep.CPP --- a/appfw/apparchitecture/tef/T_StartDocStep.CPP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_StartDocStep.CPP Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -22,6 +22,12 @@ #include "testableapalssession.h" #include "T_StartDocStep.h" #include "TStartDoc.h" +#include "T_SisFileInstaller.h" + +_LIT(KStartDocAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TStartDocApp_v2.sis"); +_LIT(KStartDocAppComponent, "TStartDocApp_v2"); + + /** @SYMTestCaseID T-StartDocStep-TestStartDocL @@ -119,6 +125,23 @@ User::After(1500000); } +TVerdict CT_StartDocStep::doTestStepPreambleL() + { + CSisFileInstaller sisInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KStartDocAppSisFile); + sisInstaller.InstallSisAndWaitForAppListUpdateL(KStartDocAppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_StartDocStep::doTestStepPostambleL() + { + CSisFileInstaller sisInstaller; + sisInstaller.UninstallSisL(KStartDocAppComponent); + return TestStepResult(); + } + TVerdict CT_StartDocStep::doTestStepL() { INFO_PRINTF1(_L("Test Started")); @@ -131,7 +154,7 @@ User::After(1500000); // run the test - HEAP_TEST_LS_SESSION(ls, 0, 0, TestStartDocL(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestStartDocL(ls), NO_CLEANUP); CleanupStack::PopAndDestroy(&ls); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_StartDocStep.h --- a/appfw/apparchitecture/tef/T_StartDocStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_StartDocStep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -27,6 +27,8 @@ class CT_StartDocStep : public CTestStep { public: + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); private: void TestStartDocL(RApaLsSession& aLs); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_WindowChainingStep.CPP --- a/appfw/apparchitecture/tef/T_WindowChainingStep.CPP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_WindowChainingStep.CPP Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -23,6 +23,15 @@ #include "T_WindowChainingStep.h" #include "TWindowChaining.h" #include +#include "T_SisFileInstaller.h" + +_LIT(KWinChainAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_winchainLaunch.sis"); +_LIT(KWinChainAppComponent, "t_winchainLaunch"); + +_LIT(KWinChainChildAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_winchainChild.sis"); +_LIT(KWinChainChildAppComponent, "t_winchainChild"); + + /** @SYMTestCaseID TODO @@ -112,6 +121,30 @@ SetTestStepResult(EFail); } + +TVerdict CT_WindowChainingStep::doTestStepPreambleL() + { + CSisFileInstaller sisInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KWinChainChildAppSisFile); + sisInstaller.InstallSisL(KWinChainChildAppSisFile); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KWinChainAppSisFile); + sisInstaller.InstallSisAndWaitForAppListUpdateL(KWinChainAppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + + +TVerdict CT_WindowChainingStep::doTestStepPostambleL() + { + CSisFileInstaller sisInstaller; + sisInstaller.UninstallSisL(KWinChainChildAppComponent); + sisInstaller.UninstallSisL(KWinChainAppComponent); + + return TestStepResult(); + } + + TVerdict CT_WindowChainingStep::doTestStepL() { __UHEAP_MARK; diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_WindowChainingStep.h --- a/appfw/apparchitecture/tef/T_WindowChainingStep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_WindowChainingStep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -27,6 +27,8 @@ class CT_WindowChainingStep : public CTestStep { public: + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); private: void TestWindowChainingL(); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_groupNametest.cpp --- a/appfw/apparchitecture/tef/T_groupNametest.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_groupNametest.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -30,6 +30,11 @@ #include "T_groupNametest.h" #include "apparctestserver.h" #include +#include "T_SisFileInstaller.h" + +_LIT(KGroupNameTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_groupname.sis"); +_LIT(KGroupNameTestAppComponent, "T_groupname"); + // CT_GroupNameStep @@ -99,6 +104,23 @@ } +TVerdict CT_GroupNameStep::doTestStepPreambleL() + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KGroupNameTestAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KGroupNameTestAppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } +TVerdict CT_GroupNameStep::doTestStepPostambleL() + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KGroupNameTestAppComponent); + + return TestStepResult(); + } + /** @return - TVerdict code Override of base class virtual diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_groupNametest.h --- a/appfw/apparchitecture/tef/T_groupNametest.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_groupNametest.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -32,6 +32,8 @@ CT_GroupNameStep(); ~CT_GroupNameStep(); virtual TVerdict doTestStepL(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); void DoTestGroupNameL(RApaLsSession& aLs); private: diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_groupNametest_ver1.cpp --- a/appfw/apparchitecture/tef/T_groupNametest_ver1.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_groupNametest_ver1.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -30,6 +30,10 @@ #include "T_groupNametest_ver1.h" #include "apparctestserver.h" #include +#include "T_SisFileInstaller.h" + +_LIT(KGroupNameVer1AppSisFile, "z:\\apparctest\\apparctestsisfiles\\T_groupname_ver1.sis"); +_LIT(KGroupNameVer1AppComponent, "T_groupname_ver1"); // CT_GroupNameStep_ver1 @@ -90,6 +94,24 @@ TEST(capability.iGroupName == KGroupname); } +TVerdict CT_GroupNameStep_ver1::doTestStepPreambleL() + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KGroupNameVer1AppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KGroupNameVer1AppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_GroupNameStep_ver1::doTestStepPostambleL() + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KGroupNameVer1AppComponent); + + return TestStepResult(); + } + /** @return - TVerdict code Override of base class virtual diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_groupNametest_ver1.h --- a/appfw/apparchitecture/tef/T_groupNametest_ver1.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_groupNametest_ver1.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -31,6 +31,8 @@ public: CT_GroupNameStep_ver1(); ~CT_GroupNameStep_ver1(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); void DoTestGroupNameL(RApaLsSession& aLs); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_groupNametest_ver2.cpp --- a/appfw/apparchitecture/tef/T_groupNametest_ver2.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_groupNametest_ver2.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -30,6 +30,10 @@ #include "T_groupNametest_ver2.h" #include "apparctestserver.h" #include +#include "T_SisFileInstaller.h" + +_LIT(KGroupNameVer2AppSisFile, "z:\\apparctest\\apparctestsisfiles\\T_groupname_ver2.sis"); +_LIT(KGroupNameVer2AppComponent, "T_groupname_ver2"); // CT_GroupNameStep_ver2 @@ -87,6 +91,25 @@ TEST(info.iShortCaption == KShortCaption); } +TVerdict CT_GroupNameStep_ver2::doTestStepPreambleL() + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KGroupNameVer2AppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KGroupNameVer2AppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_GroupNameStep_ver2::doTestStepPostambleL() + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KGroupNameVer2AppComponent); + + return TestStepResult(); + } + + /** @return - TVerdict code Override of base class virtual diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/T_groupNametest_ver2.h --- a/appfw/apparchitecture/tef/T_groupNametest_ver2.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/T_groupNametest_ver2.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -30,6 +30,8 @@ public: CT_GroupNameStep_ver2(); ~CT_GroupNameStep_ver2(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); virtual TVerdict doTestStepL(); void DoTestCaptionNameL(RApaLsSession& aLs); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/UnProctectedUidApp.mmp --- a/appfw/apparchitecture/tef/UnProctectedUidApp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/UnProctectedUidApp.mmp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -36,13 +36,13 @@ start resource UnProctectedUidApp.rss HEADER -targetpath /resource/apps +targetpath /apparctestregfiles end // Application exe registration resource file resource UnProctectedUidApp_reg.rss start resource UnProctectedUidApp_reg.rss -targetpath /private/10003a3f/apps +targetpath /apparctestregfiles lang sc end diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/app_CTRL.MMP --- a/appfw/apparchitecture/tef/app_CTRL.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/app_CTRL.MMP Fri May 14 16:01:13 2010 +0300 @@ -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,21 +38,21 @@ // Application exe specific resource which is localised to the application resource App_CTRL.rss start resource App_CTRL.rss -targetpath /resource/apps +targetpath /apparctestregfiles lang sc end // Application exe registration resource file resource App_CTRL_reg.rss start resource App_CTRL_reg.rss -targetpath /private/10003a3f/apps +targetpath /apparctestregfiles lang sc end // Application localisable resource file resource App_ctrl_loc.RSS start resource App_ctrl_loc.RSS -targetpath /resource/apps +targetpath /apparctestregfiles lang sc end diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/app_CTRL2.MMP --- a/appfw/apparchitecture/tef/app_CTRL2.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/app_CTRL2.MMP Fri May 14 16:01:13 2010 +0300 @@ -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,14 +41,14 @@ // Application exe specific resource which is localised to the application resource App_CTRL2.rss start resource App_CTRL2.rss -targetpath /resource/apps +targetpath /apparctestregfiles lang sc end // Application exe registration resource file resource App_CTRL2_reg.rss start resource App_CTRL2_reg.rss -targetpath /private/10003a3f/import/apps +targetpath /apparctestregfiles lang sc end diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/app_ctrl2_stub.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/app_ctrl2_stub.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,62 @@ +/* +* 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: +* +*/ +// +// App_CTRL2.MMP for test component App_CTRL2 (released in APPARC) +// + +target app_ctrl2.exe +TARGETTYPE exe + +CAPABILITY All -Tcb +VENDORID 0x70000001 + +UID 0x100039CE 0x13008ADE +targetpath /sys/bin +SOURCEPATH . + +// your public include directory should be here +userinclude ../inc + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//systeminclude /epoc32/include/techview +//systeminclude /epoc32/include/kernel + +source app_CTRL2.CPP + +// Application exe specific resource which is localised to the application +resource App_CTRL2.rss +start resource App_CTRL2.rss +targetpath /resource/apps +lang sc +end + +// Application exe registration resource file +resource App_CTRL2_reg.rss +start resource App_CTRL2_reg.rss +targetpath /private/10003a3f/import/apps +lang sc +end + + +LIBRARY apparc.lib +LIBRARY cone.lib +LIBRARY eikcore.lib +LIBRARY euser.lib +LIBRARY gdi.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/apparctestserver.MMP --- a/appfw/apparchitecture/tef/apparctestserver.MMP Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/apparctestserver.MMP Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -16,7 +16,7 @@ target apparctestserver.exe targettype exe UID 0x1000007A 0x101F289C -CAPABILITY AllFiles WriteDeviceData PowerMgmt Protserv SwEvent +CAPABILITY AllFiles WriteDeviceData PowerMgmt Protserv SwEvent ReadUserData MW_LAYER_SYSTEMINCLUDE_SYMBIAN @@ -32,7 +32,12 @@ //-------START SOURCE T_Foreground.cpp -SOURCE T_ProStep.cpp T_OOMStep.cpp T_File2Step.cpp T_File3Step.cpp +SOURCE T_ProStep.cpp T_OOMStep.cpp + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +SOURCE T_File2Step.cpp T_File3Step.cpp +#endif + SOURCE T_BackupStep.cpp T_MdrStep.cpp SOURCE T_Serv2Step.CPP T_Serv3Step.cpp SOURCE T_MRUStep.CPP T_WgnamStep.CPP @@ -75,6 +80,15 @@ SOURCE t_servicebasestep.cpp SOURCE T_RecUpgrade.cpp +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +SOURCE t_updateapplist.cpp +SOURCE t_forceregstep.cpp +SOURCE t_clientnotifstep.cpp +SOURCE t_nonnativetest.cpp +#endif + +source t_sisfileinstaller.cpp + resource t_rapalssessionstep.rss start resource t_rapalssessionstep.rss @@ -82,7 +96,9 @@ lang SC end +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK // START resource files for service registration and discovery tests + start resource serverapp_loc.RSS HEADER targetpath /resource/apps @@ -154,6 +170,7 @@ targetpath /private/10003a3f/import/apps lang SC end +#endif start bitmap default_app_icon.m02 targetpath /resource/apps @@ -163,6 +180,7 @@ //END resource files for customising the default icon wrt locale +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK start resource TestUnTrustedPriorityApp1_reg.rss targetpath /private/10003a3f/import/apps lang sc @@ -215,6 +233,7 @@ start resource T_groupnamever2_reg.rss targetpath /private/10003a3f/apps end +#endif //-------END @@ -227,7 +246,13 @@ LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib LIBRARY aplist.lib -LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +LIBRARY sif.lib +LIBRARY siftransport.lib +LIBRARY scsclient.lib +LIBRARY scrclient.lib sisregistryclient.lib scrdatabase.lib sishelper.lib + // We're quite heavy on the stack... 4k in WinS isn't enough... EPOCSTACKSIZE 0xf000 diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/apparctestserver.cpp --- a/appfw/apparchitecture/tef/apparctestserver.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/apparctestserver.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -38,8 +38,6 @@ #include "t_foreground.h" #include "T_ProStep.h" #include "T_OOMStep.h" -#include "T_File2Step.h" -#include "T_File3Step.h" #include "T_BackupStep.h" #include "T_MdrStep.h" #include "T_Serv2Step.h" @@ -72,19 +70,29 @@ #include "T_DataMappingPersistenceA.h" #include "T_DataMappingPersistenceB.h" #include "T_DataMappingPersistenceC.h" -#include "T_NonNativeAppsStep.h" -#include "T_IntegritySupportStep.h" -#include "T_IntegritySupportRebootStep.h" #include "T_ApsScan.h" #include "T_EndTaskStep.h" #include "T_RecUpgrade.h" #include "T_AppListFileBootStep.h" #include "T_AppListFileUpdateStep.h" #include "t_largestackstep.h" -#include "t_drivenotification.h" #include "t_mimecontentpolicystep.h" #include "t_servicebasestep.h" +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include "t_updateapplist.h" +#include "t_forceregstep.h" +#include "t_clientnotifstep.h" +#include "t_nonnativetest.h" +#else +#include "T_File2Step.h" +#include "T_File3Step.h" +#include "T_NonNativeAppsStep.h" +#include "T_IntegritySupportStep.h" +#include "T_IntegritySupportRebootStep.h" +#include "t_drivenotification.h" +#endif + CApparctestServer* CApparctestServer::NewL() /** @return - Instance of the test server @@ -131,6 +139,7 @@ { testStep = new CT_OOMStep(); } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK else if(aStepName == KT_File2Step) { testStep = new CT_File2Step(); @@ -139,6 +148,7 @@ { testStep = new CT_File3Step(); } +#endif else if(aStepName == KT_BackupStep) { testStep = new CT_BackupStep(); @@ -278,6 +288,7 @@ { testStep = new CT_DataMappingPersistenceCTestStep(); } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK else if (aStepName == _L("T_NonNativeApps")) { testStep = new CT_NonNativeAppsStep(); @@ -294,6 +305,7 @@ { testStep = new CT_IntegritySupportReboot2TestStep(); } +#endif else if (aStepName == KT_ApsScanStep) { testStep = new CT_ApsScanStep(); @@ -322,10 +334,12 @@ { testStep = new CT_LargeStackStep(); } +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK else if (aStepName == KT_DriveNotificationStep) { testStep = new CT_DriveNotificationStep(); } +#endif else if (aStepName == KT_MimeContentPolicyStep) { testStep = new CT_MimeContentPolicyStep(); @@ -338,6 +352,24 @@ { testStep = new CT_RecUpgradeStep(); } +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + else if (aStepName == KT_TestUpdateAppListStep) + { + testStep = new CT_TestUpdateAppListStep(); + } + else if (aStepName == KT_ForceRegStep) + { + testStep = new CT_ForceRegStep(); + } + else if (aStepName == KT_ClientNotifStep) + { + testStep = new CT_ClientNotifStep(); + } + else if (aStepName == KT_NonNativeTestStep) + { + testStep = new CT_NonNativeTestStep(); + } +#endif return testStep; } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/customisedefaulticonapp.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/customisedefaulticonapp.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,58 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET CustomiseDefaultIconApp.exe +TARGETTYPE exe +UID 0x100039CE 0x10208181 +VENDORID 0x70000001 + + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + + +// Application localisable resource file +resource CustomiseDefaultIconApp_loc.RSS +start resource CustomiseDefaultIconApp_loc.RSS +HEADER +targetpath /apparctestregfiles +lang sc +end + +START RESOURCE CustomiseDefaultIconApp_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/a0001010.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/a0001010.rss Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,54 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + + +// INCLUDES +#include + + +// RESOURCE DEFINITIONS +// ----------------------------------------------------------------------------- +// +// ----------------------------------------------------------------------------- +// +RESOURCE REGISTRY_INFO r_registry + { + dll_uid = 0xA0001010; + interfaces = + { + INTERFACE_INFO + { + interface_uid = 0x101F7D87; // Const for all Data Recognizers + implementations = + { + IMPLEMENTATION_INFO + { + implementation_uid = 0xA0001010; + version_no = 1; + display_name = "TForceRegAppRec"; + default_data = ""; + opaque_data = ""; + } + }; + } + }; + } + +// End of File diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/forceregapp1.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/forceregapp1.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,38 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include +#include "../t_forceregstep.h" +#include + + +TInt E32Main() + { + RProperty forceRegStatus; + User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread)); + + TInt status; + forceRegStatus.Get(status); + status |= KForceRegApp1Executed; + forceRegStatus.Set(status); + forceRegStatus.Close(); + + return(KErrNone); + } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/forceregapp1.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/forceregapp1.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,44 @@ +// 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: +// using relative paths for sourcepath and user includes +// +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + +TARGET forceregapp1.exe +TARGETTYPE exe +UID 0x100039CE 0xA0001000 +VENDORID 0x70000001 + +SOURCEPATH . +SOURCE forceregapp1.cpp + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN + + +START RESOURCE forceregapp1_reg.rss +TARGETPATH /apparctestregfiles +END + +LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/forceregapp1_reg.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/forceregapp1_reg.rss Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,35 @@ +// 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: +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + +#include + +UID2 KUidAppRegistrationResourceFile +UID3 0xA0001000 // application UID + +RESOURCE APP_REGISTRATION_INFO + { + app_file = "forceregapp1"; + datatype_list = + { + DATATYPE { priority=EDataTypePriorityNormal; type="x-epoc/forcregapp1"; } + }; + } + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/forceregapp2.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/forceregapp2.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,49 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include +#include "../t_forceregstep.h" +#include + + +TInt E32Main() + { + RProperty forceRegStatus; + User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread)); + + TInt status; + forceRegStatus.Get(status); + status |= KForceRegApp2Executed; + forceRegStatus.Set(status); + + TRequestStatus propertyChanged; + + while(!(status & KStopForceRegApp2)) + { + propertyChanged=KRequestPending; + forceRegStatus.Subscribe(propertyChanged); + User::WaitForRequest(propertyChanged); + forceRegStatus.Get(status); + } + + forceRegStatus.Close(); + + return(KErrNone); + } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/forceregapp2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/forceregapp2.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,44 @@ +// 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: +// using relative paths for sourcepath and user includes +// +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + +TARGET forceregapp2.exe +TARGETTYPE exe +UID 0x100039CE 0xA0001001 +VENDORID 0x70000001 + +SOURCEPATH . +SOURCE forceregapp2.cpp + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN + + +START RESOURCE forceregapp2_reg.rss +TARGETPATH /apparctestregfiles +END + +LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/forceregapp2_reg.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/forceregapp2_reg.rss Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,35 @@ +// 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: +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + +#include + +UID2 KUidAppRegistrationResourceFile +UID3 0xA0001001 // application UID + +RESOURCE APP_REGISTRATION_INFO + { + app_file = "forceregapp2"; + datatype_list = + { + DATATYPE { priority=EDataTypePriorityNormal; type="x-epoc/forcregapp2"; } + }; + } + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/tforceregapprec.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/tforceregapprec.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,157 @@ +// 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 recognizer is part of the supporting test code for T_ForceRegStep.CPP +// +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include +#include +#include +#include +#include + +#include +#include + +_LIT8(KLit8_DataType_ForceRegApp1, "x-epoc/forcregapp1"); +_LIT8(KLit8_DataType_ForceRegApp2, "x-epoc/forcregapp2"); +_LIT8(KLit8_DataType_ForceRegApp3, "x-epoc/forcregapp3"); +_LIT8(KLit8_DataType_ForceRegApp4, "x-epoc/forcregapp4"); + +const TUid KUidForceRegAppRecognizer={0xA0001010}; +const TUint KImplForceRegAppRecognizer=0xA0001010; + +enum TMimeTypes + { + EMimeType1 = 0, + EMimeType2, + EMimeType3, + EMimeType4, + EMimeLast + }; + +_LIT(KLitMimeExtension1, ".FRG1"); +_LIT(KLitMimeExtension2, ".FRG2"); +_LIT(KLitMimeExtension3, ".FRG3"); +_LIT(KLitMimeExtension4, ".FRG4"); + + +// CTForceRegAppRec definition + +class CTForceRegAppRec : public CApaDataRecognizerType + { +public: + CTForceRegAppRec(); + static CApaDataRecognizerType* CreateRecognizerL(); +private: + // from CApaDataRecognizerType + virtual TUint PreferredBufSize(); + virtual TDataType SupportedDataTypeL(TInt aIndex) const; + virtual void DoRecognizeL(const TDesC& aName, const TDesC8& aBuffer); + }; + + +// CTForceRegAppRec implementation + +CTForceRegAppRec::CTForceRegAppRec() + :CApaDataRecognizerType(KUidForceRegAppRecognizer, EHigh) + { + iCountDataTypes = EMimeLast; + } + +TUint CTForceRegAppRec::PreferredBufSize() + { + return 0; + } + +TDataType CTForceRegAppRec::SupportedDataTypeL(TInt aIndex) const + { + if (aIndex == EMimeType1) + return TDataType(KLit8_DataType_ForceRegApp1); + + else if (aIndex == EMimeType2) + return TDataType(KLit8_DataType_ForceRegApp2); + + else if (aIndex == EMimeType3) + return TDataType(KLit8_DataType_ForceRegApp3); + + else if (aIndex == EMimeType4) + return TDataType(KLit8_DataType_ForceRegApp4); + + else + return TDataType(KNullDesC8); + } + + +void CTForceRegAppRec::DoRecognizeL(const TDesC& aName, const TDesC8&) + { + + // Compare if the file extension is known + if (aName.Length() < 5) + { + iDataType = TDataType(KNullDesC8); + iConfidence = ENotRecognized; + return; + } + + if (aName.Right(5).CompareF(KLitMimeExtension1) == 0) + { + iDataType = TDataType(KLit8_DataType_ForceRegApp1); + iConfidence = ECertain; + } + else if (aName.Right(5).CompareF(KLitMimeExtension2) == 0) + { + iDataType = TDataType(KLit8_DataType_ForceRegApp2); + iConfidence = ECertain; + } + else if (aName.Right(5).CompareF(KLitMimeExtension3) == 0) + { + iDataType = TDataType(KLit8_DataType_ForceRegApp3); + iConfidence = ECertain; + } + else if (aName.Right(5).CompareF(KLitMimeExtension4) == 0) + { + iDataType = TDataType(KLit8_DataType_ForceRegApp4); + iConfidence = ECertain; + } + else + { + iDataType = TDataType(KNullDesC8); + iConfidence = ENotRecognized; + } + } + +// stand-alone functions + +CApaDataRecognizerType* CTForceRegAppRec::CreateRecognizerL() + { + return new (ELeave) CTForceRegAppRec(); + } + +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_PROXY_ENTRY(KImplForceRegAppRecognizer, CTForceRegAppRec::CreateRecognizerL) + }; + +EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) + { + aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + return ImplementationTable; + } + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/forceregapps/tforceregapprec.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/forceregapps/tforceregapprec.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,41 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + + +TARGET tforceregapprec.dll +CAPABILITY All -Tcb +TARGETTYPE PLUGIN +UID 0x10009d8d 0xA0001010 +VENDORID 0x70000001 + +SOURCEPATH . +SOURCE TForceRegAppRec.cpp + +userinclude ../../inc + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN + +LIBRARY euser.lib apmime.lib apparc.lib efsrv.lib + +start resource A0001010.rss +target tforceregapprec.rsc +end + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/m_ctrl_v2.mmp --- a/appfw/apparchitecture/tef/m_ctrl_v2.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/m_ctrl_v2.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -43,19 +43,19 @@ // Application exe specific resource which is localised to the application resource M_CTRL.rss start resource M_CTRL.rss -targetpath /resource/apps +targetpath /apparctestregfiles lang sc end // Application exe registration resource file start resource M_CTRL_reg.rss -targetpath /private/10003a3f/import/apps +targetpath /apparctestregfiles lang sc end // Application localisable resource file start resource M_CTRL_loc.RSS -targetpath /resource/apps +targetpath /apparctestregfiles lang sc end diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/m_ctrl_v2_stub.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/m_ctrl_v2_stub.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,72 @@ +/* +* 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: +* +*/ +// +// M_CTRL.MMP for test component M_CTRL (released in APPARC) +// New style APP/EXE built for a secure environment +// + +target m_ctrl.exe +TARGETTYPE exe + +targetpath /sys/bin +UID 0x100039CE 0x13008AEE +CAPABILITY All -Tcb +VENDORID 0x70000001 + +epocstacksize 0x5000 + +SOURCEPATH . + + +userinclude ../inc + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//systeminclude /epoc32/include/techview + +userinclude . + +// Application exe specific resource which is localised to the application +resource M_CTRL.rss +start resource M_CTRL.rss +targetpath /resource/apps +lang sc +end + +// Application exe registration resource file +start resource M_CTRL_reg.rss +targetpath /private/10003a3f/import/apps +lang sc +end + +// Application localisable resource file +start resource M_CTRL_loc.RSS +targetpath /resource/apps +lang sc +end + +SOURCE M_CTRL_V2.CPP + +LIBRARY apparc.lib +LIBRARY cone.lib +LIBRARY efsrv.lib +LIBRARY eikcore.lib +LIBRARY euser.lib +LIBRARY gdi.lib +LIBRARY appfwk_test_appui.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/openservice1app.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/openservice1app.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,48 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET openservice1app.exe +TARGETTYPE exe +UID 0x100039CE 0x10208200 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +START RESOURCE openservice1a.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/openservice2app.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/openservice2app.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,48 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET openservice2app.exe +TARGETTYPE exe +UID 0x100039CE 0x10208201 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +START RESOURCE openservice1b.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/refnativeplugin/10285bc3.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/refnativeplugin/10285bc3.rss Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,45 @@ +/* +* 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 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: +* ECOM DLL UID: 0x10285BC3 +* ECOM interface UID: 0x10285BC2 (KUidSifPlugin) +* ECOM Implementation: 0x10285BC4 +* +*/ + + +#include + +RESOURCE REGISTRY_INFO so_registry + { + dll_uid = 0x10285BC3; + interfaces = + { + INTERFACE_INFO + { + interface_uid = 0x10285BC2; + + implementations = + { + IMPLEMENTATION_INFO + { + implementation_uid = 0x10285BC4; + version_no = 1; + default_data = ""; + opaque_data = ""; + } + }; + } + }; + } \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,619 @@ +/* +* 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 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: +* +*/ + + +#include "refnativeplugin.h" +#include "usiflog.h" +#include "sisregistrywritablesession.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace Usif; + +static const TInt KRefNativePluginImpId = 0x10285BC4; + +static const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_PROXY_ENTRY(KRefNativePluginImpId, CRefNativePlugin::NewL) + }; + +EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) + { + aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + return ImplementationTable; + } + +CRefNativePlugin* CRefNativePlugin::NewL() + { + DEBUG_PRINTF(_L8("Constructing CRefNativePlugin")); + CRefNativePlugin *self = new (ELeave) CRefNativePlugin(); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +void CRefNativePlugin::ConstructL() + { + iImpl = CRefNativePluginActiveImpl::NewL(); + } + +CRefNativePlugin::~CRefNativePlugin() + { + delete iImpl; + } + +void CRefNativePlugin::CancelOperation() + { + DEBUG_PRINTF(_L8("Reference native plugin - Cancel")); + iImpl->Cancel(); + } + +void CRefNativePlugin::GetComponentInfo(const TDesC& aFileName, const TSecurityContext& /*aSecurityContext*/, + CComponentInfo& aComponentInfo, TRequestStatus& aStatus) + { + iImpl->GetComponentInfo(aFileName, aComponentInfo, aStatus); + } + +void CRefNativePlugin::GetComponentInfo(RFile& aFileHandle, const TSecurityContext& /*aSecurityContext*/, + CComponentInfo& aComponentInfo, TRequestStatus& aStatus) + { + iImpl->GetComponentInfo(aFileHandle, aComponentInfo, aStatus); + } + +void CRefNativePlugin::Install(const TDesC& aFileName, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus) + { + iImpl->Install(aFileName, aSecurityContext, aInputParams, aOutputParams, aStatus); + } + +void CRefNativePlugin::Install(RFile& aFileHandle, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus) + { + iImpl->Install(aFileHandle, aSecurityContext, aInputParams, aOutputParams, aStatus); + } + +void CRefNativePlugin::Uninstall(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus) + { + iImpl->Uninstall(aComponentId, aSecurityContext, aInputParams, aOutputParams, aStatus); + } + +void CRefNativePlugin::Activate(TComponentId aComponentId, const TSecurityContext& aSecurityContext, TRequestStatus& aStatus) + + { + DEBUG_PRINTF(_L8("Reference native plugin - Activate")); + iImpl->Activate(aComponentId, aSecurityContext, aStatus); + } + +void CRefNativePlugin::Deactivate(TComponentId aComponentId, const TSecurityContext& aSecurityContext, TRequestStatus& aStatus) + { + DEBUG_PRINTF(_L8("Reference native plugin - Deactivate")); + iImpl->Deactivate(aComponentId, aSecurityContext, aStatus); + } + +//------------------CRefNativePluginActiveImpl--------------------- + +CRefNativePluginActiveImpl* CRefNativePluginActiveImpl::NewL() + { + DEBUG_PRINTF(_L8("Reference native plugin - Constructing CRefNativePluginActiveImpl")); + CRefNativePluginActiveImpl *self = new (ELeave) CRefNativePluginActiveImpl(); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(1, self); + return self; + } + +void CRefNativePluginActiveImpl::ConstructL() + { + iInstallPrefs = Swi::CInstallPrefs::NewL(); + iAsyncLauncher = Swi::CAsyncLauncher::NewL(); + iComponentInfo = CComponentInfo::NewL(); + CActiveScheduler::Add(this); + } + +CRefNativePluginActiveImpl::~CRefNativePluginActiveImpl() + { + delete iAsyncLauncher; + delete iInstallPrefs; + delete iComponentInfo; + } + +TBool CRefNativePluginActiveImpl::NeedUserCapabilityL() + { + // Silent install is not allowed when the package requires additional capabilities + // than what it is signed for (Pakage may request for some capability that is not + // granted by the certificate used to sign it). + for(TInt cap=0; capRootNodeL().UserGrantableCaps().HasCapability(TCapability(cap))) + { + DEBUG_PRINTF2(_L("Package requires additional capability - %d"), cap); + return ETrue; + } + } + + return EFalse; + } + +void CRefNativePluginActiveImpl::RunL() + { + if (iSilentInstall) + { + DEBUG_PRINTF(_L("Silent install - CRefNativePluginActiveImpl::RunL")); + ProcessSilentInstallL(); + } + else + { + TInt res = iStatus.Int(); + DEBUG_PRINTF2(_L8("Reference native plugin - Operation finished with result %d"), res); + + // Output options + if (iOutputParams != NULL) + { + iOutputParams->AddIntL(KSifOutParam_ExtendedErrCode, res); + + if (iInstallRequest && res == KErrNone) + { + TComponentId resultComponentId = 0; + TRAPD(getLastIdErr, resultComponentId = GetLastInstalledComponentIdL()); + if (getLastIdErr == KErrNone) + iOutputParams->AddIntL(KSifOutParam_ComponentId, resultComponentId); + } + } + + User::RequestComplete(iClientStatus, res); + iClientStatus = NULL; + } + } + +void CRefNativePluginActiveImpl::ProcessSilentInstallL() + { + // We need to do this only once per installation request + iSilentInstall = EFalse; + iInstallRequest = ETrue; + + TBool isNotAuthenticated = (ENotAuthenticated == iComponentInfo->RootNodeL().Authenticity()); + TBool reqUserCap = NeedUserCapabilityL(); + if (isNotAuthenticated || reqUserCap) + { + if (isNotAuthenticated) + { + DEBUG_PRINTF(_L("Silent Install is not allowed on unsigned or self-signed packages")); + } + + if (reqUserCap) + { + DEBUG_PRINTF(_L("Silent Install is not allowed when user capabilities are required")); + } + + User::RequestComplete(iClientStatus, KErrNotSupported); + iClientStatus = NULL; + } + else + { + TInt err; + if (iFileHandle) + { + TRAP(err, iAsyncLauncher->InstallL(*this, *iFileHandle, *iInstallPrefs, iStatus)); + } + else + { + //DEBUG_PRINTF2(_L("!!!Silent install for %S"), iFileName); + TRAP(err, iAsyncLauncher->InstallL(*this, iFileName, *iInstallPrefs, iStatus)); + } + + if (err != KErrNone) + { + User::RequestComplete(iClientStatus, err); + iClientStatus = NULL; + } + + SetActive(); + } + } + +void CRefNativePluginActiveImpl::DoCancel() + { + if (iClientStatus) + { + iAsyncLauncher->CancelOperation(); + delete iAsyncLauncher; + iAsyncLauncher = NULL; + + User::RequestComplete(iClientStatus, KErrCancel); + iClientStatus = NULL; + } + } + +void CRefNativePluginActiveImpl::CommonRequestPreamble(const TSecurityContext& aSecurityContext, const COpaqueNamedParams& aInputParams, + COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus) + { + aStatus = KRequestPending; + iClientStatus = &aStatus; + + iInputParams = &aInputParams; + iOutputParams = &aOutputParams; + + TInt declineOperation = 0; + TRAPD(err, aInputParams.GetIntByNameL(KDeclineOperationOptionName, declineOperation)); + if(err == KErrNone && declineOperation) + { + iDeclineOperation = ETrue; + } + + // Check to see if we have the opaque input argument - InstallSilently + TInt silentInstall = 0; + TRAP_IGNORE(aInputParams.GetIntByNameL(KSifInParam_InstallSilently, silentInstall)); + if (silentInstall) + { + iSilentInstall = ETrue; + if (!aSecurityContext.HasCapability(ECapabilityTrustedUI)) + { + User::RequestComplete(iClientStatus, KErrPermissionDenied); + iClientStatus = NULL; + } + } + } + +TComponentId CRefNativePluginActiveImpl::GetLastInstalledComponentIdL() + { + ASSERT(iInstallRequest); + + // Find the id of the last installed component and return it + TInt uid; + User::LeaveIfError(RProperty::Get(KUidSystemCategory, KUidSwiLatestInstallation, uid)); + + Swi::RSisRegistrySession sisRegistrySession; + User::LeaveIfError(sisRegistrySession.Connect()); + CleanupClosePushL(sisRegistrySession); + + TUid tuid(TUid::Uid(uid)); + TComponentId componentId = sisRegistrySession.GetComponentIdForUidL(tuid); + CleanupStack::PopAndDestroy(&sisRegistrySession); + + return componentId; + } + +void CRefNativePluginActiveImpl::GetComponentInfo(const TDesC& aFileName, CComponentInfo& aComponentInfo, TRequestStatus& aStatus) + { + DEBUG_PRINTF2(_L("Reference native plugin - retrieving component info for %S"), &aFileName); + + aStatus = KRequestPending; + iClientStatus = &aStatus; + + TRAPD(err, iAsyncLauncher->GetComponentInfoL(*this, aFileName, *iInstallPrefs, aComponentInfo, iStatus)); + if (err != KErrNone) + { + TRequestStatus *statusPtr(&aStatus); + User::RequestComplete(statusPtr, err); + return; + } + + SetActive(); + } + +void CRefNativePluginActiveImpl::GetComponentInfo(RFile& aFileHandle, CComponentInfo& aComponentInfo, TRequestStatus& aStatus) + { + DEBUG_PRINTF(_L8("Reference native plugin - getting component info by file handle")); + + aStatus = KRequestPending; + iClientStatus = &aStatus; + + TRAPD(err, iAsyncLauncher->GetComponentInfoL(*this, aFileHandle, *iInstallPrefs, aComponentInfo, iStatus)); + if (err != KErrNone) + { + TRequestStatus *statusPtr(&aStatus); + User::RequestComplete(statusPtr, err); + return; + } + + SetActive(); + } + +void CRefNativePluginActiveImpl::Install(const TDesC& aFileName, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus) + { + DEBUG_PRINTF2(_L("Reference native plugin - install for %S"), &aFileName); + + CommonRequestPreamble(aSecurityContext, aInputParams, aOutputParams, aStatus); + + TInt err; + if (iSilentInstall) + { + // Silent install does a few addtional checks on the package to see if is + // signed and had the required capabilities. So we need to the get the + // package component information with out installing it. + DEBUG_PRINTF2(_L("Silent install - Get the ComponentInfo for %S"), &aFileName); + iFileName = aFileName; + TRAP(err, iAsyncLauncher->GetComponentInfoL(*this, aFileName, *iInstallPrefs, *iComponentInfo, iStatus)); + } + else + { + // Proceed with the normal installation. + RArray tmp; + tmp.Append(01); + tmp.Append(02); + tmp.Append(03); + tmp.Append(04); + tmp.Append(05); + TRAP(err, iAsyncLauncher->InstallL(*this, aFileName, *iInstallPrefs, tmp, iStatus)); + tmp.Close(); + iInstallRequest = ETrue; + } + + if (err != KErrNone) + { + TRequestStatus *statusPtr(&aStatus); + User::RequestComplete(statusPtr, err); + return; + } + + SetActive(); + } + +void CRefNativePluginActiveImpl::Install(RFile& aFileHandle, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus) + { + DEBUG_PRINTF(_L8("Reference native plugin - install by file handle")); + + CommonRequestPreamble(aSecurityContext, aInputParams, aOutputParams, aStatus); + + TInt err; + if (iSilentInstall) + { + // Silent install does a few addtional checks on the package to see if is + // signed and had the required capabilities. So we need to the get the + // package component information with out installing it. + iFileHandle = &aFileHandle; + TRAP(err, iAsyncLauncher->GetComponentInfoL(*this, aFileHandle, *iInstallPrefs, *iComponentInfo, iStatus)); + } + else + { + // Proceed with the normal installation. + TRAP(err, iAsyncLauncher->InstallL(*this, aFileHandle, *iInstallPrefs, iStatus)); + iInstallRequest = ETrue; + } + + if (err != KErrNone) + { + TRequestStatus *statusPtr(&aStatus); + User::RequestComplete(statusPtr, err); + return; + } + + SetActive(); + } + +void CRefNativePluginActiveImpl::Uninstall(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus) + { + TRAPD(err, UninstallL(aComponentId, aSecurityContext, aInputParams, aOutputParams, aStatus)); + if (err != KErrNone) + { + TRequestStatus *statusPtr(&aStatus); + User::RequestComplete(statusPtr, err); + return; + } + SetActive(); + } + +void CRefNativePluginActiveImpl::UninstallL(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus) + { + DEBUG_PRINTF(_L8("Reference native plugin - uninstall")); + CommonRequestPreamble(aSecurityContext, aInputParams, aOutputParams, aStatus); + // Get UID for given component id + RSoftwareComponentRegistry scrSession; + User::LeaveIfError(scrSession.Connect()); + CleanupClosePushL(scrSession); + + CPropertyEntry* propertyEntry = scrSession.GetComponentPropertyL(aComponentId, _L("CompUid")); + CleanupStack::PushL(propertyEntry); + + CIntPropertyEntry* intPropertyEntry = dynamic_cast(propertyEntry); + + TRequestStatus *statusPtr(&aStatus); + if (intPropertyEntry == NULL) + { + DEBUG_PRINTF2(_L8("UID property for component %d was not found"), aComponentId); + User::RequestComplete(statusPtr, KErrNotFound); + return; + } + + TUid objectId = TUid::Uid(intPropertyEntry->IntValue()); + CleanupStack::PopAndDestroy(2, &scrSession); + + iAsyncLauncher->UninstallL(*this, objectId, iStatus); + } + +void CRefNativePluginActiveImpl::Activate(TComponentId aComponentId, const TSecurityContext& /*aSecurityContext*/, TRequestStatus& aStatus) + { + DEBUG_PRINTF(_L8("Reference native plugin - activate")); + iStatus = KRequestPending; + aStatus = KRequestPending; + iClientStatus = &aStatus; + + TRequestStatus* rs(&iStatus); + + Swi::RSisRegistryWritableSession sisRegSession; + TRAPD(err, + User::LeaveIfError(sisRegSession.Connect()); + sisRegSession.ActivateComponentL(aComponentId); + ) + sisRegSession.Close(); + + User::RequestComplete(rs, err); + SetActive(); + } + +void CRefNativePluginActiveImpl::Deactivate(TComponentId aComponentId, const TSecurityContext& /*aSecurityContext*/, TRequestStatus& aStatus) + { + DEBUG_PRINTF(_L8("Reference native plugin - deactivate")); + iStatus = KRequestPending; + aStatus = KRequestPending; + iClientStatus = &aStatus; + + TRequestStatus* rs(&iStatus); + + Swi::RSisRegistryWritableSession sisRegSession; + TRAPD(err, + User::LeaveIfError(sisRegSession.Connect()); + sisRegSession.DeactivateComponentL(aComponentId); + ) + sisRegSession.Close(); + + User::RequestComplete(rs, err); + SetActive(); + } + +// SWI::MUiHandler implementation +TInt CRefNativePluginActiveImpl::DisplayLanguageL(const Swi::CAppInfo& /*aAppInfo*/,const RArray& /*aLanguages*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayLanguageL")); + return 0; + } + +TInt CRefNativePluginActiveImpl::DisplayDriveL(const Swi::CAppInfo& /*aAppInfo*/,TInt64 /*aSize*/, const RArray& /*aDriveLetters*/, const RArray& /*aDriveSpaces*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayDriveL")); + return 0; + } + +TBool CRefNativePluginActiveImpl::DisplayUninstallL(const Swi::CAppInfo& /*aAppInfo*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayUninstallL")); + if (iDeclineOperation) + { + DEBUG_PRINTF(_L8("Reference native plugin - Received an option to decline operation - stopping uninstall")); + return EFalse; + } + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayTextL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TFileTextOption /*aOption*/, const TDesC& /*aText*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayTextL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayDependencyBreakL(const Swi::CAppInfo& /*aAppInfo*/, const RPointerArray& /*aComponents*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayDependencyBreakL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayApplicationsInUseL(const Swi::CAppInfo& /*aAppInfo*/, const RPointerArray& /*aAppNames*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayApplicationsInUseL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayQuestionL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TQuestionDialog /*aQuestion*/, const TDesC& /*aDes*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayQuestionL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayInstallL(const Swi::CAppInfo& /*aAppInfo*/, const CApaMaskedBitmap* /*aLogo*/, const RPointerArray& /*aCertificates*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayInstallL")); + + if (iDeclineOperation) + { + DEBUG_PRINTF(_L8("Reference native plugin - Received an option to decline operation - stopping install")); + return EFalse; + } + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayGrantCapabilitiesL(const Swi::CAppInfo& /*aAppInfo*/, const TCapabilitySet& /*aCapabilitySet*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayGrantCapabilitiesL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayUpgradeL(const Swi::CAppInfo& /*aAppInfo*/, const Swi::CAppInfo& /*aExistingAppInfo*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayUpgradeL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayOptionsL(const Swi::CAppInfo& /*aAppInfo*/, const RPointerArray& /*aOptions*/, RArray& /*aSelections*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayOptionsL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplaySecurityWarningL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TSignatureValidationResult /*aSigValidationResult*/, + RPointerArray& /*aPkixResults*/, RPointerArray& /*aCertificates*/, TBool /*aInstallAnyway*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplaySecurityWarningL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayOcspResultL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TRevocationDialogMessage /*aMessage*/, RPointerArray& /*aOutcomes*/, + RPointerArray& /*aCertificates*/,TBool /*aWarningOnly*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayOcspResultL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::DisplayMissingDependencyL(const Swi::CAppInfo& /*aAppInfo*/, const TDesC& /*aDependencyName*/, TVersion /*aWantedVersionFrom*/, + TVersion /*aWantedVersionTo*/, TVersion /*aInstalledVersion*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayMissingDependencyL")); + return ETrue; + } + +TBool CRefNativePluginActiveImpl::HandleInstallEventL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TInstallEvent /*aEvent*/, TInt /*aValue*/, const TDesC& /*aDes*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - HandleInstallEventL")); + return ETrue; + } + +void CRefNativePluginActiveImpl::HandleCancellableInstallEventL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TInstallCancellableEvent /*aEvent*/, Swi::MCancelHandler& /*aCancelHandler*/, + TInt /*aValue*/,const TDesC& /*aDes*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - HandleCancellableInstallEventL")); + } + +void CRefNativePluginActiveImpl::DisplayCannotOverwriteFileL(const Swi::CAppInfo& /*aAppInfo*/, const Swi::CAppInfo& /*aInstalledAppInfo*/,const TDesC& /*aFileName*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayCannotOverwriteFileL")); + } + +void CRefNativePluginActiveImpl::DisplayErrorL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TErrorDialog /*aType*/, const TDesC& /*aParam*/) + { + DEBUG_PRINTF(_L8("Reference native plugin - DisplayErrorL")); + } + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.h Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,173 @@ +/* +* 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 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: +* This class implements a test SIF plugin for native software +* +*/ + + +/** + @file + @internalComponent +*/ + +#ifndef REFNATIVEPLUGIN_H +#define REFNATIVEPLUGIN_H + +#include +#include +#include +#include +#include + +namespace Swi +{ + class CAsyncLauncher; + class CInstallPrefs; +} + +namespace Usif + { + + _LIT(KDeclineOperationOptionName, "SwiDeclineOperation"); + // ECOM objects and CActive do not interact well - especially since SIFPlugin inherits from CBase + // and double C-inheritance is impossible. So, a separate class is used to drive the asynchronous interaction + // to the CAsyncLauncher + NONSHARABLE_CLASS(CRefNativePluginActiveImpl) : public CActive, public Swi::MUiHandler + { + public: + static CRefNativePluginActiveImpl* NewL(); + ~CRefNativePluginActiveImpl(); + + // CActive interface + void RunL(); + void DoCancel(); + + void Install(const TDesC& aFileName, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus); + + void Install(RFile& aFileHandle, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus); + + void GetComponentInfo(const TDesC& aFileName, CComponentInfo& aComponentInfo, TRequestStatus& aStatus); + + void GetComponentInfo(RFile& aFileHandle, CComponentInfo& aComponentInfo, TRequestStatus& aStatus); + + void Uninstall(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus); + + void Activate(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + TRequestStatus& aStatus); + + void Deactivate(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + TRequestStatus& aStatus); + + // Swi::MUiHandler interface + TInt DisplayLanguageL(const Swi::CAppInfo& aAppInfo,const RArray& aLanguages); + TInt DisplayDriveL(const Swi::CAppInfo& aAppInfo,TInt64 aSize, const RArray& aDriveLetters,const RArray& aDriveSpaces); + TBool DisplayUninstallL(const Swi::CAppInfo& aAppInfo); + TBool DisplayTextL(const Swi::CAppInfo& aAppInfo,Swi::TFileTextOption aOption,const TDesC& aText); + TBool DisplayDependencyBreakL(const Swi::CAppInfo& aAppInfo, const RPointerArray& aComponents); + TBool DisplayApplicationsInUseL(const Swi::CAppInfo& aAppInfo, const RPointerArray& aAppNames); + TBool DisplayQuestionL(const Swi::CAppInfo& aAppInfo, Swi::TQuestionDialog aQuestion, const TDesC& aDes); + TBool DisplayInstallL(const Swi::CAppInfo& aAppInfo,const CApaMaskedBitmap* aLogo, const RPointerArray& aCertificates); + TBool DisplayGrantCapabilitiesL(const Swi::CAppInfo& aAppInfo, const TCapabilitySet& aCapabilitySet); + TBool DisplayUpgradeL(const Swi::CAppInfo& aAppInfo, const Swi::CAppInfo& aExistingAppInfo); + TBool DisplayOptionsL(const Swi::CAppInfo& aAppInfo, const RPointerArray& aOptions,RArray& aSelections); + TBool DisplaySecurityWarningL(const Swi::CAppInfo& aAppInfo, Swi::TSignatureValidationResult aSigValidationResult, + RPointerArray& aPkixResults, RPointerArray& aCertificates,TBool aInstallAnyway); + TBool DisplayOcspResultL(const Swi::CAppInfo& aAppInfo, Swi::TRevocationDialogMessage aMessage,RPointerArray& aOutcomes, + RPointerArray& aCertificates,TBool aWarningOnly); + TBool DisplayMissingDependencyL(const Swi::CAppInfo& aAppInfo, const TDesC& aDependencyName,TVersion aWantedVersionFrom, + TVersion aWantedVersionTo,TVersion aInstalledVersion); + TBool HandleInstallEventL(const Swi::CAppInfo& aAppInfo, Swi::TInstallEvent aEvent,TInt aValue = 0,const TDesC& aDes = KNullDesC); + void HandleCancellableInstallEventL(const Swi::CAppInfo& aAppInfo, Swi::TInstallCancellableEvent aEvent,Swi::MCancelHandler& aCancelHandler, + TInt aValue = 0,const TDesC& aDes=KNullDesC); + void DisplayCannotOverwriteFileL(const Swi::CAppInfo& aAppInfo, const Swi::CAppInfo& aInstalledAppInfo,const TDesC& aFileName); + void DisplayErrorL(const Swi::CAppInfo& aAppInfo,Swi::TErrorDialog aType,const TDesC& aParam); + private: + CRefNativePluginActiveImpl() : CActive(EPriorityStandard) {} + CRefNativePluginActiveImpl(const CRefNativePluginActiveImpl &); + CRefNativePluginActiveImpl & operator =(const CRefNativePluginActiveImpl &); + void ConstructL(); + void CommonRequestPreamble(const TSecurityContext& aSecurityContext, const COpaqueNamedParams& aInputParams, + COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus); + void UninstallL(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus); + + TComponentId GetLastInstalledComponentIdL(); + TBool NeedUserCapabilityL(); + void ProcessSilentInstallL(); + private: + Swi::CAsyncLauncher* iAsyncLauncher; + Swi::CInstallPrefs* iInstallPrefs; + TRequestStatus* iClientStatus; + const COpaqueNamedParams* iInputParams; + COpaqueNamedParams* iOutputParams; + CComponentInfo* iComponentInfo; + TFileName iFileName; + RFile* iFileHandle; // FileHandle is not owned by the plug-in + TBool iDeclineOperation; // Used for plugin options - optionally specifies that the operation will not be confirmed at the first callback + TBool iInstallRequest; // Used to identify the type of the current requst in RunL() so we know if the id of an installed component should be sent + TBool iSilentInstall; // Used to identify a silent install + }; + + + NONSHARABLE_CLASS(CRefNativePlugin) : public CSifPlugin + { + public: + static CRefNativePlugin* NewL(); + ~CRefNativePlugin(); + + // MSIFPlugin interface + void GetComponentInfo(const TDesC& aFileName, const TSecurityContext& aSecurityContext, + CComponentInfo& aComponentInfo, TRequestStatus& aStatus); + + void GetComponentInfo(RFile& aFileHandle, const TSecurityContext& aSecurityContext, + CComponentInfo& aComponentInfo, TRequestStatus& aStatus); + + void Install(const TDesC& aFileName, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus); + + void Install(RFile& aFileHandle, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus); + + virtual void Uninstall(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, + TRequestStatus& aStatus); + + virtual void Activate(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + TRequestStatus& aStatus); + + virtual void Deactivate(TComponentId aComponentId, const TSecurityContext& aSecurityContext, + TRequestStatus& aStatus); + + void CancelOperation(); + private: + CRefNativePlugin() {} + void ConstructL(); + CRefNativePlugin(const CRefNativePlugin &); + CRefNativePlugin & operator =(const CRefNativePlugin &); + private: + CRefNativePluginActiveImpl *iImpl; + }; + } // end namespace Usif + +#endif // REFNATIVEPLUGIN_H diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,44 @@ +/* +* 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 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: +* Project specification file for SIF plugin for native software +* +*/ + + +/** + @file + @test +*/ + +TARGET refnativeplugin.dll +TARGETTYPE PLUGIN + +UID 0x10009D8D 0x10285BC3 + +CAPABILITY ProtServ TrustedUI ReadUserData WriteDeviceData + +SOURCEPATH . +SOURCE refnativeplugin.cpp + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN + +START RESOURCE 10285BC3.rss + TARGET refnativeplugin.rsc +END +LIBRARY euser.lib sishelper.lib sif.lib scrclient.lib +LIBRARY sisregistryclient.lib +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/refnativeplugin/sisregistrywritablesession.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/refnativeplugin/sisregistrywritablesession.h Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,214 @@ +/* +* 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 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: +* RSisRegistryWritableSession - restricted client registry session interface +* +*/ + + +/** + @file + @internalTechnology + @released +*/ + +#ifndef __SISREGISTRYWRITABLESESSION_H__ +#define __SISREGISTRYWRITABLESESSION_H__ + +#include +#include +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +#include +#endif +namespace Swi +{ +class CApplication; +class CSisRegistryPackage; + +namespace Sis + { + class CController; + } + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK +using Usif::TComponentId; +using Usif::TScomoState; + +class CSoftwareTypeRegInfo; +#endif + +class RSisRegistryWritableSession : public RSisRegistrySession + { +public: + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + /** + * Starts a transaction with SCR for the mutable operations of this session. + * The APIs that this transaction covers are AddEntryL, UpdateEntryL and DeleteEntryL. + * Note that this transaction has no relation with the transaction ID (aTransactionID) + * parameter being supplied to the mutable APIs. + */ + IMPORT_C void CreateTransactionL(); + + /** + * Commits the changes performed in the SCR after the call to BeginTransactionL. + */ + IMPORT_C void CommitTransactionL(); + + /** + * Discards the changes performed in the SCR after the call to BeginTransactionL. + */ + IMPORT_C void RollbackTransactionL(); +#endif + + /** + * Adds a registry entry representing this package + * + * @param aApplication The application description provided by Swi + * @param aController The controller in a buffer + * @param aTransactionID The TransactionID for IntegrityServices provided + * by Swis of TInt64 type + * + */ + IMPORT_C void AddEntryL(const CApplication& aApplication, const TDesC8& aController, TInt64 aTransactionID); + + /** + * Updates the registry entry representing this package + * + * @param aApplication The application description provided by Swi + * @param aController The controller in a buffer + * @param aTransactionID The TransactionID for IntegrityServices provided + * by Swis of TInt64 type + * + */ + IMPORT_C void UpdateEntryL(const CApplication& aApplication, const TDesC8& aController, TInt64 aTransactionID); + + /** + * Deletes the entry from the registry represented by the given package + * + * @param aPackage The package to search for + * @param aTransactionID The TransactionID for IntegrityServices provided + * by Swis of TInt64 type + * + */ + IMPORT_C void DeleteEntryL(const CSisRegistryPackage& aPackage, TInt64 aTransactionID); + + /** + * Notification to registry that a drive has been mounted + * + * @param aDrive Drive number; + * + * @note valid value are between 0 and KMaxDrives - 1 inclusive + * 0 stands for A drive and KMaxDrives - 1 for Z + * + */ + IMPORT_C void AddDriveL(const TInt aDrive); + +#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + /** + * Notification to registry that a drive has been dismounted + * + * @param aDrive Drive as a number; + * + * @note valid value are between 0 and KMaxDrives - 1 inclusive + * 0 stands for A drive and KMaxDrives - 1 for Z + * + */ + IMPORT_C void RemoveDriveL(const TInt aDrive); + + /** + * Notification to the registry that Software Installation has been rolled + * back and the cache needs to be regenerated from the contents on disk. + */ + IMPORT_C void RegenerateCacheL(); +#endif + + /** + * Returns ETrue if any ROM stub in the filesystem has the package uid specified + * in aPackageId + * With the addition of SA upgrades to ROM, a package may be both in ROM, upgraded + * on another drive and this method can be used to check for the presence + * of an upgraded ROM package. + * + * + * @param aPackageId Package Id to be searched in the ROM stub files. + * + * @return ETrue if it can find the aPackageId in any of the ROM stub SIS. + * EFalse otherwise + */ + IMPORT_C TBool PackageExistsInRomL(const TUid& aPackageId); + + + + /** + * Gets all the eclipsable file's entries from the ROM stub file of a ROM based package. + * + * @param aUid Package UId to identify the right stub file. + * + * @param aFiles A pointer array of file names to be populated. + * + */ + IMPORT_C void GetFilesForRomApplicationL(const TUid& aPackageId, RPointerArray& aFiles); + +#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + /** + * Activates the component identified by the supplied parameter. + * + * @param aComponentId Identifies the installed component, which is to be activated. + * + */ + IMPORT_C void ActivateComponentL(TComponentId aComponentId); + + /** + * Deactivates the component identified by the supplied parameter. + * + * @param aComponentId Identifies the installed component, which is to be deactivated. + * + */ + IMPORT_C void DeactivateComponentL(TComponentId aComponentId); + + /** + * Adds a registry entry representing a package containing a Layered Execution Environment + * + * @param aApplication The application description provided by Swi + * @param aController The controller in a buffer + * @param aSwTypeRegInfoArray The array of the software types to be registered + * @param aTransactionID The TransactionID for IntegrityServices provided by Swis of TInt64 type + * + */ + IMPORT_C void AddEntryL(const CApplication& aApplication, const TDesC8& aController, const RPointerArray& aSwTypeRegInfoArray, TInt64 aTransactionID); + + /** + * Updates the registry entry representing a package containing a Layered Execution Environment. + * The SISRegistryServer checks if the registration info passed in aSwTypeRegInfoArray matches + * the data passed during the installation of the base package. If they differ the installation terinates. + * Hence, this upgrade package may upgarde the LEE but cannot change its registration data. + * + * @param aApplication The application description provided by Swi + * @param aController The controller in a buffer + * @param aSwTypeRegInfoArray The array of the software types to be verified against the already registered base package + * @param aTransactionID The TransactionID for IntegrityServices provided by Swis of TInt64 type + * + */ + IMPORT_C void UpdateEntryL(const CApplication& aApplication, const TDesC8& aController, const RPointerArray& aSwTypeRegInfoArray, TInt64 aTransactionID); + +private: + void SetComponentStateL(TComponentId aComponentId, TScomoState aState); +#endif + void AddEntryImplL(TInt aMessage, const CApplication& aApplication, const TDesC8& aController, TInt64 aTransactionID, TIpcArgs& aIpcArgs); + void UpdateEntryImplL(TInt aMessage, const CApplication& aApplication, const TDesC8& aController, TInt64 aTransactionID, TIpcArgs& aIpcArgs); + }; + +} // namespace +#endif diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/refnativeplugin/usiflog.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/refnativeplugin/usiflog.h Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,45 @@ +/* +* 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 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: +* Implements print functions for the Universal Software Install Framework components. +* +*/ + + +/** + @file + @internalComponent + @released +*/ + +#ifndef USIFLOG_H +#define USIFLOG_H + +#include + +namespace Usif + { + _LIT8(KComponentName, "[USIF]"); + + #define DEBUG_PRINTF(a) {SEC_DEBUG_PRINTF(KComponentName, a);} + #define DEBUG_PRINTF2(a, b) {SEC_DEBUG_PRINTF2(KComponentName, a, b);} + #define DEBUG_PRINTF3(a, b, c) {SEC_DEBUG_PRINTF3(KComponentName, a, b, c);} + #define DEBUG_PRINTF4(a, b, c, d) {SEC_DEBUG_PRINTF4(KComponentName, a, b, c, d);} + #define DEBUG_PRINTF5(a, b, c, d, e) {SEC_DEBUG_PRINTF5(KComponentName, a, b, c, d, e);} + + #define DEBUG_CODE_SECTION(a) {SEC_DEBUG_CODE_SECTION(a);} + + } // End of namespace StreamAccess + +#endif // USIFLOG_H diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_T_AppListFileUpdate.script --- a/appfw/apparchitecture/tef/scripts/apparctest_T_AppListFileUpdate.script Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/apparctest_T_AppListFileUpdate.script Fri May 14 16:01:13 2010 +0300 @@ -37,6 +37,6 @@ PRINT Run T_AppListFileUpdate Apparc test // LOAD_SUITE ApparcTestServer -RUN_TEST_STEP 500 ApparcTestServer T_AppListFileUpdate +RUN_TEST_STEP 800 ApparcTestServer T_AppListFileUpdate END_TESTCASE API-APPFWK-APPARC-0032 diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_T_RApaLsSession.script --- a/appfw/apparchitecture/tef/scripts/apparctest_T_RApaLsSession.script Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/apparctest_T_RApaLsSession.script Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -35,6 +35,6 @@ DELAY 5000 // LOAD_SUITE ApparcTestServer -RUN_TEST_STEP 100 ApparcTestServer T_RApaLsSession +RUN_TEST_STEP 500 ApparcTestServer T_RApaLsSession END_TESTCASE API-APPFWK-T-RApaLsSessionTestStep-TestAppInfo1-0001 diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_T_RuleBasedLaunching.script --- a/appfw/apparchitecture/tef/scripts/apparctest_T_RuleBasedLaunching.script Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/apparctest_T_RuleBasedLaunching.script Fri May 14 16:01:13 2010 +0300 @@ -27,6 +27,6 @@ PRINT Run T_RuleBasedLaunching Apparc test // LOAD_SUITE ApparcTestServer -RUN_TEST_STEP 100 ApparcTestServer T_RuleBasedLaunching +RUN_TEST_STEP 200 ApparcTestServer T_RuleBasedLaunching END_TESTCASE API-APPFWK-APPARC-0023 diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_T_Serv2.script --- a/appfw/apparchitecture/tef/scripts/apparctest_T_Serv2.script Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/apparctest_T_Serv2.script Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -31,6 +31,6 @@ PRINT Run T_Serv2 Apparc test // LOAD_SUITE ApparcTestServer -RUN_TEST_STEP 100 ApparcTestServer T_Serv2 +RUN_TEST_STEP 400 ApparcTestServer T_Serv2 END_TESTCASE API-APPFWK-T-Serv2Step-AppInfoTest1-0001 \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_T_Services.script --- a/appfw/apparchitecture/tef/scripts/apparctest_T_Services.script Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/apparctest_T_Services.script Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -33,6 +33,6 @@ DELAY 5000 // LOAD_SUITE ApparcTestServer -RUN_TEST_STEP 100 ApparcTestServer T_Services +RUN_TEST_STEP 300 ApparcTestServer T_Services END_TESTCASE API-APPFWK-T-RApaLsSessionTestStep-TestServiceDiscovery1L-0001 \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_t_clientnotif.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/scripts/apparctest_t_clientnotif.script Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,20 @@ +// +// 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: +// +// +PRINT Run T_ClientNotif Apparc test +// +LOAD_SUITE ApparcTestServer +RUN_TEST_STEP 400 ApparcTestServer T_ClientNotif \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_t_forcereg.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/scripts/apparctest_t_forcereg.script Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,20 @@ +// +// 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: +// +// +PRINT Run T_ForceReg Apparc test +// +LOAD_SUITE ApparcTestServer +RUN_TEST_STEP 100 ApparcTestServer T_ForceReg \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_t_mimecontentpolicy.script --- a/appfw/apparchitecture/tef/scripts/apparctest_t_mimecontentpolicy.script Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/apparctest_t_mimecontentpolicy.script Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -19,7 +19,7 @@ //! @SYMTestCaseDesc Tests IsClosedType() method for different mime types //! @SYMTestPriority High //! @SYMTestStatus 3. Released -//! @SYMTestActions Closed types are the mime types which are listed in the ApfMimeContentPolicy.rss file. +//! @SYMTestActions Closed types are the mime types which are listed in the 10003a3f repository. //! Calls CApfMimeContentPolicy::IsClosedType(const TDesC& aMimeType); for different closed and non-closed mime types. //! @SYMTestExpectedResults The test checks whether IsClosedType returns ETrue for the Closed Mime types and EFalse for non-closed Mime types diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_t_nonnativetest.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/scripts/apparctest_t_nonnativetest.script Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,20 @@ +// +// 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: +// +// +PRINT Run T_NonNativeTest Apparc test +// +LOAD_SUITE ApparcTestServer +RUN_TEST_STEP 100 ApparcTestServer T_NonNativeTest \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/apparctest_t_updateapplist.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/scripts/apparctest_t_updateapplist.script Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,20 @@ +// +// 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: +// +// +PRINT Run T_UpdateAppList Apparc test +// +LOAD_SUITE ApparcTestServer +RUN_TEST_STEP 100 ApparcTestServer T_UpdateAppList \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/emulator/apparctest_CACHE_OFF_run.bat --- a/appfw/apparchitecture/tef/scripts/emulator/apparctest_CACHE_OFF_run.bat Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/emulator/apparctest_CACHE_OFF_run.bat Fri May 14 16:01:13 2010 +0300 @@ -1,5 +1,5 @@ @rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +@rem Copyright (c) 2009-2010 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" @@ -75,6 +75,11 @@ call :test T_Wgnam call :test T_WindowChaining ::call :test T_RecUpgrade This test can not run on emulator as it requires loading, unloading and deletion of a plug-in and Windows OS don’t allow deletion of loaded binaries +call :test T_UpdateAppList +call :test T_ForceReg +call :test T_ClientNotif +call :test T_NonNativeTest + call sysstart_apparc_run.bat type \epoc32\winscw\c\logs\testexecute\sysstart_apparctest_summary.txt >> %APPARCTEST_SUMMARY% diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/emulator/apparctest_run.bat --- a/appfw/apparchitecture/tef/scripts/emulator/apparctest_run.bat Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/emulator/apparctest_run.bat Fri May 14 16:01:13 2010 +0300 @@ -1,5 +1,5 @@ @rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +@rem Copyright (c) 2009-2010 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" @@ -78,6 +78,10 @@ call :test T_Wgnam call :test T_WindowChaining ::call :test T_RecUpgrade This test can not run on emulator as it requires loading, unloading and deletion of a plug-in and Windows OS don’t allow deletion of loaded binaries +call :test T_UpdateAppList +call :test T_ForceReg +call :test T_ClientNotif +call :test T_NonNativeTest call sysstart_apparc_run.bat type \epoc32\winscw\c\logs\testexecute\sysstart_apparctest_summary.txt >> %APPARCTEST_SUMMARY% diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/scripts/hardware/apparctest_run.bat --- a/appfw/apparchitecture/tef/scripts/hardware/apparctest_run.bat Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/scripts/hardware/apparctest_run.bat Fri May 14 16:01:13 2010 +0300 @@ -1,5 +1,5 @@ @rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +@rem Copyright (c) 2009-2010 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" @@ -62,6 +62,11 @@ testexecute.exe z:\apparctest\apparctest_t_Wgnam.script testexecute.exe z:\apparctest\apparctest_t_WindowChaining.script testexecute.exe z:\apparctest\apparctest_t_RecUpgrade.script +testexecute.exe z:\apparctest\apparctest_t_UpdateAppList.script +testexecute.exe z:\apparctest\apparctest_t_forcereg.script +testexecute.exe z:\apparctest\apparctest_t_clientnotif.script +testexecute.exe z:\apparctest\apparctest_t_nonnativetest.script + :: ******************************************************************* :: This batch file is used to run tests on 9.3 and higher versions. diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/serverapp.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/serverapp.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,49 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET serverapp.exe +TARGETTYPE exe +UID 0x100039CE 0x10004c56 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +START RESOURCE serverapp_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +// SOURCE T_ServicesStep.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/serverapp2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/serverapp2.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,49 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET serverapp2.exe +TARGETTYPE exe +UID 0x100039CE 0x10004c58 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +START RESOURCE serverapp2_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +//SOURCE T_ServicesStep.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/serverapp3.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/serverapp3.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,49 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET serverapp3.exe +TARGETTYPE exe +UID 0x100039CE 0x10004c57 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +START RESOURCE serverapp3_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +//SOURCE T_ServicesStep.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/serverapp4.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/serverapp4.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,49 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET serverapp4.exe +TARGETTYPE exe +UID 0x100039CE 0x10004c76 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +START RESOURCE serverapp4_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +//SOURCE T_ServicesStep.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/serverapp6.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/serverapp6.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,58 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET serverapp6.exe +TARGETTYPE exe +UID 0x100039CE 0x10004c55 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application localisable resource file +resource serverapp_loc.RSS +start resource serverapp_loc.RSS +HEADER +targetpath /apparctestregfiles +lang sc +end + + +START RESOURCE serverapp6_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +//SOURCE T_ServicesStep.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/serverapp7.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/serverapp7.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,57 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET serverapp7.exe +TARGETTYPE exe +UID 0x100039CE 0x10004c54 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application localisable resource file +resource serverapp_loc.RSS +start resource serverapp_loc.RSS +HEADER +targetpath /apparctestregfiles +lang sc +end + +START RESOURCE serverapp7_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +// SOURCE T_ServicesStep.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp1.mmp --- a/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp1.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp1.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -46,11 +46,11 @@ START RESOURCE tRuleBasedApp1.rss HEADER -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles END START RESOURCE tRuleBasedApp1_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp2.mmp --- a/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp2.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp2.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -46,11 +46,11 @@ START RESOURCE tRuleBasedApp2.rss HEADER -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles END START RESOURCE tRuleBasedApp2_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp3.mmp --- a/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp3.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp3.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -46,11 +46,11 @@ START RESOURCE tRuleBasedApp3.rss HEADER -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles END START RESOURCE tRuleBasedApp3_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp4.mmp --- a/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp4.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp4.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -45,11 +45,11 @@ START RESOURCE tRuleBasedApp4.rss HEADER -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles END START RESOURCE tRuleBasedApp4_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_clientnotifstep.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_clientnotifstep.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,851 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include "t_clientnotifstep.h" +#include +#include +#include "T_SisFileInstaller.h" +#include +#include + +_LIT(KSimpleAppSisFile, "z:\\apparctest\\apparctestsisfiles\\SimpleApparcTestApp.sis"); +_LIT(KSimpleAppComponent, "SimpleApparcTestApp"); + +_LIT(KTestMultipleAppsSisFile, "z:\\apparctest\\apparctestsisfiles\\TestMultipleApps.sis"); +_LIT(KTestMultipleAppsComponent, "TestMultipleApps"); + +_LIT(KTestMultipleAppsDowngradeSisFile, "z:\\apparctest\\apparctestsisfiles\\TestMultipleAppsDowngrade.sis"); +_LIT(KTestMultipleAppsDowngradeComponent, "TestMultipleApps"); + +_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis"); +_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone"); + +const TUid KUidSimpleApp={0x12008ACE}; +const TUid KUidMultipleApp1={0x102032AB}; +const TUid KUidMultipleApp2={0x10208183}; +const TUid KUidMultipleApp3={0x10208184}; +const TUid KUidTstAppStandalone={10}; + +CT_ClientNotifStep::~CT_ClientNotifStep() +/** + Destructor + */ + { + } + +CT_ClientNotifStep::CT_ClientNotifStep() +/** + Constructor + */ + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KT_ClientNotifStep); + } + +TVerdict CT_ClientNotifStep::doTestStepPreambleL() +/** + @return - TVerdict code + Override of base class virtual + */ + { + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_ClientNotifStep::doTestStepPostambleL() +/** + @return - TVerdict code + Override of base class virtual + */ + { + return TestStepResult(); + } + + +TVerdict CT_ClientNotifStep::doTestStepL() +{ + RunTestCases(); + return TestStepResult(); +} + + +void CT_ClientNotifStep::RunTestCases() + { + RTestableApaLsSession ls; + User::LeaveIfError(ls.Connect()); + + TApaAppInfo info; + TUid uid = {0x12008ACE}; + TInt err = ls.GetAppInfo(info, uid); + if(err == KErrNone) + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KSimpleAppComponent); + } + + //DONT_CHECK is used because when an application is installed the updated application + //information is added in the session objects. This causes increase of memory at server side. + //As there can be multiple applications registered with apparc for applist change notifications, + //its not possible to clear the information in all the session objects. + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifInitialApplistCreation(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifLanguageChange(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifSingleAppInstallation(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifMultipleAppInstallation(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifUpgradeApp(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifMultipleInstallations(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifWithoutSetNotify(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifOnPackageUpgrade(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifOnPackageDowngrade(ls), NO_CLEANUP); + ls.Close(); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests apparc will not provide updated application information when the application list + created first time after device bootup. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Wait till the applist got created after phone boot. + 2. Retrieve the updated application information and check it is empty. + + + @SYMTestExpectedResults Apparc will not provide updated application information. + */ +void CT_ClientNotifStep::TestClientNotifInitialApplistCreation(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestClientNotifInitialApplistCreation started............")); + + TRequestStatus applistChangeStatus; + TRequestStatus applistCreationStatus; + //Register with apparc for applist change notification + aLs.SetNotify(ETrue, applistChangeStatus); + aLs.RegisterListPopulationCompleteObserver(applistCreationStatus); + User::WaitForRequest(applistCreationStatus); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d expected: 0"), updatedAppsInfo.Count()); + TEST(updatedAppsInfo.Count() == 0); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestClientNotifInitialApplistCreation ended............")); + } + + +void CT_ClientNotifStep::ChangeLocaleL(TLanguage aLanguage) + { + _LIT(KLitLanguageLocaleDllNameBase, "elocl_lan"); + //Region and collation code values are hard coded, as the check, after changing the locale is made for the language only. + _LIT(KLitRegionLocaleDllNameBase, "elocl_reg.826"); + _LIT(KLitCollationLocaleDllNameBase, "elocl_col.001"); + _LIT(ThreeDigExt,".%03d"); + TExtendedLocale localeDll; + const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6)); + TBuf<16> languageLocaleDllName(KLitLanguageLocaleDllNameBase); + languageLocaleDllName.AppendFormat(ThreeDigExt, aLanguage); + TBuf<16> regionLocaleDllName(KLitRegionLocaleDllNameBase); + TBuf<16> collationLocaleDllName(KLitCollationLocaleDllNameBase); + // Try to load the locale dll + TInt error=localeDll.LoadLocale(languageLocaleDllName, regionLocaleDllName, collationLocaleDllName); + + if (error==KErrNotFound) + { + // Locale dll is not found for the asked language. + ERR_PRINTF2(_L("Failed to find the locale dll for %d"), aLanguage); + } + + User::LeaveIfError(error); + localeDll.SaveSystemSettings(); + } + + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests apparc will not provide updated application information when the application list + updated due phone language change. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Wait till the applist got updated after phone language change. + 2. Retrieve the updated application information and check it is empty. + + + @SYMTestExpectedResults Apparc will not provide updated application information. + */ +void CT_ClientNotifStep::TestClientNotifLanguageChange(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestClientNotifLanguageChange started............")); + + TRequestStatus applistChangeStatus; + aLs.SetNotify(EFalse, applistChangeStatus); + //Change language + ChangeLocaleL(ELangGerman); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + TEST(updatedAppsInfo.Count() == 0); + + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + ChangeLocaleL(ELangEnglish); + User::WaitForRequest(applistChangeStatus); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestClientNotifInitialApplistCreation ended............")); + } + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether apparc provides updated application information when single application is installed + and uninstalled. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Installs a sis file which has single application and waits till applist is changed. + 2. Checks the updated information provided by apparc is as expected. + 3. Uninstalls the component installed in Step 1 + 4. Checks the updated information provided by apparc is as expected. + + + @SYMTestExpectedResults Apparc provides updated application information., + */ +void CT_ClientNotifStep::TestClientNotifSingleAppInstallation(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestSingleAppInstallation started............")); + CSisFileInstaller sisInstaller; + TRequestStatus applistChangeStatus; + + INFO_PRINTF1(_L("Installing single application")); + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile); + sisInstaller.InstallSisL(KSimpleAppSisFile); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 1); + TEST(updatedAppsInfo[0].iAppUid == KUidSimpleApp); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent); + + //Check the application is available in the applist. + TApaAppInfo appInfo; + TEST(aLs.GetAppInfo(appInfo, KUidSimpleApp) == KErrNone); + + INFO_PRINTF1(_L("Unnstalling single application")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + sisInstaller.UninstallSisL(KSimpleAppComponent); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after uninstallation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 1); + TEST(updatedAppsInfo[0].iAppUid == KUidSimpleApp); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent); + + //Check the application is not available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidSimpleApp) == KErrNotFound); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestSingleAppInstallation ended............")); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether apparc provides updated application information when multiple applications are installed + and uninstalled. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Installs a sis file which has multiple applications and waits till applist is changed. + 2. Checks the updated information provided by apparc is as expected. + 3. Uninstalls the component installed in Step 1 + 4. Checks the updated information provided by apparc is as expected. + + + @SYMTestExpectedResults Apparc provides updated application information. + */ + +void CT_ClientNotifStep::TestClientNotifMultipleAppInstallation(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestMultipleAppInstallation started............")); + CSisFileInstaller sisInstaller; + TRequestStatus applistChangeStatus; + + INFO_PRINTF1(_L("Installing multiple applications")); + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile); + sisInstaller.InstallSisL(KTestMultipleAppsSisFile); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 3); + TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent); + + //Check the application is available in the applist. + TApaAppInfo appInfo; + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone); + + INFO_PRINTF1(_L("Uninstalling multiple applications")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + sisInstaller.UninstallSisL(KTestMultipleAppsComponent); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after uninstallation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + TEST(updatedAppsInfo.Count()== 3); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppNotPresent); + + //Check the application is not available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNotFound); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNotFound); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNotFound); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestMultipleAppInstallation ended............")); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether apparc provides updated application information when an applications is + upgraded. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Checks whether upgrading application exists in applist. + 2. Installs a sis file which upgrades existing applications and waits till applist is changed. + 2. Checks the updated information provided by apparc is as expected. + 3. Uninstalls the component installed in Step 2 + 4. Checks the updated information provided by apparc is as expected. + + + @SYMTestExpectedResults Apparc provides updated application information. + */ +void CT_ClientNotifStep::TestClientNotifUpgradeApp(RTestableApaLsSession &aLs) +{ + INFO_PRINTF1(_L("TestClientNotifUpgradeApp started............")); + CSisFileInstaller sisInstaller; + TRequestStatus applistChangeStatus; + + INFO_PRINTF1(_L("Check the application is present before upgrade")); + //Check the application is available in the applist. + TApaAppInfo appInfo; + TEST(aLs.GetAppInfo(appInfo, KUidTstAppStandalone) == KErrNone); + + INFO_PRINTF1(_L("Installing upgrade application")); + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile); + sisInstaller.InstallSisL(KTstAppStandAloneSisFile); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 1); + TEST(updatedAppsInfo[0].iAppUid == KUidTstAppStandalone); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent); + + //Check the application is available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidTstAppStandalone) == KErrNone); + + INFO_PRINTF1(_L("Unnstalling upgrade application")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + sisInstaller.UninstallSisL(KTstAppStandAloneComponent); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after uninstallation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 1); + TEST(updatedAppsInfo[0].iAppUid == KUidTstAppStandalone); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent); + + //Check the application is still available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidTstAppStandalone) == KErrNone); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestClientNotifUpgradeApp ended............")); +} + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether apparc provides updated application information when there are multiple installations + happened before the clients requests for updated application information. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Installs a sis file and waits till applist is changed. + 2. Installs another sis file and waits till applist is changed. + 3. Checks the updated information provided by apparc is as expected. + 4. Uninstalls the component installed in Step 1 and waits till applist is changed. + 5. Uninstalls the component installed in Step 2 and waits till applist is changed. + 6. Checks the updated information provided by apparc is as expected. + + + @SYMTestExpectedResults Apparc provides updated application information. + */ +void CT_ClientNotifStep::TestClientNotifMultipleInstallations(RTestableApaLsSession &aLs) +{ + INFO_PRINTF1(_L("TestClientNotifMultipleInstallations started............")); + CSisFileInstaller sisInstaller; + TRequestStatus applistChangeStatus; + + INFO_PRINTF1(_L("Installing first sis file")); + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile); + sisInstaller.InstallSisL(KSimpleAppSisFile); + User::WaitForRequest(applistChangeStatus); + + INFO_PRINTF1(_L("Installing second sis file")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile); + sisInstaller.InstallSisL(KTestMultipleAppsSisFile); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installations")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 4); + TEST(updatedAppsInfo[0].iAppUid == KUidSimpleApp); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp1); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[3].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent); + + //Check the applications is available in the applist. + TApaAppInfo appInfo; + TEST(aLs.GetAppInfo(appInfo, KUidSimpleApp) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone); + + INFO_PRINTF1(_L("Unnstalling first component")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + sisInstaller.UninstallSisL(KSimpleAppComponent); + User::WaitForRequest(applistChangeStatus); + + INFO_PRINTF1(_L("Unnstalling second component")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + sisInstaller.UninstallSisL(KTestMultipleAppsComponent); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after uninstallation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 4); + TEST(updatedAppsInfo[0].iAppUid == KUidSimpleApp); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp1); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[3].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[3].iAction == TApaAppUpdateInfo::EAppNotPresent); + + //Check the applications are not available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidSimpleApp) == KErrNotFound); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNotFound); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNotFound); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNotFound); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestClientNotifMultipleInstallations ended............")); +} + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests apparc will not provide updated application information if SetNotify is not called + on an apparc session. Apparc only maintains updated application information with the sessions + which actually requested SetNotify and not yet called UpdatedAppsInfoL API. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Installs a sis file which has single application and waits till applist is changed. + 2. Retrieves the updated applist from different apparc session and checks the list is empty. + + + @SYMTestExpectedResults Apparc provides updated application information. + */ +void CT_ClientNotifStep::TestClientNotifWithoutSetNotify(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestClientNotifWithoutSetNotify started............")); + CSisFileInstaller sisInstaller; + TRequestStatus applistChangeStatus; + + INFO_PRINTF1(_L("Installing application")); + sisInstaller.InstallSisAndWaitForAppListUpdateL(KSimpleAppSisFile); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 0); + + INFO_PRINTF1(_L("Unnstalling application")); + sisInstaller.UninstallSisAndWaitForAppListUpdateL(KSimpleAppComponent); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after uninstallation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 0); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestClientNotifWithoutSetNotify ended............")); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether apparc provides updated application information a component is upgraded. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Installs a sis file which has 2 applications and waits till applist is changed. + 2. Checks the updated information provided by apparc is as expected. + 3. Upgrades the component which is installed in Step 1 which has one more application. + 4. Checks the updated information provided by apparc is as expected. + 3. Uninstalls the component installed in Step 3 + 4. Checks the updated information provided by apparc is as expected. + + + @SYMTestExpectedResults Apparc provides updated application information. + */ + +void CT_ClientNotifStep::TestClientNotifOnPackageUpgrade(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestClientNotifOnPackageUpgrade started............")); + CSisFileInstaller sisInstaller; + TRequestStatus applistChangeStatus; + + INFO_PRINTF1(_L("Installing sis file which has 2 applications")); + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsDowngradeSisFile); + sisInstaller.InstallSisL(KTestMultipleAppsDowngradeSisFile); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 2); + TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent); + + //Check the application is available in the applist. + TApaAppInfo appInfo; + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone); + + + INFO_PRINTF1(_L("Installing upgrade sis file which has 3 applications")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile); + sisInstaller.InstallSisL(KTestMultipleAppsSisFile); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 3); + TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent); + + //Check the application is available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone); + + INFO_PRINTF1(_L("Uninstalling applications ............")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + sisInstaller.UninstallSisL(KTestMultipleAppsComponent); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after uninstallation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + TEST(updatedAppsInfo.Count()== 3); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppNotPresent); + + //Check the application is not available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNotFound); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNotFound); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNotFound); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestMultipleAppInstallation ended............")); + } + + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether apparc provides updated application information a component is upgraded. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Installs a sis file which has 3 applications and waits till applist is changed. + 2. Checks the updated information provided by apparc is as expected. + 3. Degrades the component which is installed in Step 1 which has only 2 applications. + 4. Checks the updated information provided by apparc is as expected. + 3. Uninstalls the component installed in Step 3 + 4. Checks the updated information provided by apparc is as expected. + + + @SYMTestExpectedResults Apparc provides updated application information. + */ + +void CT_ClientNotifStep::TestClientNotifOnPackageDowngrade(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestClientNotifOnPackageDowngrade started............")); + CSisFileInstaller sisInstaller; + TRequestStatus applistChangeStatus; + + INFO_PRINTF1(_L("Installing sis file which has 3 applications")); + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile); + sisInstaller.InstallSisL(KTestMultipleAppsSisFile); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + RArray updatedAppsInfo; + CleanupClosePushL(updatedAppsInfo); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 3); + TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent); + + + //Check the application is available in the applist. + TApaAppInfo appInfo; + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone); + + + INFO_PRINTF1(_L("Installing sis file which has only 2 applications")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsDowngradeSisFile); + sisInstaller.InstallSisL(KTestMultipleAppsDowngradeSisFile); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after installation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo.Count()== 3); + TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent); + TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent); + + //Check the application is not available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNotFound); + + //Check the application is available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone); + + + INFO_PRINTF1(_L("Uninstalling applications")); + applistChangeStatus=KRequestPending; + aLs.SetNotify(EFalse, applistChangeStatus); + sisInstaller.UninstallSisL(KTestMultipleAppsDowngradeComponent); + User::WaitForRequest(applistChangeStatus); + + //Get the updated application information from apparc. + updatedAppsInfo.Reset(); + INFO_PRINTF1(_L("Retrieving updated application information after uninstallation")); + aLs.UpdatedAppsInfoL(updatedAppsInfo); + INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count()); + TEST(updatedAppsInfo.Count()== 2); + + //Check the information provided by apparc is what is expected. + TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp2); + TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent); + TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp3); + TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppNotPresent); + + //Check the application is not available in the applist. + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNotFound); + TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNotFound); + + CleanupStack::PopAndDestroy(); //updatedAppsInfo + INFO_PRINTF1(_L("TestClientNotifOnPackageDowngrade ended............")); + } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_clientnotifstep.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_clientnotifstep.h Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,60 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#if (!defined __T_CLIENTNOTIF_H__) +#define __T_CLIENTNOTIF_H__ + + +#include + +class RTestableApaLsSession; + + +/*Tests force registration functionality */ + +class CT_ClientNotifStep : public CTestStep + { +public: + CT_ClientNotifStep(); + ~CT_ClientNotifStep(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); + virtual TVerdict doTestStepL(); + +private: + void RunTestCases(); + void TestClientNotifInitialApplistCreation(RTestableApaLsSession &aLs); + void ChangeLocaleL(TLanguage aLanguage); + void TestClientNotifLanguageChange(RTestableApaLsSession &aLs); + + void TestClientNotifSingleAppInstallation(RTestableApaLsSession &aLs); + void TestClientNotifMultipleAppInstallation(RTestableApaLsSession &aLs); + void TestClientNotifUpgradeApp(RTestableApaLsSession &aLs); + void TestClientNotifMultipleInstallations(RTestableApaLsSession &aLs); + void TestClientNotifWithoutSetNotify(RTestableApaLsSession &aLs); + void TestClientNotifOnPackageUpgrade(RTestableApaLsSession &aLs); + void TestClientNotifOnPackageDowngrade(RTestableApaLsSession &aLs); + + }; + + +_LIT(KT_ClientNotifStep,"T_ClientNotif"); + +#endif diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_dataprioritysystem3.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_dataprioritysystem3.mmp Fri May 14 16:01:13 2010 +0300 @@ -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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET T_DataPrioritySystem3.exe +TARGETTYPE exe +UID 0x100039CE 0x10207f7f +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application exe registration resource file +resource T_DataPrioritySystem3_reg.rss +start resource T_DataPrioritySystem3_reg.rss +targetpath /apparctestregfiles +lang sc +end + +SOURCEPATH ../tef +//SOURCE T_ServicesStep.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_drivenotification.cpp --- a/appfw/apparchitecture/tef/t_drivenotification.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/t_drivenotification.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -29,8 +29,11 @@ #include #include "appfwk_test_utils.h" #include "t_drivenotification.h" +#include "T_SisFileInstaller.h" -_LIT(KResourceFileSourceZ, "z:\\system\\data\\tnotifydrivesapp_reg.rsc"); +_LIT(KNotifyDriveAppSisFile, "z:\\apparctest\\apparctestsisfiles\\tnotifydrivesapp.sis"); +_LIT(KNotifyDriveAppComponent, "tnotifydrivesapp"); + void CDriveTestObserver::HandleAppListEvent(TInt /*aEvent*/) { @@ -82,16 +85,16 @@ CleanupClosePushL(theLs); // Wait for applist to be updated.... - RPointerArray dummy; - User::LeaveIfError(theLs.ForceRegistration(dummy)); + TRequestStatus status; + theLs.SetNotify(ETrue, status); + User::WaitForRequest(status); //Check whether app is not present in the applist TInt ret = theLs.GetAppInfo(appInfo,appUid); INFO_PRINTF3(_L(" Expected value is %d, Call to GetAppInfo returned : %d "), KErrNotFound, ret); TEST(ret==KErrNotFound); - //Copy the registration file to C: drive. - CopyRegFileL(EDriveC); + //Install the application. CDriveTestObserver* obs = new(ELeave) CDriveTestObserver(); CleanupStack::PushL(obs); @@ -99,7 +102,10 @@ CleanupStack::PushL(notif); obs->iNotifier = notif; - + + CSisFileInstaller sisFileInstaller; + sisFileInstaller.InstallSisL(KNotifyDriveAppSisFile); + CActiveScheduler::Start(); //Since c:\\private\\10003a3f\\Import\\apps\\ path is Monitored, a notification is issued and applist is updated. TEST(obs->iNotified > 0); @@ -110,11 +116,8 @@ INFO_PRINTF3(_L(" Expected value is %d, Call to GetAppInfo returned : %d "), KErrNone, ret); TEST(ret==KErrNone); - //Deleting the rsc file that is present in c:\\private\\10003a3f\\Import\\apps\\ path. - DeleteRegFileL(EDriveC); - - // Wait for applist to be updated.... - User::LeaveIfError(theLs.ForceRegistration(dummy)); + //Uninstall the application + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KNotifyDriveAppComponent); //Check whether applist is updated and app is absent in the applist. ret = theLs.GetAppInfo(appInfo,appUid); @@ -128,8 +131,8 @@ //Copy the registration file to drive specified. CopyRegFileL(drive); - // Wait for applist to be updated.... - User::LeaveIfError(theLs.ForceRegistration(dummy)); +// // Wait for applist to be updated.... +// User::LeaveIfError(theLs.ForceRegistration(dummy)); //Check whether applist is updated and app is present in the applist. #ifdef __EABI__ @@ -143,7 +146,7 @@ TEST(ret==KErrNone); INFO_PRINTF3(_L(" Expected value is %d, Call to GetAppInfo returned : %d "),KErrNone, ret); //Deleting the rsc file. - DeleteRegFileL(drive); +// DeleteRegFileL(drive); #endif CleanupStack::PopAndDestroy(3, &theLs); @@ -184,7 +187,7 @@ { User::LeaveIfError(ret); } - ret = smlServer.CopyFileL(KResourceFileSourceZ, tempPathToBeCopied); +// ret = smlServer.CopyFileL(KResourceFileSourceZ, tempPathToBeCopied); TEST(ret == KErrNone); INFO_PRINTF2(_L("Copied Registration file. Finished with the value : %d "), ret); CleanupStack::PopAndDestroy(4, &fs); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_forceregstep.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_forceregstep.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,471 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include "t_forceregstep.h" +#include +#include +#include "T_SisFileInstaller.h" +#include +#include +#include +#include +#include "testableapalssession.h" + +_LIT(KForceRegApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegApp1.sis"); +_LIT(KForceRegApp1Component, "ForceRegApp1"); + +_LIT(KForceRegMultipleAppsSisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegMultipleApps.sis"); +_LIT(KForceRegMultipleAppsComponent, "ForceRegMultipleApps"); + +_LIT(KForceRegApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegApp2.sis"); +_LIT(KForceRegApp2Component, "ForceRegApp2"); + +const TUint KForceRegistratioWaitTime=5000000; //5s +const TUid KUidForceRegApp2={0xA0001001}; +_LIT(KTestClientNotificationThreadName, "TestClientNotificationThreadName"); + + +CT_ForceRegStep::~CT_ForceRegStep() +/** + Destructor + */ + { + } + +CT_ForceRegStep::CT_ForceRegStep() +/** + Constructor + */ + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KT_ForceRegStep); + } + +TVerdict CT_ForceRegStep::doTestStepPreambleL() +/** + @return - TVerdict code + Override of base class virtual + */ + { + + //Create property which is used for communication between test and force registered applications. + TInt error; + error=RProperty::Define(KPropertyCategory, KForceRegTestPropertyKey, RProperty::EInt); + if((error != KErrNone) && (error != KErrAlreadyExists)) + User::Leave(error); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_ForceRegStep::doTestStepPostambleL() +/** + @return - TVerdict code + Override of base class virtual + */ + { + RProperty::Delete(KPropertyCategory, KForceRegTestPropertyKey); + + return TestStepResult(); + } + + +TVerdict CT_ForceRegStep::doTestStepL() +{ + RunTestCases(); + return TestStepResult(); +} + + +void CT_ForceRegStep::RunTestCases() + { + RTestableApaLsSession ls; + User::LeaveIfError(ls.Connect()); + RPointerArray regFiles; + //Check the earlier force registration API is not supported + TEST(ls.ForceRegistration(regFiles) == KErrNotSupported); + + CSisFileInstaller sisFileInstaller; + TApaAppInfo info; + TUid uid1 = {0xA0001000}; + TInt err = ls.GetAppInfo(info, uid1); + if(err == KErrNone) + { + sisFileInstaller.UninstallSisL(KForceRegApp1Component); + } + + TUid uid2 = {0xA0001001}; + err = ls.GetAppInfo(info, uid2); + if(err == KErrNone) + { + sisFileInstaller.UninstallSisL(KForceRegApp2Component); + } + + //Wait if apparc updating the applist + TRequestStatus applistChangeStatus; + ls.SetNotify(ETrue, applistChangeStatus); + User::WaitForRequest(applistChangeStatus); + + //DONT_CHECK is used because when an application is installed the updated application + //information is added in the session objects. This causes increase of memory at server side. + //As there can be multiple applications registered with apparc for applist change notifications, + //its not possible to clear the information in all the session objects. + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestSingleForceRegistration(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestMultipleForceRegistration(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, 0, TestForceRegistrationSecurity(ls), NO_CLEANUP); + //HEAP_TEST_LS_SESSION(ls, 0, 0, TestForceRegistrationWhenInstallationFailed(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestForceRegistrationAndNoClientNotification(ls), NO_CLEANUP); + ls.Close(); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether force registration works with a sis file which has single run on install + application. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Attaches to a property which will be set by force registered (or run on install) + application when it got executed. + 2. Installs sis file which has run on install application. + 3. Waits till the run on install application changes the propery or a timer expires. + 4. Checks the property is changed by run on install application. + + @SYMTestExpectedResults The property is changed by run on install application. + */ +void CT_ForceRegStep::TestSingleForceRegistration(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestSingleForceRegistration test started...........")); + RProperty forceRegStatus; + User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread)); + CleanupClosePushL(forceRegStatus); + + TRequestStatus forceRegStatusChange; + TRequestStatus forceRegWait; //Timer expiration status + + //Timer to wait for definite time. + RTimer timerToWait; + User::LeaveIfError(timerToWait.CreateLocal()); + CleanupClosePushL(timerToWait); + timerToWait.After(forceRegWait, KForceRegistratioWaitTime); + + //The property value will be changed by forceregistered application when its executed. + forceRegStatus.Subscribe(forceRegStatusChange); + + INFO_PRINTF1(_L("Install forceregapp1 application")); + //Install the forceregapp1 + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegApp1SisFile); + sisFileInstaller.InstallSisL(KForceRegApp1SisFile); + + INFO_PRINTF1(_L("Wait till the timer expires or force registered application changes the property")); + //Wait till the property is changed by forceregapp1 or till timer expires + User::WaitForRequest(forceRegWait, forceRegStatusChange); + + TInt value; + forceRegStatus.Get(value); + INFO_PRINTF2(_L("Property value: %d"), value); + //Check the property value is changed by forceregapp1 + TEST(value == KForceRegApp1Executed); + + INFO_PRINTF1(_L("Uninstall forceregapp1 application")); + //Uninstall the forceregapp1 + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KForceRegApp1Component); + CleanupStack::PopAndDestroy(2); //forceRegStatus, timerToWait + INFO_PRINTF1(_L("TestSingleForceRegistration test ended...........")); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether force registration works with a sis file which has multiple run on install + applications. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Attaches to a property which will be set by force registered (or run on install) + application when it got executed. + 2. Installs sis file which has multiple run on install applications. + 3. Waits till the run on install applications changes the propery or a timer expires. + 4. Checks the property is changed by run on install applications. + + @SYMTestExpectedResults The property is changed by run on install applications. + */ + +void CT_ForceRegStep::TestMultipleForceRegistration(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestMultipleForceRegistration test started...........")); + RProperty forceRegStatus; + User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread)); + //Set the property to a KStopForceRegApp2 to make the forceregapp2 to exit. + forceRegStatus.Set(KStopForceRegApp2); + + TRequestStatus forceRegApp1Executed, forceRegApp2Executed; + TRequestStatus forceRegWait; + + //Timer to wait for definite time. + RTimer timeToWait; + User::LeaveIfError(timeToWait.CreateLocal()); + timeToWait.After(forceRegWait, KForceRegistratioWaitTime); + //The property value will be changed by forceregistered application. Subscribe to property change. + forceRegStatus.Subscribe(forceRegApp1Executed); + + INFO_PRINTF1(_L("Install forceregapp1 and forceregapp2 application")); + //Install the forceregapp1 + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegMultipleAppsSisFile); + sisFileInstaller.InstallSisL(KForceRegMultipleAppsSisFile); + + INFO_PRINTF1(_L("Wait till the timer expires or force registered applications changes the property")); + User::WaitForRequest(forceRegWait, forceRegApp1Executed); + + TInt value; + forceRegStatus.Get(value); + + //If the property value is not as expected, wait till the forceregapp2 is executed. + if(value != (KForceRegApp1Executed|KForceRegApp2Executed|KStopForceRegApp2)) + { + forceRegStatus.Subscribe(forceRegApp2Executed); + forceRegWait=KRequestPending; + timeToWait.After(forceRegWait, KForceRegistratioWaitTime); + User::WaitForRequest(forceRegWait, forceRegApp2Executed); + } + + forceRegStatus.Get(value); + INFO_PRINTF2(_L("Property value: %d"), value); + //Check whether both force registered applications executed. + TEST(value == (KForceRegApp1Executed|KForceRegApp2Executed|KStopForceRegApp2)); + + INFO_PRINTF1(_L("Uninstall forceregapp1 and forceregapp2 application")); + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KForceRegMultipleAppsComponent); + forceRegStatus.Close(); + //Wait for time so that appac completes applist cache creation. + User::After(2000000); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests force registration security. Force registration can only be used by SWI. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Creates dummy application information. + 2. Call the force registration with this application info. + 3. Check return value is KErrNotSupported. + + @SYMTestExpectedResults ForceRegistration should return KErrNotSupported if other Software Installer + trying to use it. + */ + +void CT_ForceRegStep::TestForceRegistrationSecurity(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestForceRegistrationSecurity test started...........")); + Usif::CApplicationRegistrationData *appData=Usif::CApplicationRegistrationData::NewL(); + CleanupStack::PushL(appData); + RPointerArray appArray; + + INFO_PRINTF1(_L("Call ForceRegistration with empty TApaAppUpdate info array..........")); + TEST(aLs.ForceRegistration(appArray)==KErrNone); + appArray.AppendL(appData); + INFO_PRINTF1(_L("Call ForceRegistration with TApaAppUpdate info array..........")); + TEST(aLs.ForceRegistration(appArray)==KErrNotSupported); + + CleanupStack::PopAndDestroy(appData); + appArray.Close(); + INFO_PRINTF1(_L("TestForceRegistrationSecurity test ended...........")); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + @SYMTestCaseDesc Tests force registered applications information removed from the applist if + installation fails. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Install sis file which has force registered application. + 2. Cancel the installation. + 2. Check the force registered application is not available in the applist. + + @SYMTestExpectedResults Force registered application information is removed from the applist + */ + +void CT_ForceRegStep::TestForceRegistrationWhenInstallationFailed(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestForceRegistrationWhenInstallationFailed test started...........")); + TApaAppInfo appInfo; + TInt err; + + //Check whether the application is already in the applist. + err=aLs.GetAppInfo(appInfo, KUidForceRegApp2); + INFO_PRINTF2(_L("Error Code returned: %d"), err); + TEST(err==KErrNotFound); + + CSisFileInstaller sisFileInstaller; + RProperty forceRegStatus; + User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread)); + TRequestStatus propertyStatus; + forceRegStatus.Subscribe(propertyStatus); + + //Install ForceRegApp2 asynchronously + TRequestStatus installStatus; + INFO_PRINTF1(_L("Install the sis file which eventually cancelled by test")); + err=KErrNone; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegApp2SisFile); + TRAP(err, sisFileInstaller.InstallSisAsynchronouslyL(KForceRegApp2SisFile, installStatus)); + TEST(err == KErrNone); + + //ForceRegApp2 is run on install application. The property is changed when the application executed. + User::WaitForRequest(propertyStatus); + + //Make ForceRegApp2 to exit by adding KStopForceRegApp2 to property. + TInt value; + forceRegStatus.Get(value); + value |= KStopForceRegApp2; + forceRegStatus.Set(value); + forceRegStatus.Close(); + + //Cancel the installation. + sisFileInstaller.CancelInstallation(); + User::WaitForRequest(installStatus); + sisFileInstaller.Close(); + + User::After(2000000); + INFO_PRINTF2(_L("Installation ended with error code: %d"), installStatus.Int()); + TEST(installStatus.Int() != KErrNone); + + //Check the force registered application is no longer exists in the applist. + err=aLs.GetAppInfo(appInfo, KUidForceRegApp2); + INFO_PRINTF2(_L("Error Code returned: %d"), err); + TEST(err==KErrNotFound); + INFO_PRINTF1(_L("TestForceRegistrationWhenInstallationFailed test ended...........")); + } + +TInt TestClientNotificationThread(TAny* aPtr); + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests if applist is changed due to force registration, apparc will not notify the + clients. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions 1. Start TestClientNotificationThread which registers with apparc for applist change + notification and waits till applist change notification occurs or a timer expires. + Once any of the event occurs, then changes the property to make the forceregapp2 to + exit and makes the status of applist change reflects in property. + 2. Installs a sis file which has run on install forcereg1 and forcereg2 applications + 3. Waits till the TestClientNotificationThread exits. + 4. Checks whether applist change notification recieved or not. + + @SYMTestExpectedResults Apparc does not notify clients about applist change which occur due to force registration. + */ + +void CT_ForceRegStep::TestForceRegistrationAndNoClientNotification(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestForceRegistrationAndNoClientNotification test started...........")); + RProperty forceRegStatus; + User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread)); + forceRegStatus.Set(0); + + TBuf<0x100> threadName(KTestClientNotificationThreadName); + RThread thread; + + INFO_PRINTF1(_L("Start TestClientNotificationThread thread")); + User::LeaveIfError(thread.Create(threadName, TestClientNotificationThread, 0x1000, NULL, (TAny*) this)); + CleanupClosePushL(thread); + TRequestStatus status; + thread.Logon(status); + thread.Resume(); + + INFO_PRINTF1(_L("Install sis file")); + //Install the forceregapp1 + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegMultipleAppsSisFile); + sisFileInstaller.InstallSisL(KForceRegMultipleAppsSisFile); + + INFO_PRINTF1(_L("Waiting till TestClientNotificationThread thread exits")); + User::WaitForRequest(status); + + TInt value; + forceRegStatus.Get(value); + INFO_PRINTF2(_L("Property value: %d"), value); + TEST(!(value & KApplistChanged)); + INFO_PRINTF1(_L("Uninstall sis file")); + sisFileInstaller.UninstallSisL(KForceRegMultipleAppsComponent); + CleanupStack::PopAndDestroy(); + forceRegStatus.Close(); + INFO_PRINTF1(_L("TestForceRegistrationAndNoClientNotification test ended...........")); + } + +/* + * TestClientNotificationThread registers with apparc for applist change notification and waits till applist + * change notification occurs or a timer expires. Once any of the event occurs, then changes the property to + * make the forceregapp2 to exit and makes the status of applist change reflects in property. + */ + +TInt TestClientNotificationThread(TAny* aPtr) + { + RApaLsSession ls; + User::LeaveIfError(ls.Connect()); + TRequestStatus applistChangeStatus, timeOutStatus; + ls.SetNotify(EFalse, applistChangeStatus); + + //Timer to wait for definite time. + RTimer timeToWait; + User::LeaveIfError(timeToWait.CreateLocal()); + timeToWait.After(timeOutStatus, KForceRegistratioWaitTime); + User::WaitForRequest(applistChangeStatus, timeOutStatus); + + RProperty forceRegStatus; + User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread)); + TInt status; + forceRegStatus.Get(status); + + if(applistChangeStatus.Int() == MApaAppListServObserver::EAppListChanged) + status |= KApplistChanged; + + status |= KStopForceRegApp2; + forceRegStatus.Set(status); + forceRegStatus.Close(); + + return(KErrNone); + } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_forceregstep.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_forceregstep.h Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,60 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#if (!defined __T_FORCEREG_H__) +#define __T_FORCEREG_H__ + + +#include + +class RTestableApaLsSession; + +const TUid KPropertyCategory = {0x101F289C}; +const TUint KForceRegTestPropertyKey = 1; + +const TUint KForceRegApp1Executed = 0x1; +const TUint KForceRegApp2Executed = 0x2; +const TUint KStopForceRegApp2 = 0x10; +const TUint KApplistChanged = 0x0100; + + +/*Tests force registration functionality */ + +class CT_ForceRegStep : public CTestStep + { +public: + CT_ForceRegStep(); + ~CT_ForceRegStep(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); + virtual TVerdict doTestStepL(); + +private: + void RunTestCases(); + void TestSingleForceRegistration(RTestableApaLsSession &aLs); + void TestMultipleForceRegistration(RTestableApaLsSession &aLs); + void TestForceRegistrationSecurity(RTestableApaLsSession &aLs); + void TestForceRegistrationWhenInstallationFailed(RTestableApaLsSession &aLs); + void TestForceRegistrationAndNoClientNotification(RTestableApaLsSession &aLs); + }; + +_LIT(KT_ForceRegStep,"T_ForceReg"); + +#endif diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_groupname.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_groupname.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,58 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET T_groupname.exe +TARGETTYPE exe +UID 0x100039CE 0x10208185 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application localisable resource file +resource T_groupname_loc.RSS +start resource T_groupname_loc.RSS +HEADER +targetpath /apparctestregfiles +lang sc +end + + +START RESOURCE T_groupname_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + + +SOURCEPATH ../tef +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_groupname_ver1.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_groupname_ver1.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,58 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET T_groupname_ver1.exe +TARGETTYPE exe +UID 0x100039CE 0x10208183 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application localisable resource file +resource T_groupnamever1_loc.RSS +start resource T_groupnamever1_loc.RSS +HEADER +targetpath /apparctestregfiles +lang sc +end + + +START RESOURCE T_groupnamever1_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + + +SOURCEPATH ../tef +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_groupname_ver2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_groupname_ver2.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,58 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +TARGET T_groupname_ver2.exe +TARGETTYPE exe +UID 0x100039CE 0x10208184 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application localisable resource file +resource T_groupnamever2_loc.RSS +start resource T_groupnamever2_loc.RSS +HEADER +targetpath /apparctestregfiles +lang sc +end + + +START RESOURCE T_groupnamever2_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + + +SOURCEPATH ../tef +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_largestackstep.cpp --- a/appfw/apparchitecture/tef/t_largestackstep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/t_largestackstep.cpp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -29,6 +29,10 @@ #endif //SYMBIAN_ENABLE_SPLIT_HEADERS #include "../apserv/apsclsv.h" #include "t_largestackstep.h" +#include "T_SisFileInstaller.h" + +_LIT(KLargeStackAppSisFile, "z:\\apparctest\\apparctestsisfiles\\tlargestackapp.sis"); +_LIT(KLargeStackAppComponent, "tlargestackapp"); const TUid KLargeStackAppUid = {0x10282B27}; @@ -94,6 +98,33 @@ CleanupStack::PopAndDestroy(commandline); } +TVerdict CT_LargeStackStep::doTestStepPreambleL() +/** + @return - TVerdict code + Override of base class virtual + */ + { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KLargeStackAppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KLargeStackAppSisFile); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_LargeStackStep::doTestStepPostambleL() +/** + @return - TVerdict code + Override of base class virtual + */ + { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KLargeStackAppComponent); + + return TestStepResult(); + } + + TVerdict CT_LargeStackStep::doTestStepL() { INFO_PRINTF1(_L("Test T_LargeStack Started")); diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_largestackstep.h --- a/appfw/apparchitecture/tef/t_largestackstep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/t_largestackstep.h Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -39,6 +39,8 @@ ~CT_LargeStackStep(); //from CTestStep + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); TVerdict doTestStepL(); private: diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_mimecontentpolicystep.cpp --- a/appfw/apparchitecture/tef/t_mimecontentpolicystep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/t_mimecontentpolicystep.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -20,6 +20,11 @@ */ #include "t_mimecontentpolicystep.h" +#include +#include + +//Closed content and extension information repository UID +const TUid KClosedContentAndExtensionInfoRepositoryUID={0x10003A3F}; _LIT(KPathjpg1, "z:\\system\\data\\type-r.jpg"); _LIT(KPathjpg2, "z:\\system\\data\\propelli.jpg"); @@ -76,6 +81,7 @@ HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, CCPTestIsDRMEnvelopeFileHandleL(), NO_CLEANUP); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, CCPTestIsClosedFileFileHandleL(), iApaLsSession.FlushRecognitionCache()); HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, CCPOOMTestL(), iApaLsSession.FlushRecognitionCache()); + HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, CCPTestIsClosedContentAndExtenstionInfoRepositoryReadOnlyL(), NO_CLEANUP); } /** @@ -89,8 +95,9 @@ @SYMTestStatus Implemented - @SYMTestActions Closed types are the mime types which are listed in the ApfMimeContentPolicy.rss file. + @SYMTestActions Closed types are the mime types which are listed in the 10003a3f repository file. Calls CApfMimeContentPolicy::IsClosedType(const TDesC& aMimeType); for different closed and non-closed mime types. + And also it tests whether invalid mime types are not added to the list. @SYMTestExpectedResults The test checks whether IsClosedType returns ETrue for the Closed Mime types and EFalse for non-closed Mime types */ @@ -120,7 +127,17 @@ _LIT(KMimeType20, "video/mpeg"); _LIT(KMimeType21, "video/quicktime"); _LIT(KMimeType22, "video/mpeg4-generic"); - + + //Invalid mime types + _LIT(KMimeType23, "/test"); + _LIT(KMimeType24, "test"); + _LIT(KMimeType25, "test/"); + _LIT(KMimeType26, "/test/"); + _LIT(KMimeType27, "test/testmime/"); + _LIT(KMimeType28, "/test/testmime"); + _LIT(KMimeType29, "test\\testmime"); + + INFO_PRINTF1(_L("Tests the MIME types found on closed content list")); @@ -192,6 +209,27 @@ TEST(!iCcp->IsClosedType(KMimeType22)); INFO_PRINTF2(_L("%S is not Closed Type"), &KMimeType22); + + TEST(!iCcp->IsClosedType(KMimeType23)); + INFO_PRINTF2(_L("%S is not Closed Type"), &KMimeType23); + + TEST(!iCcp->IsClosedType(KMimeType24)); + INFO_PRINTF2(_L("%S is not Closed Type"), &KMimeType24); + + TEST(!iCcp->IsClosedType(KMimeType25)); + INFO_PRINTF2(_L("%S is not Closed Type"), &KMimeType25); + + TEST(!iCcp->IsClosedType(KMimeType26)); + INFO_PRINTF2(_L("%S is not Closed Type"), &KMimeType26); + + TEST(!iCcp->IsClosedType(KMimeType27)); + INFO_PRINTF2(_L("%S is not Closed Type"), &KMimeType27); + + TEST(!iCcp->IsClosedType(KMimeType28)); + INFO_PRINTF2(_L("%S is not Closed Type"), &KMimeType28); + + TEST(!iCcp->IsClosedType(KMimeType29)); + INFO_PRINTF2(_L("%S is not Closed Type"), &KMimeType29); } /** @@ -205,8 +243,9 @@ @SYMTestStatus Implemented - @SYMTestActions Closed file extensions are the file extensions which are listed in the ApfMimeContentPolicy.rss file. + @SYMTestActions Closed file extensions are the file extensions which are listed in the 10003a3f repository. Calls CApfMimeContentPolicy::IsClosedExtension(const TDesC& aFileExtension); for different closed and non-closed File Extensions. + And also it tests whether invalid closed extensions are not added to the list. @SYMTestExpectedResults The test checks whether IsClosedExtension returns ETrue for the Closed File Extensions and EFalse for non-closed File Extensions. */ @@ -229,6 +268,9 @@ _LIT(KExtension14, ".sis7"); _LIT(KExtension15, ".0sis"); _LIT(KExtension16, ".gif"); + + //Invalid extension + _LIT(KExtension17, "tst"); INFO_PRINTF1(_L("Tests the extensions found on closed content list")); @@ -282,6 +324,9 @@ TEST(!iCcp->IsClosedExtension(KExtension16)); INFO_PRINTF2(_L("%S is not Closed Extension"), &KExtension16); + + TEST(!iCcp->IsClosedExtension(KExtension17)); + INFO_PRINTF2(_L("%S is not Closed Extension"), &KExtension17); } /** @@ -322,7 +367,7 @@ @SYMTestStatus Implemented - @SYMTestActions Closed files are files whose file extensions are listed in the ApfMimeContentPolicy.rss file. + @SYMTestActions Closed files are files whose file extensions are listed in the 10003a3f repository. Calls CApfMimeContentPolicy::IsClosedFileL(const TDesC& aFileName); for different Closed and non-closed files. Calls CApfMimeContentPolicy::IsClosedFileL(const TDesC& aFileName); with file which is already open and checks whether \n call succeeds. @@ -427,7 +472,7 @@ @SYMTestStatus Implemented - @SYMTestActions Closed files are files whose file extensions are listed in the ApfMimeContentPolicy.rss file. + @SYMTestActions Closed files are files whose file extensions are listed in the 10003a3f repository. Calls CApfMimeContentPolicy::IsClosedFileL(RFile& aFileHandle); for different Closed and non-closed files. @SYMTestExpectedResults The test checks whether IsClosedFileL() returns EFalse for Files which are not closed and\n @@ -509,3 +554,58 @@ INFO_PRINTF1(_L("OOM test Completed")); } + +/** + @SYMTestCaseID APPFWK-APPARC-0108 + + @SYMREQ REQ410-2692 + + @SYMTestCaseDesc Tests Closed content and extension information repository is not writable. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + @SYMTestActions Calls create, get, set, reset, delete functions on the repository. Checks only read operations are allowed. + + @SYMTestExpectedResults Tests should complete without any failure. + */ + +void CT_MimeContentPolicyStep::CCPTestIsClosedContentAndExtenstionInfoRepositoryReadOnlyL() + { + INFO_PRINTF1(_L("Testcase CCPTestIsClosedContentAndExtenstionInfoRepositoryReadOnly....")); + CRepository *cenrep=CRepository::NewL(KClosedContentAndExtensionInfoRepositoryUID); + CleanupStack::PushL(cenrep); + TInt newKeyValue=0x00010000; + //This key already exists in the default Closed content and extension information repository + TInt existingKey=0x1; + TBuf keyData; + TInt err=KErrNone; + + INFO_PRINTF1(_L("Testing creation of key in the repository")); + err=cenrep->Create(newKeyValue, 0); + TEST(err==KErrPermissionDenied); + INFO_PRINTF2(_L("Error code while creating a key: %d"), err); + + INFO_PRINTF1(_L("Testing setting value of an existing key in the repository")); + err=cenrep->Set(existingKey, 0); + TEST(err==KErrPermissionDenied); + INFO_PRINTF2(_L("Error code while setting a value of an existing key: %d"), err); + + INFO_PRINTF1(_L("Testing getting value of an existing key in the repository")); + err=cenrep->Get(existingKey, keyData); + TEST(err==KErrNone); + INFO_PRINTF2(_L("Error code while getting a value of an existing key: %d"), err); + + INFO_PRINTF1(_L("Testing resetting value of an existing key in the repository")); + err=cenrep->Reset(existingKey); + TEST(err==KErrPermissionDenied); + INFO_PRINTF2(_L("Error code while reseting a value of existing key: %d"), err); + + INFO_PRINTF1(_L("Testing deleting an existing key in the repository")); + err=cenrep->Delete(existingKey); + TEST(err==KErrPermissionDenied); + INFO_PRINTF2(_L("Error code while deleting an existing key: %d"), err); + CleanupStack::PopAndDestroy(cenrep); + INFO_PRINTF1(_L("Testcase CCPTestIsClosedContentAndExtenstionInfoRepositoryReadOnly completed....")); + } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_mimecontentpolicystep.h --- a/appfw/apparchitecture/tef/t_mimecontentpolicystep.h Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/t_mimecontentpolicystep.h Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -46,6 +46,7 @@ // aIsDRMEnvelope is ETrue for DRM Envelope and EFalse for ClosedFile TBool DoCCPTestUsingFileHandleL(const TDesC &aName, TBool aIsDRMEnvelope); void CCPOOMTestL(); + void CCPTestIsClosedContentAndExtenstionInfoRepositoryReadOnlyL(); private: CApfMimeContentPolicy* iCcp; diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_nonnativetest.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_nonnativetest.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,307 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include "t_nonnativetest.h" +#include +#include +#include "T_SisFileInstaller.h" +#include +#include +#include +#include +#include "testableapalssession.h" +#include "appfwk_test_utils.h" +#include "apacmdln.h" +#include "apgicnflpartner.h" + +_LIT(KTNonNativeRuntimeSisFile, "z:\\apparctest\\apparctestsisfiles\\tnonnativeruntime.sis"); +_LIT(KTNonNativeRuntimeComponent, "TNonNativeRunTime"); + +_LIT(KTestScrDBSource, "z:\\apparctest\\scr_test.db"); +_LIT(KScrDBSource, "z:\\apparctest\\scr.db"); +_LIT(KScrDBTarget, "c:\\sys\\install\\scr\\scr.db"); +_LIT(KScrDBTempTarget, "c:\\sys\\install\\scr\\scr_temp.db"); + + +_LIT(KNonNotiveAppName, "\\268454131.fakeapp"); + +const TUid KMidletUid={0x10210E26}; +const TUid KWidgetUid={0x10282821}; +const TUid KTestNonNativeUid={0xFF51233}; + +const TUid KUidNonNativeRuntime={0xA0001002}; + +const TUid KPropertyCategory = {0x101F289C}; +const TUint KNonNativeTestPropertyKey = 2; + +CT_NonNativeTestStep::~CT_NonNativeTestStep() +/** + Destructor + */ + { + } + +CT_NonNativeTestStep::CT_NonNativeTestStep() +/** + Constructor + */ + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KT_NonNativeTestStep); + } + +TVerdict CT_NonNativeTestStep::doTestStepPreambleL() +/** + @return - TVerdict code + Override of base class virtual + */ + { + + //Create property which is used for communication between test and non-native runtime. + TInt error; + error=RProperty::Define(KPropertyCategory, KNonNativeTestPropertyKey, RProperty::EInt); + if((error != KErrNone) && (error != KErrAlreadyExists)) + User::Leave(error); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CT_NonNativeTestStep::doTestStepPostambleL() +/** + @return - TVerdict code + Override of base class virtual + */ + { + RProperty::Delete(KPropertyCategory, KNonNativeTestPropertyKey); + + return TestStepResult(); + } + + +TVerdict CT_NonNativeTestStep::doTestStepL() +{ + RunTestCases(); + return TestStepResult(); +} + + +void CT_NonNativeTestStep::RunTestCases() + { + RTestableApaLsSession ls; + User::LeaveIfError(ls.Connect()); + + //Wait if apparc updating the applist + TRequestStatus applistChangeStatus; + ls.SetNotify(ETrue, applistChangeStatus); + User::WaitForRequest(applistChangeStatus); + + //DONT_CHECK is used because when an application is installed the updated application + //information is added in the session objects. This causes increase of memory at server side. + //As there can be multiple applications registered with apparc for applist change notifications, + //its not possible to clear the information in all the session objects. + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestNonNativeAppLaunchWithUnavailableMappingL(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, 0, TestNonNativeUnsupportedAPIs(ls), NO_CLEANUP); + HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestGetAppTypeL(ls), NO_CLEANUP); + ls.Close(); + } + + +/** + @SYMTestCaseID APPFWK-APPARC-0106 + + + @SYMTestCaseDesc Tests whether apparc able to launch a non-native application for which the mapping is + not avaialable in apparc mapping table but its available in SCR. + + @SYMTestPriority High + + @SYMTestStatus Implemented + + + @SYMTestExpectedResults Apparc will launch the non-native applciation. + */ + +void CT_NonNativeTestStep::TestNonNativeAppLaunchWithUnavailableMappingL(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestNonNativeAppLaunchWithUnavailableMapping test started...........")); + + RProperty property; + User::LeaveIfError(property.Attach(KPropertyCategory, KNonNativeTestPropertyKey, EOwnerThread)); + CleanupClosePushL(property); + User::After(2000000); //Wait for 2 secconds till SCR server closed. + + RSmlTestUtils fs; + User::LeaveIfError(fs.Connect()); + CleanupClosePushL(fs); + + INFO_PRINTF1(_L("Delete existing scr.db")); + //Copy the existing SCR db to temp file and delete it + fs.CopyFileL(KScrDBTarget, KScrDBTempTarget); + fs.DeleteFileL(KScrDBTarget); + + INFO_PRINTF1(_L("Copying scr_test.db")); + //Copy the scr_test.db which has non-native application information and + //non-native type to its runtime. + fs.CopyFileL(KTestScrDBSource, KScrDBTarget); + fs.ChangeFilePermissionL(KScrDBTarget); + + INFO_PRINTF1(_L("Updating applist with a non-native application exists in scr_test.db")); + TApaAppUpdateInfo appUpdateInfo; + RArray updateAppArray; + CleanupClosePushL(updateAppArray); + + appUpdateInfo.iAppUid=TUid::Uid(0x100048F3); //Test non-native app + appUpdateInfo.iAction= TApaAppUpdateInfo::EAppPresent; + updateAppArray.AppendL(appUpdateInfo); + + TRequestStatus status; + aLs.SetNotify(EFalse, status); + aLs.UpdateAppListL(updateAppArray); + CleanupStack::PopAndDestroy(&updateAppArray); + User::WaitForRequest(status); + + INFO_PRINTF1(_L("Starting non-native application")); + CApaCommandLine* cmd=CApaCommandLine::NewLC(); + cmd->SetExecutableNameL(KNonNotiveAppName); + aLs.StartApp(*cmd); + CleanupStack::PopAndDestroy(cmd); + User::After(2000000); + + //Once the non-native runtime executes, the property value is set to 1. + TInt value; + property.Get(value); + INFO_PRINTF2(_L("Property value: %d"), value); + TEST(value == 1); + + INFO_PRINTF1(_L("Restoring the scr.db")); + User::After(2000000); + fs.DeleteFileL(KScrDBTarget); + fs.CopyFileL(KScrDBTempTarget, KScrDBTarget); + fs.DeleteFileL(KScrDBTempTarget); + + CleanupStack::PopAndDestroy(2, &property); + INFO_PRINTF1(_L("TestNonNativeAppLaunchWithUnavailableMapping test ended...........")); + } + + + +void CT_NonNativeTestStep::TestNonNativeUnsupportedAPIs(RTestableApaLsSession &aLs) +{ + INFO_PRINTF1(_L("TestNonNativeUnsupportedAPIs test started...........")); + TUid uid=KNullUid; + TDriveUnit drive; + CApaRegistrationResourceFileWriter* regFileWriter=NULL; + CApaLocalisableResourceFileWriter* locFileWriter=NULL; + RFile *file=NULL; + TPtrC fileName; + + TRAPD(err, aLs.RegisterNonNativeApplicationTypeL(uid, fileName)); + TEST(err == KErrNotSupported); + + TRAP(err, aLs.DeregisterNonNativeApplicationTypeL(uid)); + TEST(err == KErrNotSupported); + + TRAP(err, aLs.PrepareNonNativeApplicationsUpdatesL()); + TEST(err == KErrNotSupported); + + TRAP(err, aLs.RegisterNonNativeApplicationL(uid, drive, *regFileWriter, locFileWriter, file)); + TEST(err == KErrNotSupported); + + TRAP(err, aLs.DeregisterNonNativeApplicationL(uid)); + TEST(err == KErrNotSupported); + + TRAP(err, aLs.CommitNonNativeApplicationsUpdatesL()); + TEST(err == KErrNotSupported); + + TRAP(err, aLs.ForceCommitNonNativeApplicationsUpdatesL()); + TEST(err == KErrNotSupported); + + TEST(aLs.RollbackNonNativeApplicationsUpdates() == KErrNotSupported); + + INFO_PRINTF1(_L("TestNonNativeUnsupportedAPIs test ended...........")); +} + + +void CT_NonNativeTestStep::TestGetAppTypeL(RTestableApaLsSession &aLs) + { + INFO_PRINTF1(_L("TestGetAppTypeL test started...........")); + + RSmlTestUtils fs; + User::LeaveIfError(fs.Connect()); + CleanupClosePushL(fs); + User::After(2000000); //Wait for 2 secconds till SCR server closed. + + INFO_PRINTF1(_L("Delete existing scr.db")); + //Copy the existing SCR db to temp file and delete it + fs.CopyFileL(KScrDBTarget, KScrDBTempTarget); + fs.DeleteFileL(KScrDBTarget); + + INFO_PRINTF1(_L("Copying scr_test.db")); + //Copy the scr_test.db which has non-native application information and + //non-native type to its runtime. + fs.CopyFileL(KTestScrDBSource, KScrDBTarget); + fs.ChangeFilePermissionL(KScrDBTarget); + + INFO_PRINTF1(_L("Updating applist with a non-native application exists in scr_test.db")); + TApaAppUpdateInfo appUpdateInfo; + RArray updateAppArray; + CleanupClosePushL(updateAppArray); + + appUpdateInfo.iAppUid=TUid::Uid(0x100048F3); //Test non-native app + appUpdateInfo.iAction= TApaAppUpdateInfo::EAppPresent; + updateAppArray.AppendL(appUpdateInfo); + + appUpdateInfo.iAppUid=TUid::Uid(0x10201D0E); //Test java app + appUpdateInfo.iAction= TApaAppUpdateInfo::EAppPresent; + updateAppArray.AppendL(appUpdateInfo); + + appUpdateInfo.iAppUid=TUid::Uid(0x10286B0D); //Test widget app + appUpdateInfo.iAction= TApaAppUpdateInfo::EAppPresent; + updateAppArray.AppendL(appUpdateInfo); + + TRequestStatus status; + aLs.SetNotify(EFalse, status); + aLs.UpdateAppListL(updateAppArray); + CleanupStack::PopAndDestroy(&updateAppArray); + User::WaitForRequest(status); + + INFO_PRINTF1(_L("Test GetAppType returns valid uids")); + TUid appTypeID; + User::LeaveIfError(aLs.GetAppType(appTypeID, TUid::Uid(0x10201D0E))); //Java app + TEST(appTypeID == KMidletUid); + + User::LeaveIfError(aLs.GetAppType(appTypeID, TUid::Uid(0x100048F3))); //Test non-native app + TEST(appTypeID == KTestNonNativeUid); + + User::LeaveIfError(aLs.GetAppType(appTypeID, TUid::Uid(0x10286B0D))); //widget app + TEST(appTypeID == KWidgetUid); + + + INFO_PRINTF1(_L("Restoring the scr.db")); + User::After(2000000); + fs.DeleteFileL(KScrDBTarget); + fs.CopyFileL(KScrDBTempTarget, KScrDBTarget); + fs.DeleteFileL(KScrDBTempTarget); + + CleanupStack::PopAndDestroy(&fs); + INFO_PRINTF1(_L("TestGetAppTypeL test ended...........")); + } + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_nonnativetest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_nonnativetest.h Fri May 14 16:01:13 2010 +0300 @@ -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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#if (!defined __T_NONNATIVETEST_H__) +#define __T_NONNATIVETEST_H__ + + +#include + +class RTestableApaLsSession; + + +/*Tests non-native application launching functionality */ + +class CT_NonNativeTestStep : public CTestStep + { +public: + CT_NonNativeTestStep(); + ~CT_NonNativeTestStep(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); + virtual TVerdict doTestStepL(); + +private: + void RunTestCases(); + void TestNonNativeAppLaunchWithUnavailableMappingL(RTestableApaLsSession &aLs); + void TestNonNativeUnsupportedAPIs(RTestableApaLsSession &aLs); + void TestGetAppTypeL(RTestableApaLsSession &aLs); + }; + +_LIT(KT_NonNativeTestStep,"T_NonNativeTest"); + +#endif diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_servicebasestep.cpp --- a/appfw/apparchitecture/tef/t_servicebasestep.cpp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/t_servicebasestep.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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" @@ -25,6 +25,10 @@ #include "appfwk_test.h" #include "testableapalssession.h" #include "../tef/TNonNative/TNNApp1.h" +#include "T_SisFileInstaller.h" + +_LIT(KTNNA1AppSisFile, "z:\\apparctest\\apparctestsisfiles\\TNNApp1.sis"); +_LIT(KTNNA1AppComponent, "TNNApp1"); TInt PanicTest(TAny* aOption); @@ -463,12 +467,19 @@ TVerdict CT_ServiceBaseStep::doTestStepPreambleL() { + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTNNA1AppSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTNNA1AppSisFile); + SetTestStepResult(EPass); return TestStepResult(); } TVerdict CT_ServiceBaseStep::doTestStepPostambleL() { + CSisFileInstaller sisFileInstaller; + sisFileInstaller.UninstallSisL(KTNNA1AppComponent); + return TestStepResult(); } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_sisfileinstaller.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_sisfileinstaller.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,199 @@ +// 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: +// The following test case is used to test if apparctestserver +// can return app data for a specific app by caching that data when requested. +// +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include +#include "T_SisFileInstaller.h" +#include +#include + +using namespace Usif; + +CSisFileInstaller::CSisFileInstaller() + { + } + +CSisFileInstaller::~CSisFileInstaller() + { + iSif.Close(); + } + +TInt CSisFileInstaller::InstallSisAndWaitForAppListUpdateL(const TDesC& aFileName) +{ + RApaLsSession ls; + User::LeaveIfError(ls.Connect()); + CleanupClosePushL(ls); + TRequestStatus status; + ls.SetNotify(EFalse, status); + InstallSisL(aFileName); + User::WaitForRequest(status); + CleanupStack::PopAndDestroy(); + return KErrNone; +} + +TInt CSisFileInstaller::UninstallSisAndWaitForAppListUpdateL(const TDesC& aComponentName) +{ + RApaLsSession ls; + User::LeaveIfError(ls.Connect()); + CleanupClosePushL(ls); + TRequestStatus status; + ls.SetNotify(EFalse, status); + UninstallSisL(aComponentName); + User::WaitForRequest(status); + CleanupStack::PopAndDestroy(); + return KErrNone; +} + +TInt CSisFileInstaller::InstallSisL(const TDesC& aFileName) + { + TBuf<256> buf; + buf.Copy(aFileName); + HBufC* as = buf.AllocL(); + TPtr16 sisFileName = as->Des(); + CleanupStack::PushL(as); + + RFs fs; + RFile file; + User::LeaveIfError(fs.Connect()); + fs.ShareProtected(); + CleanupClosePushL(fs); + User::LeaveIfError(file.Open(fs, sisFileName, EFileRead | EFileShareReadersOnly)); + CleanupClosePushL(file); + User::LeaveIfError(iSif.Connect()); + CleanupClosePushL(iSif); + TInt err=KErrNone; + do + { + iSif.Install(aFileName, iStatus, ETrue); + User::WaitForRequest(iStatus); + err=iStatus.Int(); + } + while( err == KErrScrReadOperationInProgress); + + User::LeaveIfError(err); + + CleanupStack::PopAndDestroy(4, as); + return KErrNone; + } + + +TInt CSisFileInstaller::UninstallSisL(const TDesC& aComponentName) + { + _LIT(KSisComponentVendor, "Nokia India Pvt Ltd"); + + RFs fs; + RFile file; + User::LeaveIfError(fs.Connect()); + fs.ShareProtected(); + CleanupClosePushL(fs); + + User::LeaveIfError(iSif.Connect()); + CleanupClosePushL(iSif); + + TBuf<256> buf; + buf.Copy(aComponentName); + HBufC* as1 = buf.AllocL(); + TPtr16 componentName = as1->Des(); + HBufC* as2 = KSisComponentVendor().AllocL(); + TPtr16 componentVendor = as2->Des(); + iComponentId = FindComponentInScrL(componentName, componentVendor); + + TInt err=KErrNone; + do + { + iSif.Uninstall(iComponentId, iStatus, ETrue); + User::WaitForRequest(iStatus); + err=iStatus.Int(); + } + while( err == KErrScrReadOperationInProgress); + + //Leave if sis file uninstllation failed. + User::LeaveIfError(err); + + delete as1; + delete as2; + as1 = NULL; + as2 = NULL; + CleanupStack::PopAndDestroy(2, &fs); + return KErrNone; + } + + +void CSisFileInstaller::CancelInstallation() + { + iSif.CancelOperation(); + } + +void CSisFileInstaller::Close() + { + iSif.Close(); + } + +TInt CSisFileInstaller::InstallSisAsynchronouslyL(const TDesC& aFileName, TRequestStatus& status) +{ + TBuf<256> buf; + buf.Copy(aFileName); + HBufC* as = buf.AllocL(); + TPtr16 sisFileName = as->Des(); + CleanupStack::PushL(as); + + RFs fs; + RFile file; + User::LeaveIfError(fs.Connect()); + fs.ShareProtected(); + CleanupClosePushL(fs); + User::LeaveIfError(file.Open(fs, sisFileName, EFileRead | EFileShareReadersOnly)); + CleanupClosePushL(file); + CleanupStack::PopAndDestroy(3, as); + + User::LeaveIfError(iSif.Connect()); + + iSif.Install(aFileName, status, ETrue); + return KErrNone; +} + +TInt CSisFileInstaller::FindComponentInScrL(const TDesC& aComponentName, const TDesC& aVendor) + { + RSoftwareComponentRegistry scr; + User::LeaveIfError(scr.Connect()); + CleanupClosePushL(scr); + + RSoftwareComponentRegistryView scrView; + CComponentFilter* filter = CComponentFilter::NewLC(); + filter->SetNameL(aComponentName); + filter->SetVendorL(aVendor); + + scrView.OpenViewL(scr, filter); + CleanupClosePushL(scrView); + + CComponentEntry* component = scrView.NextComponentL(); + TInt componentId = 0; + if (component != NULL) + { + componentId = component->ComponentId(); + delete component; + } + + CleanupStack::PopAndDestroy(3, &scr); + return componentId; + } + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_sisfileinstaller.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_sisfileinstaller.h Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,65 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#ifndef __T_SISFILEINSTALLER_H +#define __T_SISFILEINSTALLER_H + +#include "appfwk_test_appui.h" +#include "apparctestserver.h" +#include "testableapalssession.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//! CTestAppSisFile +/*! + This class is used for install and uninstall of sis files +*/ +class CSisFileInstaller: public CBase + { +public: + CSisFileInstaller(); + ~CSisFileInstaller(); + + TInt InstallSisL(const TDesC& aFileName); + TInt InstallSisAndWaitForAppListUpdateL(const TDesC& aFileName); + TInt UninstallSisL(const TDesC& aComponentName); + TInt UninstallSisAndWaitForAppListUpdateL(const TDesC& aComponentName); + TInt FindComponentInScrL(const TDesC& aComponentName, const TDesC& aVendor); + void CancelInstallation(); + TInt InstallSisAsynchronouslyL(const TDesC& aFileName, TRequestStatus& status); + void Close(); +private: + friend class CSifOperationStep; + Usif::RSoftwareInstall iSif; + Usif::TComponentId iComponentId; + TRequestStatus iStatus; + }; + +#endif diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_updateapplist.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_updateapplist.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,159 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Tests UpdateAppList API of RApaLsSession class. +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include +#include "T_UpdateAppList.h" +#include "T_SisFileInstaller.h" + +_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis"); +_LIT(KApparcTestAppComponent, "TApparcTestApp"); + +_LIT(KTestMultipleAppsSisFile, "z:\\apparctest\\apparctestsisfiles\\TestMultipleApps.sis"); +_LIT(KTestMultipleAppsComponent, "TestMultipleApps"); + + +CT_TestUpdateAppListStep::CT_TestUpdateAppListStep() + { + } + +CT_TestUpdateAppListStep::~CT_TestUpdateAppListStep() + { + iApaLsSession.Close(); + delete iScheduler; + } + + +void CT_TestUpdateAppListStep::TestUpdateAppListWithInvalidArgumentsL() + { + TApaAppInfo appInfo; + TUid uid = {0x10003A3F}; + TInt ret = iApaLsSession.GetAppInfo(appInfo,uid); + TEST(ret==KErrNotFound); + + RArray updateAppInfo; + CleanupClosePushL(updateAppInfo); + updateAppInfo.AppendL(TApaAppUpdateInfo(uid, TApaAppUpdateInfo::EAppPresent)); + iApaLsSession.UpdateAppListL(updateAppInfo); + User::After(1000000); + ret = iApaLsSession.GetAppInfo(appInfo,uid); + TEST(ret==KErrNotFound); + + updateAppInfo.Reset(); + updateAppInfo.AppendL(TApaAppUpdateInfo(uid, TApaAppUpdateInfo::EAppNotPresent)); + iApaLsSession.UpdateAppListL(updateAppInfo); + User::After(1000000); + ret = iApaLsSession.GetAppInfo(appInfo,uid); + TEST(ret==KErrNotFound); + + updateAppInfo.Reset(); + updateAppInfo.AppendL(TApaAppUpdateInfo(uid, TApaAppUpdateInfo::EAppInfoChanged)); + iApaLsSession.UpdateAppListL(updateAppInfo); + User::After(3000000); + ret = iApaLsSession.GetAppInfo(appInfo,uid); + TEST(ret==KErrNotFound); + CleanupStack::PopAndDestroy(&updateAppInfo); + } + + +void CT_TestUpdateAppListStep::TestAppInstallAndUninstallationL() + { + TApaAppInfo appInfo; + TUid uid = {0x100048F3}; + TInt ret = iApaLsSession.GetAppInfo(appInfo,uid); + TEST(ret==KErrNotFound); + + //Install app + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile); + TRAPD(err, sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile)); + + ret = iApaLsSession.GetAppInfo(appInfo,uid); + TEST(ret==KErrNone); + + //Uninstall app + TRAP(err, sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KApparcTestAppComponent)); + + ret = iApaLsSession.GetAppInfo(appInfo,uid); + TEST(ret==KErrNotFound); + + } + + +void CT_TestUpdateAppListStep::TestMultipleAppInstallAndUninstallationL() + { + TApaAppInfo appInfo; + TUid uid1 = {0x102032AB}; + TUid uid2 = {0x10208183}; + TUid uid3 = {0x10208184}; + + TInt ret = iApaLsSession.GetAppInfo(appInfo,uid1); + TEST(ret==KErrNotFound); + + ret = iApaLsSession.GetAppInfo(appInfo,uid2); + TEST(ret==KErrNotFound); + + ret = iApaLsSession.GetAppInfo(appInfo,uid3); + TEST(ret==KErrNotFound); + + //Install applications + CSisFileInstaller sisFileInstaller; + INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile); + sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTestMultipleAppsSisFile); + + ret = iApaLsSession.GetAppInfo(appInfo,uid1); + TEST(ret==KErrNone); + + ret = iApaLsSession.GetAppInfo(appInfo,uid2); + TEST(ret==KErrNone); + + //uninstall applications + sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KTestMultipleAppsComponent); + + + ret = iApaLsSession.GetAppInfo(appInfo,uid1); + TEST(ret==KErrNotFound); + + ret = iApaLsSession.GetAppInfo(appInfo,uid2); + TEST(ret==KErrNotFound); + + ret = iApaLsSession.GetAppInfo(appInfo,uid3); + TEST(ret==KErrNotFound); + } + + +TVerdict CT_TestUpdateAppListStep::doTestStepL() + { + INFO_PRINTF1(_L("Test T_UpdateAppList Started")); + + // start an active scheduler + iScheduler=new(ELeave) CActiveScheduler(); + CActiveScheduler::Install(iScheduler); + + // Connect to RApaLsSession + User::LeaveIfError(iApaLsSession.Connect()); + + HEAP_TEST_LS_SESSION(iApaLsSession, 0, DONT_CHECK, TestUpdateAppListWithInvalidArgumentsL(), NO_CLEANUP); + HEAP_TEST_LS_SESSION(iApaLsSession, 0, DONT_CHECK, TestAppInstallAndUninstallationL(), NO_CLEANUP); + HEAP_TEST_LS_SESSION(iApaLsSession, 0, DONT_CHECK, TestMultipleAppInstallAndUninstallationL(), NO_CLEANUP); + + INFO_PRINTF1(_L("Test Finished")); + return TestStepResult(); + } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_updateapplist.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/t_updateapplist.h Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,51 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +#ifndef __T_UPDATEAPPLIST_H +#define __T_UPDATEAPPLIST_H + +#include "appfwk_test_appui.h" +#include "testableapalssession.h" +#include + +_LIT(KT_TestUpdateAppListStep, "T_UpdateAppList"); + +//! CTestUpdateAppListStep +/*! + This class is used to test UpdateAppList api in RApaLsSession +*/ +class CT_TestUpdateAppListStep : public CTestStep + { +public: + CT_TestUpdateAppListStep(); + ~CT_TestUpdateAppListStep(); + void TestUpdateAppListWithInvalidArgumentsL(); + void TestAppInstallAndUninstallationL(); + void TestAppUpgradeL(); + void TestMultipleAppInstallAndUninstallationL(); + void TestPackageUpgradeL(); + void TestInstallInvalidAppL(); + virtual TVerdict doTestStepL(); +private: + RTestableApaLsSession iApaLsSession; + CActiveScheduler* iScheduler; + }; + +#endif diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_winchainChild.mmp --- a/appfw/apparchitecture/tef/t_winchainChild.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/t_winchainChild.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -40,7 +40,7 @@ LIBRARY euser.lib apparc.lib cone.lib eikcore.lib ws32.lib appfwk_test_appui.lib START RESOURCE t_winchainChild_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/t_winchainLaunch.mmp --- a/appfw/apparchitecture/tef/t_winchainLaunch.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/t_winchainLaunch.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -40,7 +40,7 @@ LIBRARY euser.lib apparc.lib cone.lib eikcore.lib ws32.lib appfwk_test_appui.lib START RESOURCE t_winchainLaunch_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tapparctestapp_loc.rss --- a/appfw/apparchitecture/tef/tapparctestapp_loc.rss Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tapparctestapp_loc.rss Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -30,7 +30,7 @@ { caption = "tapparctestapp"; number_of_icons = 1; - icon_file = "z:\\resource\\apps\\svg_icon.svg"; + icon_file = "C:\\resource\\apps\\svg_icon.svg"; } }; } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tctrlpnlapp.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/tctrlpnlapp.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,48 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET TCtrlPnlApp.exe +TARGETTYPE exe +UID 0x100039CE 0x10207f79 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +START RESOURCE TCtrlPnlApp_reg.rss +TARGETPATH /apparctestregfiles +lang sc +END + +SOURCEPATH ../tef +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/app_ctrl.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/app_ctrl.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,34 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"app_CTRL"}, (0x13008ACE), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\app_ctrl.exe"-"!:\sys\bin\app_ctrl.exe" +"\epoc32\data\z\apparctestregfiles\App_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL_reg.rsc" +"\epoc32\data\z\apparctestregfiles\App_CTRL.rsc"-"!:\resource\apps\App_CTRL.rsc" +"\epoc32\data\z\apparctestregfiles\App_ctrl_loc.rsc"-"!:\resource\apps\App_ctrl_loc.rsc" +"\epoc32\data\z\apparctestregfiles\APP_CTRL.MBM"-"!:\resource\apps\APP_CTRL.MBM" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/app_ctrl2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/app_ctrl2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA, RU + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\app_ctrl2.exe"-"!:\sys\bin\app_ctrl2.exe" +"\epoc32\data\z\apparctestregfiles\App_CTRL2_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc" \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/corrupted.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/corrupted.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"Corrupted"}, (0x10004c5f), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\data\z\apparctest\Corrupted_reg.rsc"-"!:\private\10003a3f\import\apps\Corrupted_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/customisedefaulticonapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/customisedefaulticonapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"CustomiseDefaultIconApp"}, (0x10208181), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\CustomiseDefaultIconApp.exe"-"!:\sys\bin\CustomiseDefaultIconApp.exe" +"\epoc32\data\z\apparctestregfiles\CustomiseDefaultIconApp_reg.rsc"-"!:\private\10003a3f\import\apps\CustomiseDefaultIconApp_reg.rsc" +"\epoc32\data\z\apparctestregfiles\CustomiseDefaultIconApp_loc.rsc"-"!:\resource\apps\CustomiseDefaultIconApp_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/endtasktestapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/endtasktestapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"EndTaskTestApp"}, (0x10282B33), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\endtasktestapp.exe"-"!:\sys\bin\endtasktestapp.exe" +"\epoc32\data\z\apparctestregfiles\EndTask_reg.rsc"-"!:\private\10003a3f\import\apps\EndTask_reg.rsc" +"\epoc32\data\z\apparctestregfiles\EndTaskTestApp.rsc"-"!:\resource\apps\EndTaskTestApp.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/forceregapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/forceregapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"ForceRegApp1"}, (0xA0001000), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe" +"\epoc32\data\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc" +"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/forceregapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/forceregapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"ForceRegApp2"}, (0xA0001001), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe" +"\epoc32\data\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc" +"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/forceregmultipleapps.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/forceregmultipleapps.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,35 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"ForceRegMultipleApps"}, (0xA0001001), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe" +"\epoc32\data\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc" +"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI + +"\epoc32\release\armv5\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe" +"\epoc32\data\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc" +"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/m_ctrl_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/m_ctrl_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"m_ctrl_v2"}, (0x13008AEE), 1, 0, 0, TYPE=SA, RU + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\m_ctrl.exe"-"!:\sys\bin\m_ctrl.exe" +"\epoc32\data\z\apparctestregfiles\M_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\M_CTRL_reg.rsc" +"\epoc32\data\z\apparctestregfiles\M_CTRL.rsc"-"!:\resource\apps\M_CTRL.rsc" +"\epoc32\data\z\apparctestregfiles\M_CTRL_loc.rsc"-"!:\resource\apps\M_CTRL_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/openservice1app.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/openservice1app.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"openservice1app"}, (0x10208200), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\openservice1app.exe"-"!:\sys\bin\openservice1app.exe" +"\epoc32\data\z\apparctestregfiles\openservice1a.rsc"-"!:\private\10003a3f\import\apps\openservice1a.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/openservice2app.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/openservice2app.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"openservice2app"}, (0x10208201), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\openservice2app.exe"-"!:\sys\bin\openservice2app.exe" +"\epoc32\data\z\apparctestregfiles\openservice1b.rsc"-"!:\private\10003a3f\import\apps\openservice1b.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/serverapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp"}, (0x10004c56), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\serverapp.exe"-"!:\sys\bin\serverapp.exe" +"\epoc32\data\z\apparctestregfiles\serverapp_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/serverapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp2"}, (0x10004c58), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\serverapp2.exe"-"!:\sys\bin\serverapp2.exe" +"\epoc32\data\z\apparctestregfiles\serverapp2_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp2_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/serverapp3.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp3.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp3"}, (0x10004c57), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\serverapp3.exe"-"!:\sys\bin\serverapp3.exe" +"\epoc32\data\z\apparctestregfiles\serverapp3_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp3_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/serverapp4.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp4.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp4"}, (0x10004c76), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\serverapp4.exe"-"!:\sys\bin\serverapp4.exe" +"\epoc32\data\z\apparctestregfiles\serverapp4_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp4_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/serverapp6.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp6.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp6"}, (0x10004c55), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\serverapp6.exe"-"!:\sys\bin\serverapp6.exe" +"\epoc32\data\z\apparctestregfiles\serverapp6_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp6_reg.rsc" +"\epoc32\data\z\apparctestregfiles\serverapp_loc.rsc"-"!:\resource\apps\serverapp_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/serverapp7.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp7.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp7"}, (0x10004c54), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\serverapp7.exe"-"!:\sys\bin\serverapp7.exe" +"\epoc32\data\z\apparctestregfiles\serverapp7_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp7_reg.rsc" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/simpleapparctestapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/simpleapparctestapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"SimpleApparcTestApp"}, (0x12008ACE), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\simpleapparctestapp.exe"-"!:\sys\bin\simpleapparctestapp.exe" +"\epoc32\data\z\apparctestregfiles\SimpleApparcTestApp_Reg.rsc"-"!:\private\10003a3f\import\apps\SimpleApparcTestApp_Reg.rsc" +"\epoc32\data\z\apparctestregfiles\SimpleApparcTestApp.rsc"-"!:\resource\apps\SimpleApparcTestApp.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_DataPrioritySystem1"}, (0x10207f7b), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\t_dataprioritysystem1.exe"-"!:\sys\bin\t_dataprioritysystem1.exe" +"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem1_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem1_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem1_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem1_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_DataPrioritySystem2"}, (0x10207f7c), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\t_dataprioritysystem2.exe"-"!:\sys\bin\t_dataprioritysystem2.exe" +"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem2_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem2_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem2_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem2_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem3.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem3.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_DataPrioritySystem3"}, (0x10207f7f), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\T_DataPrioritySystem3.exe"-"!:\sys\bin\T_DataPrioritySystem3.exe" +"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem3_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem3_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_envslots.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_envslots.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_EnvSlots"}, (0x102032AB), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe" +"\epoc32\data\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_groupname.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_groupname.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_groupname"}, (0x10208185), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\T_groupname.exe"-"!:\sys\bin\T_groupname.exe" +"\epoc32\data\z\apparctestregfiles\T_groupname_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupname_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_groupname_loc.rsc"-"!:\resource\apps\T_groupname_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_groupname_ver1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_groupname_ver1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_groupname_ver1"}, (0x10208183), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe" +"\epoc32\data\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_groupname_ver2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_groupname_ver2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_groupname_ver2"}, (0x10208184), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe" +"\epoc32\data\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_winchainchild.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_winchainchild.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"t_winchainChild"}, (0X10009e9f), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\t_winchainchild.exe"-"!:\sys\bin\t_winchainchild.exe" +"\epoc32\data\z\apparctestregfiles\t_winchainChild_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainChild_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/t_winchainlaunch.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/t_winchainlaunch.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"t_winchainLaunch"}, (0X10009f9a), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\t_winchainlaunch.exe"-"!:\sys\bin\t_winchainlaunch.exe" +"\epoc32\data\z\apparctestregfiles\t_winchainLaunch_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainLaunch_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tapparctestapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tapparctestapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,34 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TApparcTestApp"}, (0x100048F3), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tapparctestapp.exe"-"!:\sys\bin\tapparctestapp.exe" +"\epoc32\data\z\apparctestregfiles\tapparctestapp_reg.rsc"-"!:\private\10003a3f\import\apps\tapparctestapp_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tapparctestapp.rsc"-"!:\resource\apps\tapparctestapp.rsc" +"\epoc32\data\z\apparctestregfiles\tapparctestapp_loc.rsc"-"!:\resource\apps\tapparctestapp_loc.rsc" +"\epoc32\data\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tappembeddable_embedded.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tappembeddable_embedded.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddable_embedded"}, (0x10004c5B), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tappembeddable_embedded.dll"-"!:\sys\bin\tappembeddable_embedded.dll" +"\epoc32\data\z\apparctestregfiles\tappembeddable_embedded.rsc"-"!:\resource\plugins\tappembeddable_embedded.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tappembeddable_standalone.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tappembeddable_standalone.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddable_standalone"}, (0x10004c48), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tappembeddable.exe"-"!:\sys\bin\tappembeddable.exe" +"\epoc32\data\z\apparctestregfiles\TAppEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddable_reg.rsc" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tappembeddableonly_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tappembeddableonly_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddableOnly_v2"}, (0x10004c5C), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tappembeddableonly.dll"-"!:\sys\bin\tappembeddableonly.dll" +"\epoc32\data\z\apparctestregfiles\TAppEmbeddableOnly_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableOnly_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tappembeddableonly.rsc"-"!:\resource\plugins\tappembeddableonly.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuinotstandalone_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuinotstandalone_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddableUiNotStandAlone_v2"}, (0x10004c5E), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tappembeddableuinotstandalone.dll"-"!:\sys\bin\tappembeddableuinotstandalone.dll" +"\epoc32\data\z\apparctestregfiles\TAppEmbeddableUiNotStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiNotStandAlone_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tappembeddableuinotstandalone.rsc"-"!:\resource\plugins\tappembeddableuinotstandalone.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuiorstandalone_embedded.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuiorstandalone_embedded.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddableUiOrStandAlone_embedded"}, (0x10004c5D), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tappembeddableuiorstandalone_embedded.dll"-"!:\sys\bin\tappembeddableuiorstandalone_embedded.dll" +"\epoc32\data\z\apparctestregfiles\tappembeddableuiorstandalone_embedded.rsc"-"!:\resource\plugins\tappembeddableuiorstandalone_embedded.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuiorstandalone_standalone.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuiorstandalone_standalone.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddableUiOrStandalone_standalone"}, (0x10004c4A), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tappembeddableuiorstandalone.exe"-"!:\sys\bin\tappembeddableuiorstandalone.exe" +"\epoc32\data\z\apparctestregfiles\TAppEmbeddableUiOrStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiOrStandAlone_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tappinstall.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tappinstall.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppInstall"}, (0x10207f7d), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\testappinstall.exe"-"!:\sys\bin\testappinstall.exe" +"\epoc32\data\z\apparctestregfiles\TestAppInstall_reg.rsc"-"!:\apparctest\TestAppInstall_reg.rsc" \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tappnotembeddable_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tappnotembeddable_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppNotEmbeddable_v2"}, (0x10004c47), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tappnotembeddable.exe"-"!:\sys\bin\tappnotembeddable.exe" +"\epoc32\data\z\apparctestregfiles\TAppNotEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppNotEmbeddable_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tctrlpnlapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tctrlpnlapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TCtrlPnlApp"}, (0x10207f79), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\TCtrlPnlApp.exe"-"!:\sys\bin\TCtrlPnlApp.exe" +"\epoc32\data\z\apparctestregfiles\TCtrlPnlApp_reg.rsc"-"!:\private\10003a3f\import\apps\TCtrlPnlApp_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/testmultipleapps.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/testmultipleapps.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,40 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestMultipleApps"}, (0x102032ab), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe" +"\epoc32\data\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc" + +"\epoc32\release\armv5\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe" +"\epoc32\data\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc" + +"\epoc32\release\armv5\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe" +"\epoc32\data\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc" +"\epoc32\data\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/testmultipleappsdowngrade.pkg Binary file appfw/apparchitecture/tef/testpkg/armv5/testmultipleappsdowngrade.pkg has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/testtrustedpriorityapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/testtrustedpriorityapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestTrustedPriorityApp1"}, (0x10207f8D), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\TestTrustedPriorityApp1.exe"-"!:\sys\bin\TestTrustedPriorityApp1.exe" +"\epoc32\data\z\apparctestregfiles\TestTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp1_reg.rsc" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/testtrustedpriorityapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/testtrustedpriorityapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestTrustedPriorityApp2"}, (0x10207f8F), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\TestTrustedPriorityApp2.exe"-"!:\sys\bin\TestTrustedPriorityApp2.exe" +"\epoc32\data\z\apparctestregfiles\TestTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp2_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/testuntrustedpriorityapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/testuntrustedpriorityapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestUnTrustedPriorityApp1"}, (0x10207f8C), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\TestUnTrustedPriorityApp1.exe"-"!:\sys\bin\TestUnTrustedPriorityApp1.exe" +"\epoc32\data\z\apparctestregfiles\TestUnTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp1_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/testuntrustedpriorityapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/testuntrustedpriorityapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestUnTrustedPriorityApp2"}, (0xA3010010), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\TestUnTrustedPriorityApp2.exe"-"!:\sys\bin\TestUnTrustedPriorityApp2.exe" +"\epoc32\data\z\apparctestregfiles\TestUnTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp2_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/ticoncaptionoverride.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/ticoncaptionoverride.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,40 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"ticoncaptionoverride"}, (0x2001B674), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\ticoncaptionoverride.exe"-"!:\sys\bin\ticoncaptionoverride.exe" +"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_reg.rsc"-"!:\private\10003a3f\import\apps\ticoncaptionoverride_reg.rsc" +"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride.rsc"-"!:\resource\apps\ticoncaptionoverride.rsc" +"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_loc.rsc"-"!:\resource\apps\ticoncaptionoverride_loc.rsc" +"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_loc.r01"-"!:\resource\apps\ticoncaptionoverride_loc.r01" +"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_loc.r02"-"!:\resource\apps\ticoncaptionoverride_loc.r02" +"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_loc.r03"-"!:\resource\apps\ticoncaptionoverride_loc.r03" +"\epoc32\data\z\apparctestregfiles\ticoncapoverride.mbm"-"!:\resource\apps\ticoncapoverride.mbm" +"\epoc32\data\z\apparctestregfiles\ticoncapoverride02.m02"-"!:\resource\apps\ticoncapoverride02.m02" +"\epoc32\data\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tlargestackapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tlargestackapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tlargestackapp"}, (0x10282B28), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tlargestackapp.exe"-"!:\sys\bin\tlargestackapp.exe" +"\epoc32\data\z\apparctestregfiles\tlargestackapp_reg.rsc"-"!:\private\10003a3f\import\apps\tlargestackapp_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tlargestackapp.rsc"-"!:\resource\apps\tlargestackapp.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tnnapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tnnapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TNNApp1"}, (0x10207f92), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tnnapp1.exe"-"!:\sys\bin\tnnapp1.exe" +"\epoc32\data\z\apparctestregfiles\TNNApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp1_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tnnapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tnnapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TNNApp2"}, (0x10207f94), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tnnapp2.exe"-"!:\sys\bin\tnnapp2.exe" +"\epoc32\data\z\apparctestregfiles\TNNApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp2_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tnotifydrivesapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tnotifydrivesapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tnotifydrivesapp"}, (0xA0003376), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tnotifydrivesapp.exe"-"!:\sys\bin\tnotifydrivesapp.exe" +"\epoc32\data\z\apparctestregfiles\tnotifydrivesapp_reg.rsc"-"!:\system\data\tnotifydrivesapp_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tnotifydrivesapp.rsc"-"!:\system\data\tnotifydrivesapp.rsc" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/trapalssessionstartapptestapp_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/trapalssessionstartapptestapp_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TRApaLsSessionStartAppTestApp_v2"}, (0x10004c4f), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\trapalssessionstartapptestapp.exe"-"!:\sys\bin\trapalssessionstartapptestapp.exe" +"\epoc32\data\z\apparctestregfiles\TRApaLsSessionStartAppTestApp_reg.rsc"-"!:\private\10003a3f\import\apps\TRApaLsSessionStartAppTestApp_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tRuleBasedApp1"}, (0X1020D6FC), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\trulebasedapp1.exe"-"!:\sys\bin\trulebasedapp1.exe" +"\epoc32\data\z\apparctestregfiles\tRuleBasedApp1_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp1_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tRuleBasedApp1.rsc"-"!:\resource\apps\tRuleBasedApp1.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tRuleBasedApp2"}, (0X1020D6FD), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\trulebasedapp2.exe"-"!:\sys\bin\trulebasedapp2.exe" +"\epoc32\data\z\apparctestregfiles\tRuleBasedApp2_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp2_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tRuleBasedApp2.rsc"-"!:\resource\apps\tRuleBasedApp2.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp3.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp3.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tRuleBasedApp3"}, (0X1020D6FE), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\trulebasedapp3.exe"-"!:\sys\bin\trulebasedapp3.exe" +"\epoc32\data\z\apparctestregfiles\tRuleBasedApp3_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp3_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tRuleBasedApp3.rsc"-"!:\resource\apps\tRuleBasedApp3.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp4.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp4.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tRuleBasedApp4"}, (0x10210F77), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\trulebasedapp4.exe"-"!:\sys\bin\trulebasedapp4.exe" +"\epoc32\data\z\apparctestregfiles\tRuleBasedApp4_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp4_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tRuleBasedApp4.rsc"-"!:\resource\apps\tRuleBasedApp4.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tstapp_standalone.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tstapp_standalone.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,47 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA, RU + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tstapp.exe"-"!:\sys\bin\tstapp.exe" +"\epoc32\data\z\apparctestregfiles\tstapp_reg.rsc"-"!:\private\10003a3f\import\apps\tstapp_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tstapp_loc.rsc"-"!:\resource\apps\tstapp_loc.rsc" +"\epoc32\data\z\apparctestregfiles\tstapp_loc.r01"-"!:\resource\apps\tstapp_loc.r01" +"\epoc32\data\z\apparctestregfiles\tstapp_loc.r02"-"!:\resource\apps\tstapp_loc.r02" +"\epoc32\data\z\apparctestregfiles\tstapp_loc.r03"-"!:\resource\apps\tstapp_loc.r03" +"\epoc32\data\z\apparctestregfiles\tstapp_loc.r04"-"!:\resource\apps\tstapp_loc.r04" +"\epoc32\data\z\apparctestregfiles\tstapp_loc.r05"-"!:\resource\apps\tstapp_loc.r05" +"\epoc32\data\z\apparctestregfiles\TSTAPP.rsc"-"!:\resource\apps\TSTAPP.rsc" +"\epoc32\data\z\apparctestregfiles\tstapp.mbm"-"!:\resource\apps\tstapp.mbm" +"\epoc32\data\z\apparctestregfiles\tstappview01.m01"-"!:\resource\apps\tstappview01.m01" +"\epoc32\data\z\apparctestregfiles\tstappview02.k"-"!:\resource\apps\tstappview02.k" +"\epoc32\data\z\apparctestregfiles\tstappviewneg.xyz"-"!:\resource\apps\tstappviewneg.xyz" +"\epoc32\data\z\apparctestregfiles\tstappviewneg.mbm"-"!:\resource\apps\tstappviewneg.mbm" +"\epoc32\data\z\apparctestregfiles\tstappview"-"!:\resource\apps\tstappview" +"\epoc32\data\z\apparctestregfiles\tstapp02.m02"-"!:\resource\apps\tstapp02.m02" +"\epoc32\data\z\apparctestregfiles\tstappview01.m02"-"!:\resource\apps\tstappview01.m02" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tstartdocapp_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tstartdocapp_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TStartDocApp_v2"}, (0x10004c4d), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tstartdocapp.exe"-"!:\sys\bin\tstartdocapp.exe" +"\epoc32\data\z\apparctestregfiles\TStartDocApp_reg.rsc"-"!:\private\10003a3f\import\apps\TStartDocApp_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/tupgradeiconapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/tupgradeiconapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tupgradeiconapp"}, (0xA0003195), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\tupgradeiconapp.exe"-"!:\sys\bin\tupgradeiconapp.exe" +"\epoc32\data\z\apparctestregfiles\tupgradeiconapp_reg.rsc"-"!:\private\10003a3f\import\apps\tupgradeiconapp_reg.rsc" +"\epoc32\data\z\apparctestregfiles\tupgradeiconapp.rsc"-"!:\resource\apps\tupgradeiconapp.rsc" +"\epoc32\data\z\apparctestregfiles\tupgradeiconapp.mbm"-"!:\resource\apps\tupgradeiconapp.mbm" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/unproctecteduidapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/unproctecteduidapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"UnProctectedUidApp"}, (0xA0001C5E), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\unproctecteduidapp.exe"-"!:\sys\bin\unproctecteduidapp.exe" +"\epoc32\data\z\apparctestregfiles\UnProctectedUidApp_reg.rsc"-"!:\private\10003a3f\import\apps\UnProctectedUidApp_reg.rsc" +"\epoc32\data\z\apparctestregfiles\UnProctectedUidApp.rsc"-"!:\resource\apps\UnProctectedUidApp.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/armv5/zerosizedicontestapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/armv5/zerosizedicontestapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,34 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"zerosizedicontestapp"}, (0xABCD0000), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\armv5\udeb\zerosizedicontestapp.exe"-"!:\sys\bin\zerosizedicontestapp.exe" +"\epoc32\data\z\apparctest\zerosizedicon_reg.rsc"-"!:\private\10003a3f\import\apps\zerosizedicon_reg.rsc" +"\epoc32\data\z\apparctest\zerosizedicon_loc.rsc"-"!:\resource\apps\zerosizedicon_loc.rsc" +"\epoc32\data\z\apparctestregfiles\zerosizedicon.mbm"-"!:\resource\apps\zerosizedicon.mbm" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/nokia_rndcert_02.der Binary file appfw/apparchitecture/tef/testpkg/nokia_rndcert_02.der has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/nokia_rndcert_02.key --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/nokia_rndcert_02.key Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn +uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO +vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB +AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo +REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss +/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J +s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut +sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/ +pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp +VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ +P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK +1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT +1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x +-----END RSA PRIVATE KEY----- diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/preparesis.fil --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/preparesis.fil Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,54 @@ +# Build WLDCOMP, a strange WINC/Win32 hybrid +# + +!IF "$(PLATFORM)" == "WINSCW" +TOOLNAME=genbackupmeta +SRCDIR=..\genbackupmeta + +!if "$(CFG)" == "REL" +VC_CFG="$(TOOLNAME) - Win32 Release" +CFG=UREL +!else +VC_CFG="$(TOOLNAME) - Win32 Debug" +CFG=UDEB +!endif + +!ENDIF + +FINAL : +!IF "$(PLATFORM)" == "GCCXML" || "$(PLATFORM)" == "TOOLS" + cd + echo ---------------- + echo Do nothing ... + echo ---------------- +!ELSE + cd + echo --------------------------- + echo Building test exes sis files... + echo --------------------------- + + perl preparesis.pl $(PLATFORM) $(CFG) +!ENDIF + +DO_NOTHING: + rem do nothing + +# +# The targets invoked by abld... +# + +MAKMAKE : DO_NOTHING +FREEZE : DO_NOTHING +LIB : DO_NOTHING +RESOURCE : DO_NOTHING +CLEANLIB : DO_NOTHING +MAKEDATA : DO_NOTHING + +RELEASABLES : + echo $(TOOL) + +SAVESPACE : BLD + +BLD : MAKEDATA + +CLEAN : diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/preparesis.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/preparesis.pl Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,109 @@ +# +# 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 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: +# +# ----------------------------------------------------------------------- + +# sis files for +my $platform = lc($ARGV[0]); + +die "EPOCROOT not defined" if !defined ($ENV{EPOCROOT}); +my $makesis = "$ENV{EPOCROOT}epoc32\\tools\\makesis.exe"; +my $signsis = "$ENV{EPOCROOT}epoc32\\tools\\signsis.exe"; +if ( ! -x $makesis || ! -x $signsis ) { + die "$makesis and $signsis are not executable"; +} + +my $sign_cert = "$ENV{EPOCROOT}epoc32\\tools\\Nokia_RnDCert_02.der"; +my $sign_key = "$ENV{EPOCROOT}epoc32\\tools\\Nokia_RnDCert_02.key"; + +if ($platform =~/winscw/i) +{ + my $winscwpkgdir = "winscw"; + my $winscwdir = "winscwsis"; + + # export path for winscw sis files + system("mkdir $winscwdir\\"); + my $target_dir = "$ENV{EPOCROOT}epoc32\\release\\winscw\\udeb\\z\\apparctest\\apparctestsisfiles\\"; + system("mkdir $target_dir\\"); + + # get list of package files for winscw + opendir DIR, $winscwpkgdir; + my @pkgfiles = grep (/\.pkg/, readdir(DIR)); + closedir DIR; + + # create and sign each sis file for winscw + my $target; # needs to be seen by continue + foreach my $entry (@pkgfiles) + { + print "\n"; + $entry =~ s/\.pkg//; # remove .pkg suffix + my $pkg_file = "$winscwpkgdir\\$entry.pkg"; + + $target = "$target_dir\\$entry.sis"; + + my $make_cmd = "$makesis $pkg_file $winscwdir\\$entry-tmp.sis"; + print "$make_cmd\n"; + system($make_cmd); + + my $sign_cmd = "$signsis $winscwdir\\$entry-tmp.sis $winscwdir\\$entry.sis $sign_cert $sign_key"; + print "\n$sign_cmd\n"; + system($sign_cmd); + + my $copy_cmd = "copy /y $winscwdir\\$entry.sis $target"; + print "\n$copy_cmd\n"; + system($copy_cmd); + } +} + +if ($platform =~ /armv5/i) +{ + my $armv5pkgdir = "armv5"; + my $armv5dir = "armv5sis"; + + # export path for armv5 sis files + system("mkdir $armv5dir\\"); + my $target_dir_armv5 = "$ENV{EPOCROOT}epoc32\\data\\Z\\System\\apparctestsisfiles\\"; + system("mkdir $target_dir_armv5\\"); + + # get list of package files for armv5 + opendir DIR, $armv5pkgdir; + my @armv5pkgfiles = grep (/\.pkg/, readdir(DIR)); + closedir DIR; + + # create and sign each sis file for armv5 + my $targetarmv5; # needs to be seen by continue + foreach my $entry1 (@armv5pkgfiles) + { + $entry1 =~ s/\.pkg//; # remove .pkg suffix + my $pkg_file = "$armv5pkgdir\\$entry1.pkg"; + + $targetarmv5 = "$target_dir_armv5\\$entry1.sis"; + + my $make_cmd = "$makesis $pkg_file $armv5dir\\$entry1-tmp.sis"; + print "$make_cmd\n"; + system($make_cmd); + + my $sign_cmd = "$signsis $armv5dir\\$entry1-tmp.sis $armv5dir\\$entry1.sis $sign_cert $sign_key"; + print "\n$sign_cmd\n"; + system($sign_cmd); + + my $copy_cmd = "copy /y $armv5dir\\$entry1.sis $targetarmv5"; + print "\n$copy_cmd\n"; + system($copy_cmd); + } +} + +# ----------------------------------------------------------------------- + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/preparesis_stub.fil --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/preparesis_stub.fil Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,40 @@ +# Build WLDCOMP, a strange WINC/Win32 hybrid +# + +FINAL : +!IF "$(PLATFORM)" == "GCCXML" || "$(PLATFORM)" == "TOOLS" + cd + echo ---------------- + echo Do nothing ... + echo ---------------- +!ELSE + cd + echo --------------------------- + echo Building test exes sis files... + echo --------------------------- + + perl preparesis_stub.pl +!ENDIF + +DO_NOTHING: + rem do nothing + +# +# The targets invoked by abld... +# + +MAKMAKE : DO_NOTHING +FREEZE : DO_NOTHING +LIB : DO_NOTHING +RESOURCE : DO_NOTHING +CLEANLIB : DO_NOTHING +MAKEDATA : DO_NOTHING + +RELEASABLES : + echo $(TOOL) + +SAVESPACE : BLD + +BLD : MAKEDATA + +CLEAN : diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/preparesis_stub.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/preparesis_stub.pl Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,74 @@ +# +# 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 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: +# +# ----------------------------------------------------------------------- + +# sis files for +my $stubpkgdir = "stub_sis"; + +my $stubdir = "stubsis"; + +die "EPOCROOT not defined" if !defined ($ENV{EPOCROOT}); +my $makesis = "$ENV{EPOCROOT}epoc32\\tools\\makesis.exe"; +my $option = "-s"; +my $signsis = "$ENV{EPOCROOT}epoc32\\tools\\signsis.exe"; +if ( ! -x $makesis || ! -x $signsis ) { + die "$makesis and $signsis are not executable"; +} + +my $sign_cert = "$ENV{EPOCROOT}epoc32\\tools\\Nokia_RnDCert_02.der"; +my $sign_key = "$ENV{EPOCROOT}epoc32\\tools\\Nokia_RnDCert_02.key"; + +# export path for stub sis files +system("mkdir $stubdir\\"); +my $target_winscw = "$ENV{EPOCROOT}epoc32\\release\\winscw\\udeb\\z\\system\\install\\"; +my $target_armv5 = "$ENV{EPOCROOT}epoc32\\data\\z\\system\\install\\"; +system("mkdir $target_winscw\\"); +system("mkdir $target_armv5\\"); + +# get list of package files for stub +opendir DIR, $stubpkgdir; +my @pkgfiles = grep (/\.pkg/, readdir(DIR)); +closedir DIR; + +# create each stub sis file +my $target; # needs to be seen by continue +my $target2; +foreach my $entry (@pkgfiles) + { + print "\n"; + $entry =~ s/\.pkg//; # remove .pkg suffix + my $pkg_file = "$stubpkgdir\\$entry.pkg"; + + $target = "$target_winscw\\$entry.sis"; + $target2 = "$target_armv5\\$entry.sis"; + + my $make_cmd = "$makesis $option $pkg_file $stubdir\\$entry.sis"; + print "$make_cmd\n"; + system($make_cmd); + + my $copy_cmd = "copy /y $stubdir\\$entry.sis $target"; + print "\n$copy_cmd\n"; + system($copy_cmd); + + my $copy_cmd = "copy /y $stubdir\\$entry.sis $target2"; + print "\n$copy_cmd\n"; + system($copy_cmd); + } + + + +# ----------------------------------------------------------------------- + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/scr.db Binary file appfw/apparchitecture/tef/testpkg/scr.db has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/stub_sis/app_ctrl2_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/stub_sis/app_ctrl2_stub.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +""-"!:\sys\bin\app_ctrl2.exe" +""-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc" \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/stub_sis/m_ctrl_v2_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/stub_sis/m_ctrl_v2_stub.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"m_ctrl_v2"}, (0x13008AEE), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +""-"!:\sys\bin\m_ctrl.exe" +""-"!:\private\10003a3f\import\apps\M_CTRL_reg.rsc" +""-"!:\resource\apps\M_CTRL.rsc" +""-"!:\resource\apps\M_CTRL_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/stub_sis/tstapp_standalone_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/stub_sis/tstapp_standalone_stub.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,47 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +""-"!:\sys\bin\tstapp.exe" +""-"!:\private\10003a3f\import\apps\tstapp_reg.rsc" +""-"!:\resource\apps\tstapp_loc.rsc" +""-"!:\resource\apps\tstapp_loc.r01" +""-"!:\resource\apps\tstapp_loc.r02" +""-"!:\resource\apps\tstapp_loc.r03" +""-"!:\resource\apps\tstapp_loc.r04" +""-"!:\resource\apps\tstapp_loc.r05" +""-"!:\resource\apps\TSTAPP.rsc" +""-"!:\resource\apps\tstapp.mbm" +""-"!:\resource\apps\tstappview01.m01" +""-"!:\resource\apps\tstappview02.k" +""-"!:\resource\apps\tstappviewneg.xyz" +""-"!:\resource\apps\tstappviewneg.mbm" +""-"!:\resource\apps\tstappview" +""-"!:\resource\apps\tstapp02.m02" +""-"!:\resource\apps\tstappview01.m02" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/swicertstore.dat Binary file appfw/apparchitecture/tef/testpkg/swicertstore.dat has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/app_ctrl.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/app_ctrl.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,34 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"app_CTRL"}, (0x13008ACE), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\app_ctrl.exe"-"!:\sys\bin\app_ctrl.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL.rsc"-"!:\resource\apps\App_CTRL.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_ctrl_loc.rsc"-"!:\resource\apps\App_ctrl_loc.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\APP_CTRL.MBM"-"!:\resource\apps\APP_CTRL.MBM" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/app_ctrl2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/app_ctrl2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA, RU + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\app_ctrl2.exe"-"!:\sys\bin\app_ctrl2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL2_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc" \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/corrupted.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/corrupted.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"Corrupted"}, (0x10004c5f), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\z\apparctest\Corrupted_reg.rsc"-"!:\private\10003a3f\import\apps\Corrupted_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/customisedefaulticonapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/customisedefaulticonapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"CustomiseDefaultIconApp"}, (0x10208181), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\CustomiseDefaultIconApp.exe"-"!:\sys\bin\CustomiseDefaultIconApp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\CustomiseDefaultIconApp_reg.rsc"-"!:\private\10003a3f\import\apps\CustomiseDefaultIconApp_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\CustomiseDefaultIconApp_loc.rsc"-"!:\resource\apps\CustomiseDefaultIconApp_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/endtasktestapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/endtasktestapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"EndTaskTestApp"}, (0x10282B33), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\endtasktestapp.exe"-"!:\sys\bin\endtasktestapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\EndTask_reg.rsc"-"!:\private\10003a3f\import\apps\EndTask_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\EndTaskTestApp.rsc"-"!:\resource\apps\EndTaskTestApp.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/forceregapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/forceregapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"ForceRegApp1"}, (0xA0001000), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc" +"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/forceregapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/forceregapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"ForceRegApp2"}, (0xA0001001), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc" +"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/forceregmultipleapps.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/forceregmultipleapps.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,35 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"ForceRegMultipleApps"}, (0xA0001001), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc" +"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI + +"\epoc32\release\winscw\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc" +"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/m_ctrl_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/m_ctrl_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"m_ctrl_v2"}, (0x13008AEE), 1, 0, 0, TYPE=SA, RU + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\m_ctrl.exe"-"!:\sys\bin\m_ctrl.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\M_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\M_CTRL_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\M_CTRL.rsc"-"!:\resource\apps\M_CTRL.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\M_CTRL_loc.rsc"-"!:\resource\apps\M_CTRL_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/openservice1app.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/openservice1app.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"openservice1app"}, (0x10208200), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\openservice1app.exe"-"!:\sys\bin\openservice1app.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\openservice1a.rsc"-"!:\private\10003a3f\import\apps\openservice1a.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/openservice2app.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/openservice2app.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"openservice2app"}, (0x10208201), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\openservice2app.exe"-"!:\sys\bin\openservice2app.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\openservice1b.rsc"-"!:\private\10003a3f\import\apps\openservice1b.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/parentprocess.sis Binary file appfw/apparchitecture/tef/testpkg/winscw/parentprocess.sis has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/serverapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp"}, (0x10004c56), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\serverapp.exe"-"!:\sys\bin\serverapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/serverapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp2"}, (0x10004c58), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\serverapp2.exe"-"!:\sys\bin\serverapp2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp2_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp2_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/serverapp3.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp3.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp3"}, (0x10004c57), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\serverapp3.exe"-"!:\sys\bin\serverapp3.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp3_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp3_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/serverapp4.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp4.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp4"}, (0x10004c76), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\serverapp4.exe"-"!:\sys\bin\serverapp4.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp4_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp4_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/serverapp6.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp6.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp6"}, (0x10004c55), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\serverapp6.exe"-"!:\sys\bin\serverapp6.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp6_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp6_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp_loc.rsc"-"!:\resource\apps\serverapp_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/serverapp7.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp7.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"serverapp7"}, (0x10004c54), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\serverapp7.exe"-"!:\sys\bin\serverapp7.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp7_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp7_reg.rsc" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/simpleapparctestapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/simpleapparctestapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"SimpleApparcTestApp"}, (0x12008ACE), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\simpleapparctestapp.exe"-"!:\sys\bin\simpleapparctestapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\SimpleApparcTestApp_Reg.rsc"-"!:\private\10003a3f\import\apps\SimpleApparcTestApp_Reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\SimpleApparcTestApp.rsc"-"!:\resource\apps\SimpleApparcTestApp.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_DataPrioritySystem1"}, (0x10207f7b), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\t_dataprioritysystem1.exe"-"!:\sys\bin\t_dataprioritysystem1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem1_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem1_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem1_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem1_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_DataPrioritySystem2"}, (0x10207f7c), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\t_dataprioritysystem2.exe"-"!:\sys\bin\t_dataprioritysystem2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem2_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem2_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem2_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem2_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem3.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem3.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_DataPrioritySystem3"}, (0x10207f7f), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\T_DataPrioritySystem3.exe"-"!:\sys\bin\T_DataPrioritySystem3.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem3_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem3_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_envslots.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_envslots.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_EnvSlots"}, (0x102032AB), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_groupname.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_groupname.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_groupname"}, (0x10208185), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\T_groupname.exe"-"!:\sys\bin\T_groupname.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupname_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupname_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupname_loc.rsc"-"!:\resource\apps\T_groupname_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_groupname_ver1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_groupname_ver1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_groupname_ver1"}, (0x10208183), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_groupname_ver2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_groupname_ver2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"T_groupname_ver2"}, (0x10208184), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_winchainchild.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_winchainchild.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"t_winchainChild"}, (0X10009e9f), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\t_winchainchild.exe"-"!:\sys\bin\t_winchainchild.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\t_winchainChild_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainChild_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/t_winchainlaunch.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/t_winchainlaunch.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"t_winchainLaunch"}, (0X10009f9a), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\t_winchainlaunch.exe"-"!:\sys\bin\t_winchainlaunch.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\t_winchainLaunch_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainLaunch_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tapparctestapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tapparctestapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,34 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TApparcTestApp"}, (0x100048F3), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tapparctestapp.exe"-"!:\sys\bin\tapparctestapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp_reg.rsc"-"!:\private\10003a3f\import\apps\tapparctestapp_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp.rsc"-"!:\resource\apps\tapparctestapp.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp_loc.rsc"-"!:\resource\apps\tapparctestapp_loc.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tappembeddable_embedded.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tappembeddable_embedded.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddable_embedded"}, (0x10004c5B), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tappembeddable_embedded.dll"-"!:\sys\bin\tappembeddable_embedded.dll" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddable_embedded.rsc"-"!:\resource\plugins\tappembeddable_embedded.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tappembeddable_standalone.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tappembeddable_standalone.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddable_standalone"}, (0x10004c48), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tappembeddable.exe"-"!:\sys\bin\tappembeddable.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddable_reg.rsc" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tappembeddableonly_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tappembeddableonly_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddableOnly_v2"}, (0x10004c5C), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tappembeddableonly.dll"-"!:\sys\bin\tappembeddableonly.dll" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableOnly_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableOnly_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableonly.rsc"-"!:\resource\plugins\tappembeddableonly.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuinotstandalone_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuinotstandalone_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddableUiNotStandAlone_v2"}, (0x10004c5E), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tappembeddableuinotstandalone.dll"-"!:\sys\bin\tappembeddableuinotstandalone.dll" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableUiNotStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiNotStandAlone_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableuinotstandalone.rsc"-"!:\resource\plugins\tappembeddableuinotstandalone.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuiorstandalone_embedded.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuiorstandalone_embedded.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddableUiOrStandAlone_embedded"}, (0x10004c5D), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tappembeddableuiorstandalone_embedded.dll"-"!:\sys\bin\tappembeddableuiorstandalone_embedded.dll" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableuiorstandalone_embedded.rsc"-"!:\resource\plugins\tappembeddableuiorstandalone_embedded.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuiorstandalone_standalone.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuiorstandalone_standalone.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppEmbeddableUiOrStandalone_standalone"}, (0x10004c4A), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tappembeddableuiorstandalone.exe"-"!:\sys\bin\tappembeddableuiorstandalone.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableUiOrStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiOrStandAlone_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tappinstall.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tappinstall.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppInstall"}, (0x10207f7d), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\testappinstall.exe"-"!:\sys\bin\testappinstall.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestAppInstall_reg.rsc"-"!:\apparctest\TestAppInstall_reg.rsc" \ No newline at end of file diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tappnotembeddable_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tappnotembeddable_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TAppNotEmbeddable_v2"}, (0x10004c47), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tappnotembeddable.exe"-"!:\sys\bin\tappnotembeddable.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppNotEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppNotEmbeddable_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tctrlpnlapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tctrlpnlapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TCtrlPnlApp"}, (0x10207f79), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\TCtrlPnlApp.exe"-"!:\sys\bin\TCtrlPnlApp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TCtrlPnlApp_reg.rsc"-"!:\private\10003a3f\import\apps\TCtrlPnlApp_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/testmultipleapps.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/testmultipleapps.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,40 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestMultipleApps"}, (0x102032ab), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc" + +"\epoc32\release\winscw\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc" + +"\epoc32\release\winscw\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/testmultipleappsdowngrade.pkg Binary file appfw/apparchitecture/tef/testpkg/winscw/testmultipleappsdowngrade.pkg has changed diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/testtrustedpriorityapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/testtrustedpriorityapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestTrustedPriorityApp1"}, (0x10207f8D), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\TestTrustedPriorityApp1.exe"-"!:\sys\bin\TestTrustedPriorityApp1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp1_reg.rsc" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/testtrustedpriorityapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/testtrustedpriorityapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestTrustedPriorityApp2"}, (0x10207f8F), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\TestTrustedPriorityApp2.exe"-"!:\sys\bin\TestTrustedPriorityApp2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp2_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/testuntrustedpriorityapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/testuntrustedpriorityapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestUnTrustedPriorityApp1"}, (0x10207f8C), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\TestUnTrustedPriorityApp1.exe"-"!:\sys\bin\TestUnTrustedPriorityApp1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestUnTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp1_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/testuntrustedpriorityapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/testuntrustedpriorityapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TestUnTrustedPriorityApp2"}, (0xA3010010), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\TestUnTrustedPriorityApp2.exe"-"!:\sys\bin\TestUnTrustedPriorityApp2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestUnTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp2_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/ticoncaptionoverride.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/ticoncaptionoverride.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,40 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"ticoncaptionoverride"}, (0x2001B674), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\ticoncaptionoverride.exe"-"!:\sys\bin\ticoncaptionoverride.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_reg.rsc"-"!:\private\10003a3f\import\apps\ticoncaptionoverride_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride.rsc"-"!:\resource\apps\ticoncaptionoverride.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_loc.rsc"-"!:\resource\apps\ticoncaptionoverride_loc.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_loc.r01"-"!:\resource\apps\ticoncaptionoverride_loc.r01" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_loc.r02"-"!:\resource\apps\ticoncaptionoverride_loc.r02" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_loc.r03"-"!:\resource\apps\ticoncaptionoverride_loc.r03" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncapoverride.mbm"-"!:\resource\apps\ticoncapoverride.mbm" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncapoverride02.m02"-"!:\resource\apps\ticoncapoverride02.m02" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tlargestackapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tlargestackapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tlargestackapp"}, (0x10282B28), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tlargestackapp.exe"-"!:\sys\bin\tlargestackapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tlargestackapp_reg.rsc"-"!:\private\10003a3f\import\apps\tlargestackapp_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tlargestackapp.rsc"-"!:\resource\apps\tlargestackapp.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tnnapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tnnapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TNNApp1"}, (0x10207f92), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tnnapp1.exe"-"!:\sys\bin\tnnapp1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TNNApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp1_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tnnapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tnnapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TNNApp2"}, (0x10207f94), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tnnapp2.exe"-"!:\sys\bin\tnnapp2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TNNApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp2_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tnotifydrivesapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tnotifydrivesapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tnotifydrivesapp"}, (0xA0003376), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tnotifydrivesapp.exe"-"!:\sys\bin\tnotifydrivesapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tnotifydrivesapp_reg.rsc"-"!:\system\data\tnotifydrivesapp_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tnotifydrivesapp.rsc"-"!:\system\data\tnotifydrivesapp.rsc" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/trapalssessionstartapptestapp_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/trapalssessionstartapptestapp_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TRApaLsSessionStartAppTestApp_v2"}, (0x10004c4f), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\trapalssessionstartapptestapp.exe"-"!:\sys\bin\trapalssessionstartapptestapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TRApaLsSessionStartAppTestApp_reg.rsc"-"!:\private\10003a3f\import\apps\TRApaLsSessionStartAppTestApp_reg.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp1.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tRuleBasedApp1"}, (0X1020D6FC), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\trulebasedapp1.exe"-"!:\sys\bin\trulebasedapp1.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp1_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp1_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp1.rsc"-"!:\resource\apps\tRuleBasedApp1.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tRuleBasedApp2"}, (0X1020D6FD), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\trulebasedapp2.exe"-"!:\sys\bin\trulebasedapp2.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp2_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp2_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp2.rsc"-"!:\resource\apps\tRuleBasedApp2.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp3.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp3.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tRuleBasedApp3"}, (0X1020D6FE), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\trulebasedapp3.exe"-"!:\sys\bin\trulebasedapp3.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp3_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp3_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp3.rsc"-"!:\resource\apps\tRuleBasedApp3.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp4.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp4.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tRuleBasedApp4"}, (0x10210F77), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\trulebasedapp4.exe"-"!:\sys\bin\trulebasedapp4.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp4_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp4_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp4.rsc"-"!:\resource\apps\tRuleBasedApp4.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tstapp_standalone.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tstapp_standalone.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,47 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA, RU + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tstapp.exe"-"!:\sys\bin\tstapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_reg.rsc"-"!:\private\10003a3f\import\apps\tstapp_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.rsc"-"!:\resource\apps\tstapp_loc.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r01"-"!:\resource\apps\tstapp_loc.r01" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r02"-"!:\resource\apps\tstapp_loc.r02" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r03"-"!:\resource\apps\tstapp_loc.r03" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r04"-"!:\resource\apps\tstapp_loc.r04" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r05"-"!:\resource\apps\tstapp_loc.r05" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TSTAPP.rsc"-"!:\resource\apps\TSTAPP.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp.mbm"-"!:\resource\apps\tstapp.mbm" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview01.m01"-"!:\resource\apps\tstappview01.m01" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview02.k"-"!:\resource\apps\tstappview02.k" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappviewneg.xyz"-"!:\resource\apps\tstappviewneg.xyz" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappviewneg.mbm"-"!:\resource\apps\tstappviewneg.mbm" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview"-"!:\resource\apps\tstappview" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp02.m02"-"!:\resource\apps\tstapp02.m02" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview01.m02"-"!:\resource\apps\tstappview01.m02" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tstartdocapp_v2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tstartdocapp_v2.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"TStartDocApp_v2"}, (0x10004c4d), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tstartdocapp.exe"-"!:\sys\bin\tstartdocapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\TStartDocApp_reg.rsc"-"!:\private\10003a3f\import\apps\TStartDocApp_reg.rsc" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/tupgradeiconapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/tupgradeiconapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"tupgradeiconapp"}, (0xA0003195), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\tupgradeiconapp.exe"-"!:\sys\bin\tupgradeiconapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tupgradeiconapp_reg.rsc"-"!:\private\10003a3f\import\apps\tupgradeiconapp_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tupgradeiconapp.rsc"-"!:\resource\apps\tupgradeiconapp.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\tupgradeiconapp.mbm"-"!:\resource\apps\tupgradeiconapp.mbm" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/unproctecteduidapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/unproctecteduidapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"UnProctectedUidApp"}, (0xA0001C5E), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\unproctecteduidapp.exe"-"!:\sys\bin\unproctecteduidapp.exe" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\UnProctectedUidApp_reg.rsc"-"!:\private\10003a3f\import\apps\UnProctectedUidApp_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\UnProctectedUidApp.rsc"-"!:\resource\apps\UnProctectedUidApp.rsc" + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testpkg/winscw/zerosizedicontestapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testpkg/winscw/zerosizedicontestapp.pkg Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,34 @@ +; +; 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 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: +; + + +;Languages +&EN + +;Header +; SA = Symbian Application +; RU = Rom Upgrade +#{"zerosizedicontestapp"}, (0xABCD0000), 1, 0, 0, TYPE=SA + +%{"Nokia India Pvt Ltd"} +:"Nokia India Pvt Ltd" + +"\epoc32\release\winscw\udeb\zerosizedicontestapp.exe"-"!:\sys\bin\zerosizedicontestapp.exe" +"\epoc32\release\winscw\udeb\z\apparctest\zerosizedicon_reg.rsc"-"!:\private\10003a3f\import\apps\zerosizedicon_reg.rsc" +"\epoc32\release\winscw\udeb\z\apparctest\zerosizedicon_loc.rsc"-"!:\resource\apps\zerosizedicon_loc.rsc" +"\epoc32\release\winscw\udeb\z\apparctestregfiles\zerosizedicon.mbm"-"!:\resource\apps\zerosizedicon.mbm" + + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testtrustedpriorityapp1.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testtrustedpriorityapp1.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,51 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET TestTrustedPriorityApp1.exe +TARGETTYPE exe +UID 0x100039CE 0x10207f8D +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application exe registration resource file +resource TestTrustedPriorityApp1_reg.rss +start resource TestTrustedPriorityApp1_reg.rss +targetpath /apparctestregfiles +lang sc +end + +SOURCEPATH ../tef +// SOURCE T_RApaLsSessionStep.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testtrustedpriorityapp2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testtrustedpriorityapp2.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,51 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET TestTrustedPriorityApp2.exe +TARGETTYPE exe +UID 0x100039CE 0x10207f8F +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application exe registration resource file +resource TestTrustedPriorityApp2_reg.rss +start resource TestTrustedPriorityApp2_reg.rss +targetpath /apparctestregfiles +lang sc +end + +SOURCEPATH ../tef +// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testuntrustedpriorityapp1.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testuntrustedpriorityapp1.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,51 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET TestUnTrustedPriorityApp1.exe +TARGETTYPE exe +UID 0x100039CE 0x10207f8C +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application exe registration resource file +resource TestUnTrustedPriorityApp1_reg.rss +start resource TestUnTrustedPriorityApp1_reg.rss +targetpath /apparctestregfiles +lang sc +end + +SOURCEPATH ../tef +// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/testuntrustedpriorityapp2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/testuntrustedpriorityapp2.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,51 @@ +// 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" +// which accompanies 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 - Internal Symbian test code +*/ + +TARGET TestUnTrustedPriorityApp2.exe +TARGETTYPE exe +UID 0x100039CE 0xA3010010 +VENDORID 0x70000001 + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview + +// Application exe registration resource file +resource TestUnTrustedPriorityApp2_reg.rss +start resource TestUnTrustedPriorityApp2_reg.rss +targetpath /apparctestregfiles +lang sc +end + +SOURCEPATH ../tef +// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp +SOURCE app_CTRL.CPP + +LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib +LIBRARY testexecuteutils.lib testexecutelogclient.lib +LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib +LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib +LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib +LIBRARY aplist.lib +LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/ticoncaptionoverride.mmp --- a/appfw/apparchitecture/tef/ticoncaptionoverride.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/ticoncaptionoverride.mmp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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,27 +38,27 @@ //reg added for Datacaging START RESOURCE ticoncaptionoverride_reg.rss -TARGETPATH /private/10003a3f/import/apps +TARGETPATH /apparctestregfiles END START RESOURCE ticoncaptionoverride.rss -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles END START RESOURCE ticoncaptionoverride_loc.rss -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles LANG SC 01 02 03 END START BITMAP ticoncapoverride.mbm -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles SOURCEPATH ../tdatasrc SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp SOURCE c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp END START BITMAP ticoncapoverride02.m02 -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles SOURCEPATH ../tdatasrc SOURCE c8,1 def25.bmp def25m.bmp def25.bmp def25m.bmp def50.bmp def50m.bmp END diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/ticoncaptionoverride01.rls --- a/appfw/apparchitecture/tef/ticoncaptionoverride01.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/ticoncaptionoverride01.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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" @@ -22,4 +22,4 @@ rls_string STRING_r_ticoncapoverride_caption_string "TstCap UK" rls_string STRING_r_ticoncapoverride_short_caption_string "TC UK" -rls_string STRING_r_ticoncapoverride_icon_file "z:\\resource\\apps\\ticoncapoverride.mbm" +rls_string STRING_r_ticoncapoverride_icon_file "\\resource\\apps\\ticoncapoverride.mbm" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/ticoncaptionoverride02.rls --- a/appfw/apparchitecture/tef/ticoncaptionoverride02.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/ticoncaptionoverride02.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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" @@ -22,4 +22,4 @@ rls_string STRING_r_ticoncapoverride_caption_string "TstCap FR" rls_string STRING_r_ticoncapoverride_short_caption_string "TC FR" -rls_string STRING_r_ticoncapoverride_icon_file "z:\\resource\\apps\\ticoncapoverride02.m02" +rls_string STRING_r_ticoncapoverride_icon_file "\\resource\\apps\\ticoncapoverride02.m02" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/ticoncaptionoverride03.rls --- a/appfw/apparchitecture/tef/ticoncaptionoverride03.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/ticoncaptionoverride03.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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" @@ -22,4 +22,4 @@ rls_string STRING_r_ticoncapoverride_caption_string "TstCap GE" rls_string STRING_r_ticoncapoverride_short_caption_string "TC GE" -rls_string STRING_r_ticoncapoverride_icon_file "z:\\resource\\apps\\ticoncapoverride.mbm" +rls_string STRING_r_ticoncapoverride_icon_file "\\resource\\apps\\ticoncapoverride.mbm" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/ticoncaptionoverridesc.rls --- a/appfw/apparchitecture/tef/ticoncaptionoverridesc.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/ticoncaptionoverridesc.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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" @@ -23,4 +23,4 @@ rls_string STRING_r_ticoncapoverride_caption_string "TstCap UK" rls_string STRING_r_ticoncapoverride_short_caption_string "TC UK" -rls_string STRING_r_ticoncapoverride_icon_file "z:\\resource\\apps\\ticoncapoverride.mbm" +rls_string STRING_r_ticoncapoverride_icon_file "\\resource\\apps\\ticoncapoverride.mbm" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tlargestack/tlargestackapp.mmp --- a/appfw/apparchitecture/tef/tlargestack/tlargestackapp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tlargestack/tlargestackapp.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -37,11 +37,11 @@ START RESOURCE tlargestackapp.rss HEADER -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles end START RESOURCE tlargestackapp_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime.cpp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,37 @@ +// 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: +// + +/** + @file + @internalComponent - Internal Symbian test code +*/ + +#include +#include "../t_nonnativetest.h" +#include +#include + +const TUid KPropertyCategory = {0x101F289C}; +const TUint KNonNativeTestPropertyKey = 2; + +TInt E32Main() + { + RProperty forceRegStatus; + User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KNonNativeTestPropertyKey, EOwnerThread)); + + forceRegStatus.Set(1); + forceRegStatus.Close(); + return(KErrNone); + } diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,44 @@ +// 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: +// using relative paths for sourcepath and user includes +// +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + +TARGET tnonnativeruntime.exe +TARGETTYPE exe +UID 0x100039CE 0xA0001002 +VENDORID 0x70000001 + +SOURCEPATH . +SOURCE tnonnativeruntime.cpp + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN + + +START RESOURCE tnonnativeruntime_reg.rss +TARGETPATH /private/10003a3f/import/apps +END + +LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime_reg.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime_reg.rss Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,31 @@ +// 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: +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + +#include + +UID2 KUidAppRegistrationResourceFile +UID3 0xA0001002 // application UID + +RESOURCE APP_REGISTRATION_INFO + { + app_file = "tnonnativeruntime"; + } + diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tnotifydrivesapp/tnotifydrivesapp.mmp --- a/appfw/apparchitecture/tef/tnotifydrivesapp/tnotifydrivesapp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tnotifydrivesapp/tnotifydrivesapp.mmp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -38,13 +38,13 @@ SOURCEPATH . RESOURCE tnotifydrivesapp.rss START RESOURCE tnotifydrivesapp.rss -TARGETPATH /system/data +TARGETPATH /apparctestregfiles LANG SC END SOURCEPATH . START RESOURCE tnotifydrivesapp_reg.rss -TARGETPATH /system/data +TARGETPATH /apparctestregfiles END LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tstapp01.rls --- a/appfw/apparchitecture/tef/tstapp01.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tstapp01.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -26,9 +26,9 @@ rls_string STRING_r_tstapp_view1_caption "V1 UK" rls_string STRING_r_tstapp_view2_caption "V2 UK" -rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstappview01.m01" -rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstappview02.k" -rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.xyz" +rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstappview01.m01" +rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstappview02.k" +rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.xyz" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tstapp02.rls --- a/appfw/apparchitecture/tef/tstapp02.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tstapp02.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -26,9 +26,9 @@ rls_string STRING_r_tstapp_view1_caption "V1 FR" rls_string STRING_r_tstapp_view2_caption "V2 FR" -rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp02.m02" -rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstappview01.m02" -rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstappview" -rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.mbm" +rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp02.m02" +rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstappview01.m02" +rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstappview" +rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.mbm" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tstapp03.rls --- a/appfw/apparchitecture/tef/tstapp03.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tstapp03.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -26,9 +26,9 @@ rls_string STRING_r_tstapp_view1_caption "V1 GE" rls_string STRING_r_tstapp_view2_caption "V2 GE" -rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.xyz" +rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.xyz" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tstapp04.rls --- a/appfw/apparchitecture/tef/tstapp04.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tstapp04.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -26,9 +26,9 @@ rls_string STRING_r_tstapp_view1_caption "V1 SP" rls_string STRING_r_tstapp_view2_caption "V2 SP" -rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.xyz" +rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.xyz" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tstapp05.rls --- a/appfw/apparchitecture/tef/tstapp05.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tstapp05.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -26,9 +26,9 @@ rls_string STRING_r_tstapp_view1_caption "V1 IT" rls_string STRING_r_tstapp_view2_caption "V2 IT" -rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.xyz" +rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.xyz" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tstapp_standalone_stub.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/appfw/apparchitecture/tef/tstapp_standalone_stub.mmp Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,104 @@ +// 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: +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + + + + TARGET tstapp.exe + TARGETTYPE exe + TARGETPATH /sys/bin + +CAPABILITY All -Tcb + +UID 0x100039CE 10 //the original UID +VENDORID 0x70000001 +EPOCSTACKSIZE 0x5000 + +SOURCEPATH . +SOURCE TSTAPP_standalone.CPP + +USERINCLUDE . + +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/techview +//systeminclude /epoc32/include/ecom + + +//reg added for Datacaging +START RESOURCE tstapp_reg.rss +TARGETPATH /private/10003a3f/import/apps +END + +START RESOURCE TSTAPP.rss +TARGETPATH /resource/apps +END + +START RESOURCE tstapp_loc.rss +TARGETPATH /resource/apps +LANG SC 01 02 03 04 05 +END + +START BITMAP tstapp.mbm +TARGETPATH /resource/apps +SOURCEPATH ../tdatasrc +SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp +SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp +SOURCE c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp + +END + +START BITMAP tstapp02.m02 +TARGETPATH /resource/apps +SOURCEPATH ../tdatasrc +SOURCE c8,1 def25.bmp def25m.bmp def25.bmp def25m.bmp def50.bmp def50m.bmp +END + +START BITMAP tstappview01.m01 +TARGETPATH /resource/apps +SOURCEPATH ../tdatasrc +SOURCE c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp +END + +START BITMAP tstappview02.k +TARGETPATH /resource/apps +SOURCEPATH ../tdatasrc +SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp +SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp +SOURCE c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp +END + +START BITMAP tstappview01.m02 +TARGETPATH /resource/apps +SOURCEPATH ../tdatasrc +SOURCE c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp +END + +START BITMAP tstappview +TARGETPATH /resource/apps +SOURCEPATH ../tdatasrc +SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp +SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp +SOURCE c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp +END + +LIBRARY euser.lib apparc.lib eikcore.lib cone.lib + +SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tstappsc.rls --- a/appfw/apparchitecture/tef/tstappsc.rls Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tstappsc.rls Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -26,6 +26,6 @@ rls_string STRING_r_tstapp_view1_caption "V1 SC" rls_string STRING_r_tstapp_view2_caption "V2 SC" -rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm" -rls_string STRING_r_tstapp_view_icon_file "z:\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm" +rls_string STRING_r_tstapp_view_icon_file "\\resource\\apps\\tstapp.mbm" diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/tupgradeiconapp/tupgradeiconapp.mmp --- a/appfw/apparchitecture/tef/tupgradeiconapp/tupgradeiconapp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/tupgradeiconapp/tupgradeiconapp.mmp Fri May 14 16:01:13 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -39,13 +39,13 @@ SOURCEPATH . RESOURCE tupgradeiconapp.rss START RESOURCE tupgradeiconapp.rss -TARGETPATH /resource/apps +TARGETPATH /apparctestregfiles LANG SC END SOURCEPATH . START RESOURCE tupgradeiconapp_reg.rss -TARGETPATH /private/10003a3f/apps +TARGETPATH /apparctestregfiles END diff -r b0b858956ed5 -r 6a787171e1de appfw/apparchitecture/tef/zerosizedicontestapp.mmp --- a/appfw/apparchitecture/tef/zerosizedicontestapp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/appfw/apparchitecture/tef/zerosizedicontestapp.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -24,8 +24,11 @@ SOURCEPATH . SOURCE zerosizedicontestapp.cpp +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +APP_LAYER_SYSTEMINCLUDE_SYMBIAN USERINCLUDE . -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/techview // Application exe specific resource which is localised to the application RESOURCE zerosizedicon_loc.rss diff -r b0b858956ed5 -r 6a787171e1de appsupport_plat/restore_factory_settings_api/inc/rfsClient.h --- a/appsupport_plat/restore_factory_settings_api/inc/rfsClient.h Mon May 03 12:40:23 2010 +0300 +++ b/appsupport_plat/restore_factory_settings_api/inc/rfsClient.h Fri May 14 16:01:13 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES #include -#include "rfshandler.h" +#include "rfsHandler.h" // CONSTANTS diff -r b0b858956ed5 -r 6a787171e1de appsupport_plat/restore_factory_settings_plugin_api/inc/rfsPlugin.h --- a/appsupport_plat/restore_factory_settings_plugin_api/inc/rfsPlugin.h Mon May 03 12:40:23 2010 +0300 +++ b/appsupport_plat/restore_factory_settings_plugin_api/inc/rfsPlugin.h Fri May 14 16:01:13 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include // CONSTANTS @@ -89,7 +89,7 @@ TUid iDtor_ID_Key; }; -#include "rfsplugin.inl" +#include "rfsPlugin.inl" #endif //RFSPLUGIN_H diff -r b0b858956ed5 -r 6a787171e1de contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf --- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf Mon May 03 12:40:23 2010 +0300 +++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf Fri May 14 16:01:13 2010 +0300 @@ -31,9 +31,9 @@ // Rule files /* Copy autorotateui_activate.xml, autorotateui_alwaysinportrait.xml, autorotateui_init.xml, autorotateui_rotate.xml 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\ +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/ */ ../data/autorotateui_activate.xml Z:/private/10282bc4/rules/autorotateui_activate.rul diff -r b0b858956ed5 -r 6a787171e1de contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf --- a/contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf Mon May 03 12:40:23 2010 +0300 +++ b/contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf Fri May 14 16:01:13 2010 +0300 @@ -26,9 +26,9 @@ /* Copy 10282C74.xml to -1. \epoc32\data\z\private\10282BC4\Settings\10282C74\10282C74.xml -2. \epoc32\release\winscw\udeb\z\private\10282BC4\Settings\10282C74\10282C74.xml -3. \epoc32\release\winscw\urel\z\private\10282BC4\Settings\10282C74\10282C74.xml +1. /epoc32/data/z/private/10282BC4/Settings/10282C74/10282C74.xml +2. /epoc32/release/winscw/udeb/z/private/10282BC4/Settings/10282C74/10282C74.xml +3. /epoc32/release/winscw/urel/z/private/10282BC4/Settings/10282C74/10282C74.xml */ ../data/10282C74.xml Z:/private/10282BC4/Settings/10282C74/10282C74.xml diff -r b0b858956ed5 -r 6a787171e1de contextframework/cfwplugins/sensorsourceplugin/group/bld.inf --- a/contextframework/cfwplugins/sensorsourceplugin/group/bld.inf Mon May 03 12:40:23 2010 +0300 +++ b/contextframework/cfwplugins/sensorsourceplugin/group/bld.inf Fri May 14 16:01:13 2010 +0300 @@ -29,9 +29,9 @@ /* Copy 10282DF0.xml to -1. \epoc32\data\z\private\10282BC4\Settings\10282DF0\10282DF0.xml -2. \epoc32\release\winscw\udeb\z\private\10282BC4\Settings\10282DF0\10282DF0.xml -3. \epoc32\release\winscw\urel\z\private\10282BC4\Settings\10282DF0\10282DF0.xml +1. /epoc32/data/z/private/10282BC4/Settings/10282DF0/10282DF0.xml +2. /epoc32/release/winscw/udeb/z/private/10282BC4/Settings/10282DF0/10282DF0.xml +3. /epoc32/release/winscw/urel/z/private/10282BC4/Settings/10282DF0/10282DF0.xml */ ../data/10282DF0.xml Z:/private/10282BC4/Settings/10282DF0/10282DF0.xml diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp --- a/coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp Fri May 14 16:01:13 2010 +0300 @@ -474,7 +474,7 @@ if ( iDialog && iIsWaitForDialogExecuted) { - iDialog->Cancel(); + iDialog->Close(); } // Sanity Check: diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Group/SysAp.mmp --- a/coreapplicationuis/SysAp/Group/SysAp.mmp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Group/SysAp.mmp Fri May 14 16:01:13 2010 +0300 @@ -48,7 +48,7 @@ SOURCE SysApEtelNetworkBarObserver.cpp SOURCE sysapetelnetworkbargetter.cpp -SOURCE CenRepObservers/sysapcenrepfmtxobserver.cpp +//SOURCE CenRepObservers/sysapcenrepfmtxobserver.cpp SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp SOURCE CenRepObservers/SysApCenRepBTObserver.cpp SOURCE CenRepObservers/SysApCenRepHacSettingObserver.cpp @@ -217,7 +217,7 @@ LIBRARY MediaClientAudio.lib #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION LIBRARY hwrmlightclient.lib -LIBRARY hwrmfmtxclient.lib +//LIBRARY hwrmfmtxclient.lib LIBRARY remconcoreapi.lib LIBRARY remconinterfacebase.lib LIBRARY aknicon.lib diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Inc/SysApAppUi.h --- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h Fri May 14 16:01:13 2010 +0300 @@ -62,7 +62,7 @@ class CSysApCenRepLightSettingsObserver; class CSysApCenRepLogsObserver; class CSysApCenRepBtObserver; -class CSysApCenRepFmTxObserver; +//class CSysApCenRepFmTxObserver; class CSysApCenRepController; class CSysApStartupController; class CSysApPowerKeyMenuObserver; @@ -427,7 +427,7 @@ /** * Enable or disable FM transmission */ - void ChangeFmTxStateL( TBool aEnable ); +// void ChangeFmTxStateL( TBool aEnable ); #ifndef RD_MULTIPLE_DRIVE public: // from MAknMemoryCardDialogObserver @@ -1441,7 +1441,7 @@ CSysApCenRepLogsObserver* iSysApCenRepLogsObserver; CSysApCenRepBtObserver* iSysApCenRepBtObserver; CSysApCenRepHacSettingObserver* iSysApCenRepHacSettingObserver; - CSysApCenRepFmTxObserver* iSysApCenRepFmTxObserver; +// CSysApCenRepFmTxObserver* iSysApCenRepFmTxObserver; CSysApCenRepController* iSysApCenRepController; CSysApStartupController* iSysApStartupController; CSysApConnectionMonitorObserver* iSysApConnectionMonitorObserver; diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Inc/SysApFeatureManager.h --- a/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Fri May 14 16:01:13 2010 +0300 @@ -209,7 +209,7 @@ * @since S60 3.2 * @return ETrue if feature is supported */ - TBool FmTxSupported() const; +// TBool FmTxSupported() const; /** * Returns whether pen is enabled. @@ -244,7 +244,7 @@ * @since S60 5.1 * @return ETrue if feature is supported */ - TBool FmTxRdsTextSupported() const; +// TBool FmTxRdsTextSupported() const; private: @@ -339,7 +339,7 @@ /** * FM TX supported status */ - TBool iFmTxSupported; +// TBool iFmTxSupported; /** * Pen enabled status. @@ -359,7 +359,7 @@ /** * FM TX RDS Text support status. */ - TBool iFmTxRdsTextSupported; +// TBool iFmTxRdsTextSupported; }; #endif // SYSAPFEATUREMANAGER_H diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h --- a/coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h Fri May 14 16:01:13 2010 +0300 @@ -99,7 +99,7 @@ /** * Handle keys under category KPSUidHWRMFmTx */ - void HandleHwrmFmTxCategoryL( const TUint aKey, const TInt aValue ); +// void HandleHwrmFmTxCategoryL( const TUint aKey, const TInt aValue ); /** * Handle keys under category KPSUidDataSynchronizationInternalKeys @@ -160,11 +160,11 @@ CSysApSubscriber* iSimChangedSubscriber; // KPSSimChanged // Category KHWRMFmTxStatus - CSysApSubscriber* iFmTxStatusSubscriber; // KPSUidHWRMFmTx +// CSysApSubscriber* iFmTxStatusSubscriber; // KPSUidHWRMFmTx - TInt iPreviousFmTxPSValue; +// TInt iPreviousFmTxPSValue; - CSysApRemConObserver* iFmTxRemConObserver; +// CSysApRemConObserver* iFmTxRemConObserver; // Category KPSUidCoreApplicationUIs diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepfmtxobserver.cpp --- a/coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepfmtxobserver.cpp Mon May 03 12:40:23 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,140 +0,0 @@ -/* -* Copyright (c) 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: CSysApCenRepFmTxObserver implementation. - * -*/ - - -// INCLUDE FILES -#include -#include -#include -#include -#include "sysapcenrepfmtxobserver.h" -#include "SysApAppUi.h" -#include "SysAp.hrh" - -// ========================== MEMBER FUNCTIONS ================================ - -// ---------------------------------------------------------------------------- -// CSysApCenRepFmTxObserver* CSysApCenRepFmTxObserver::NewL() -// ---------------------------------------------------------------------------- - -CSysApCenRepFmTxObserver* CSysApCenRepFmTxObserver::NewL( CSysApAppUi& aSysApAppUi ) - { - TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::NewL" ) ) ); - CSysApCenRepFmTxObserver* self = new ( ELeave ) CSysApCenRepFmTxObserver( aSysApAppUi ); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -// ---------------------------------------------------------------------------- -// CSysApCenRepFmTxObserver::CSysApCenRepFmTxObserver( CSysApAppUi& aSysApAppUi ) -// ---------------------------------------------------------------------------- - -CSysApCenRepFmTxObserver::CSysApCenRepFmTxObserver( CSysApAppUi& aSysApAppUi ) - : iSysApAppUi( aSysApAppUi ), - iSession( NULL ), - iFmTxPowerStateHandler( NULL ), - iFrequency( 0 ) - { - TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::CSysApCenRepFmTxObserver" ) ) ); - } - -// ---------------------------------------------------------------------------- -// CSysApCenRepFmTxObserver::~CSysApCenRepFmTxObserver() -// ---------------------------------------------------------------------------- - -CSysApCenRepFmTxObserver::~CSysApCenRepFmTxObserver() - { - TRACES( RDebug::Print( _L("~CSysApCenRepFmTxObserver") ) ); - delete iFmTxPowerStateHandler; - delete iSession; - } - -// ---------------------------------------------------------------------------- -// CSysApCenRepFmTxObserver::ConstructL() -// ---------------------------------------------------------------------------- - -void CSysApCenRepFmTxObserver::ConstructL() - { - TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::ConstructL: trying CRepository::NewL( KCRUidBluetoothPowerState )") ) ); - iSession = CRepository::NewL( KCRUidFmTxCenRes ); - iFmTxPowerStateHandler = - CCenRepNotifyHandler::NewL( *this, - *iSession, - CCenRepNotifyHandler::EIntKey, - KFmTxCenResKeyFrequency ); - iFmTxPowerStateHandler->StartListeningL(); - TInt err = iSession->Get( KFmTxCenResKeyFrequency, iFrequency ); - TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::ConstructL: err=%d, iFrequency=%d"), err, iFrequency ) ); - User::LeaveIfError( err ); - } - -// ---------------------------------------------------------------------------- -// CSysApCenRepFmTxObserver::HandleNotifyInt() -// ---------------------------------------------------------------------------- - -void CSysApCenRepFmTxObserver::HandleNotifyInt( TUint32 aId, TInt aNewValue ) - { - TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::HandleNotifyInt(): aId=%d, aNewValue=%d" ), aId, aNewValue ) ); - if ( aId == KFmTxCenResKeyFrequency ) - { - iFrequency = aNewValue; - TFmTxState state = static_cast(iSysApAppUi.StateOfProperty( KPSUidHWRMFmTx, KHWRMFmTxStatus )); - switch ( state ) - { - case EFmTxStateActive: - case EFmTxStateInactive: - case EFmTxStatePowerSaveInactivity: - case EFmTxStatePowerSaveAccessory: - case EFmTxStateScanning: - // show "Tune radio to xx.xx MHz" if FM TX is on - TRAPD( err, iSysApAppUi.ShowUiNoteL( EFmTxOnNote ) ); - if ( err != KErrNone ) - { - TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::HandleNotifyInt(): err=%d" ), err ) ); - } - break; - - default: - // do nothing - break; - } - } - } - -// ---------------------------------------------------------------------------- -// CSysApCenRepFmTxObserver::HandleNotifyError() -// ---------------------------------------------------------------------------- - -void CSysApCenRepFmTxObserver::HandleNotifyError( TUint32 /* aId */, TInt /* error */, CCenRepNotifyHandler* /* aHandler */ ) - { - TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::HandleNotifyError()" ) ) ); - } - -// ---------------------------------------------------------------------------- -// CSysApCenRepFmTxObserver::Frequency() -// ---------------------------------------------------------------------------- - -TInt CSysApCenRepFmTxObserver::Frequency() const - { - return iFrequency; - } - - -// End of File - diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepfmtxobserver.h --- a/coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepfmtxobserver.h Mon May 03 12:40:23 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -/* -* Copyright (c) 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: CSysApCenRepFmTxObserver class definition. -* -*/ - - -#ifndef SYSAPCENREPFMTXOBSERVER_H -#define SYSAPCENREPFMTXOBSERVER_H - -// INCLUDES -#include -#include - - -// FORWARD DECLARATIONS -class CRepository; -class CSysApAppUi; - -// CLASS DECLARATION - -/** -* CSysApCenRepFmTxObserver -* -* Observer class for FM TX related Central Repository keys. -* -* @lib None. -* @since 3.2 -*/ - -class CSysApCenRepFmTxObserver : public CBase, public MCenRepNotifyHandlerCallback - { - public: // Constructors and destructor - /** - * Symbian two-phased constructor. - */ - static CSysApCenRepFmTxObserver* NewL( CSysApAppUi& aSysApAppUi ); - - /** - * Destructor. - */ - virtual ~CSysApCenRepFmTxObserver(); - - private: - - /** - * Symbian 2nd-phase constructor. - * @param None - * @return void - */ - void ConstructL( ); - - /** - * Constructor - * @param CSysApAppUi& aSysApAppUi - * @return void - */ - CSysApCenRepFmTxObserver( CSysApAppUi& aSysApAppUi ); - - /** - * C++ default constructor. - * @param None - * @return void - */ - CSysApCenRepFmTxObserver(); - - public: // From MCenRepNotifyHandlerCallback - void HandleNotifyInt( TUint32 aId, TInt aNewValue ); - void HandleNotifyError( TUint32 aId, TInt error, CCenRepNotifyHandler* aHandler ); - - public: // Other functions - - /** - * Returns the current frequency - * - * @return TInt - */ - TInt Frequency() const; - - private: - // By default, prohibit copy constructor - CSysApCenRepFmTxObserver( const CSysApCenRepFmTxObserver& ); - - // Prohibit assigment operator - CSysApCenRepFmTxObserver& operator= ( const CSysApCenRepFmTxObserver& ); - - private: - /** - * SysAp application class. - */ - CSysApAppUi& iSysApAppUi; - - /** - * CenRep session for FM TX keys. - * Own. - */ - CRepository* iSession; - - /** - * Notify handler for FM TX CenRep key. - * Own. - */ - CCenRepNotifyHandler* iFmTxPowerStateHandler; - - /** - * Tuned FM TX frequency. - */ - TInt iFrequency; - }; - -#endif // SYSAPCENREPFMTXOBSERVER_H - -// End of File diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Src/SysApAppUi.cpp --- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri May 14 16:01:13 2010 +0300 @@ -106,10 +106,10 @@ #include "SysApShutdownAnimation.h" -#include -#include -#include -#include "sysapcenrepfmtxobserver.h" +//#include +//#include +//#include +//#include "sysapcenrepfmtxobserver.h" #include "SysApKeySndHandler.h" @@ -336,12 +336,12 @@ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepBtObserver::NewL") ) ); iSysApCenRepBtObserver = CSysApCenRepBtObserver::NewL( *this ); - if ( iSysApFeatureManager->FmTxSupported() ) +/* if ( iSysApFeatureManager->FmTxSupported() ) { TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepFmTxObserver::NewL") ) ); iSysApCenRepFmTxObserver = CSysApCenRepFmTxObserver::NewL( *this ); } - +*/ // Define P&S keys "owned" by SysAp RProperty::Define( KPSUidUikon, KUikMMCInserted, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy ); //initially assuming that the memory card is not inserted @@ -1212,7 +1212,7 @@ delete iSysApCenRepLightSettingsObserver; delete iSysApCenRepLogsObserver; delete iSysApCenRepBtObserver; - delete iSysApCenRepFmTxObserver; +// delete iSysApCenRepFmTxObserver; delete iSysApCenRepHacSettingObserver; delete iSysApCenRepController; @@ -1319,7 +1319,7 @@ tone = EAvkonSIDInformationTone; secondaryDisplayId = SecondaryDisplay::ECmdShowKeypadActiveNote; break; - case EFmTxAccessoryStandbyNote: +/* case EFmTxAccessoryStandbyNote: noteType = EAknGlobalInformationNote; tone = EAvkonSIDInformationTone; secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxStandbyInAccessoryConnectionNote; @@ -1344,7 +1344,7 @@ tone = EAvkonSIDInformationTone; secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxDisabledNote; break; - case EBatteryFullUnplugChargerNote: +*/ case EBatteryFullUnplugChargerNote: noteType = EAknGlobalBatteryFullUnplugNote; tone = EAvkonSIDInformationTone; break; @@ -1420,7 +1420,7 @@ } note->SetAnimation( R_QGN_NOTE_KEYGUARD_OPEN_ANIM ); break; - case EFmTxOnNote: +/* case EFmTxOnNote: { const TInt KFrequencyMaxLength(7); // read frequency @@ -1459,7 +1459,7 @@ iEikonEnv ); break; } - case EPowerSaveModeActivated: +*/ case EPowerSaveModeActivated: noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_ACTIVATED_CONF_NOTE, iEikonEnv ); break; case EPowerSaveModeDeactivated: @@ -1478,7 +1478,7 @@ note->SetTone( tone ); // Set secondary display data if necessary - if ( iSysApFeatureManager->CoverDisplaySupported() && secondaryDisplayId != SecondaryDisplay::ECmdNoNote) +/* if ( iSysApFeatureManager->CoverDisplaySupported() && secondaryDisplayId != SecondaryDisplay::ECmdNoNote) { TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL - Notifying secondary display") ) ); CAknSDData* sd; @@ -1495,7 +1495,7 @@ note->SetSecondaryDisplayData(sd); // ownership to notifier client } - +*/ if ( noteStringBuf ) { TPtr textBuffer = noteStringBuf->Des(); @@ -2193,7 +2193,7 @@ // ---------------------------------------------------------------------------- void CSysApAppUi::SwitchFromOnlineToOfflineModeL() { - if ( iSysApFeatureManager->FmTxSupported() ) +/* if ( iSysApFeatureManager->FmTxSupported() ) { TFmTxState state = static_cast(StateOfProperty( KPSUidHWRMFmTx, KHWRMFmTxStatus )); switch ( state ) @@ -2209,7 +2209,7 @@ break; } } - iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL(); +*/ iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL(); } // ---------------------------------------------------------------------------- @@ -2290,7 +2290,7 @@ { return iDeviceLockEnabled; } - +/* // ---------------------------------------------------------------------------- // CSysApAppUi::ChangeFmTxStateL() // ---------------------------------------------------------------------------- @@ -2308,6 +2308,7 @@ } CleanupStack::PopAndDestroy( fmtx ); } +*/ // ---------------------------------------------------------------------------- // CSysApAppUi::SetIhfIndicatorL() diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp --- a/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp Fri May 14 16:01:13 2010 +0300 @@ -181,14 +181,14 @@ anim = R_QGN_NOTE_INFO_ANIM; secondaryDisplayCmdId = SecondaryDisplay::ECmdShowMemoryCardLockedQuery; break; - case ESysApUseFmTxInOfflineQuery: +/* case ESysApUseFmTxInOfflineQuery: queryStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_NOTE_ACTIVATE_IN_OFFLINE, aLoaderEnv ); keys = R_AVKON_SOFTKEYS_YES_NO; secondaryDisplayCmdId = SecondaryDisplay::ECmdShowFmTxKeepOnInOfflineQuery; break; - case ESysApBattChargingPowerSavingQuery: +*/ case ESysApBattChargingPowerSavingQuery: queryStringBuf = StringLoader::LoadLC( R_QTN_BATTERY_CHARGING_POWER_SAVING_QUERY, aLoaderEnv ); keys = R_AVKON_SOFTKEYS_YES_NO; secondaryDisplayCmdId = SecondaryDisplay::ECmdShowChargingDeactivatePowerSavingQuery; @@ -325,14 +325,14 @@ ShowQueryL( iPendingQuery, CCoeEnv::Static() ); } break; - case ESysApUseFmTxInOfflineQuery: +/* case ESysApUseFmTxInOfflineQuery: if ( iStatus.Int() == EAknSoftkeyNo ) { TRACES( RDebug::Print( _L( "CSysApConfirmationQuery::RunL: calling CSysApAppUi::ChangeFmTxStateL( EFalse )" ) ) ); iSysApAppUi.ChangeFmTxStateL( EFalse ); // disable FM TX } break; - case ESysApBattChargingPowerSavingQuery: +*/ case ESysApBattChargingPowerSavingQuery: iSysApAppUi.HandleDeactivatePsmQueryResponse( iStatus.Int() == EAknSoftkeyYes ); break; diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp --- a/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Fri May 14 16:01:13 2010 +0300 @@ -93,8 +93,8 @@ iNoPowerKeySupported = FeatureManager::FeatureSupported( KFeatureIdNoPowerkey ); TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: No power key supported=%d"), iNoPowerKeySupported ) ); - iFmTxSupported = FeatureManager::FeatureSupported( KFeatureIdFmtx ); - TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX supported=%d"), iFmTxSupported ) ); +// iFmTxSupported = FeatureManager::FeatureSupported( KFeatureIdFmtx ); + // TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX supported=%d"), iFmTxSupported ) ); iPenEnabled = AknLayoutUtils::PenEnabled(); TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Pen enabled=%d"), iPenEnabled ) ); @@ -105,8 +105,8 @@ iTouchUnlockStrokeSupported = FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ); TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Touch unlock stroke supported=%d"), iTouchUnlockStrokeSupported ) ); - iFmTxRdsTextSupported = FeatureManager::FeatureSupported( KFeatureIdFfFmtxRdsText ); - TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX RDS-TEXT supported=%d"), iFmTxRdsTextSupported ) ); +// iFmTxRdsTextSupported = FeatureManager::FeatureSupported( KFeatureIdFfFmtxRdsText ); +// TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX RDS-TEXT supported=%d"), iFmTxRdsTextSupported ) ); CRepository* repository = NULL; @@ -180,11 +180,11 @@ iGripNotSupported( ETrue ), iPowerSaveSupported( EFalse ), iNoPowerKeySupported( EFalse ), - iFmTxSupported( EFalse ), +// iFmTxSupported( EFalse ), iPenEnabled( EFalse ), iVmbxCallDivertIconSupported( EFalse ), - iTouchUnlockStrokeSupported( EFalse ), - iFmTxRdsTextSupported( EFalse ) + iTouchUnlockStrokeSupported( EFalse ) +// iFmTxRdsTextSupported( EFalse ) { } @@ -369,7 +369,7 @@ { return iNoPowerKeySupported; } - +/* // ---------------------------------------------------------------------------- // CSysApFeatureManager::FmTxSupported() // ---------------------------------------------------------------------------- @@ -378,7 +378,7 @@ { return iFmTxSupported; } - +*/ // ---------------------------------------------------------------------------- // CSysApFeatureManager::PenEnabled() // ---------------------------------------------------------------------------- @@ -405,7 +405,7 @@ { return iTouchUnlockStrokeSupported; } - +/* // ---------------------------------------------------------------------------- // CSysApFeatureManager::FmTxRdsTextSupported() // ---------------------------------------------------------------------------- @@ -414,7 +414,7 @@ { return iFmTxRdsTextSupported; } - +*/ // End of File diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp --- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Fri May 14 16:01:13 2010 +0300 @@ -33,8 +33,8 @@ #include #include #include -#include -#include +//#include +//#include #include "sysapremconobserver.h" #include #include @@ -166,14 +166,14 @@ iFlipStatusSubscriber = CSysApSubscriber::NewL( *this, KPSUidHWRM, KHWRMFlipStatus ); iFlipStatusSubscriber->Subscribe(); - if ( iSysApAppUi.SysApFeatureManager().FmTxSupported() ) +/* if ( iSysApAppUi.SysApFeatureManager().FmTxSupported() ) { // Category KHWRMFmTxStatus iFmTxStatusSubscriber = CSysApSubscriber::NewL( *this, KPSUidHWRMFmTx, KHWRMFmTxStatus ); iFmTxStatusSubscriber->Subscribe(); iPreviousFmTxPSValue = EFmTxStateUnknown; } - +*/ iSyncStatusSubscriber = CSysApSubscriber::NewL( *this, KPSUidDataSynchronizationInternalKeys, KDataSyncStatus ); iSyncStatusSubscriber->Subscribe(); @@ -230,8 +230,8 @@ delete iNetworkModeSubscriber; delete iWlanIndicatorSubscriber; delete iFlipStatusSubscriber; - delete iFmTxStatusSubscriber; - delete iFmTxRemConObserver; +// delete iFmTxStatusSubscriber; +// delete iFmTxRemConObserver; delete iSyncStatusSubscriber; delete iVideoSharingIndicatorSubscriber; delete iGpsIndicatorSubscriber; @@ -302,11 +302,11 @@ { HandleHwrmCategoryL( aKey, value ); } - else if ( aCategory == KPSUidHWRMFmTx ) +/* else if ( aCategory == KPSUidHWRMFmTx ) { HandleHwrmFmTxCategoryL( aKey, value ); } - else if ( aCategory == KPSUidDataSynchronizationInternalKeys ) +*/ else if ( aCategory == KPSUidDataSynchronizationInternalKeys ) { HandleDataSyncCategoryL( aKey, value ); } @@ -609,7 +609,7 @@ break; } } - +/* // ---------------------------------------------------------------------------- // CSysApPubSubObserver::HandleHwrmFmTxCategoryL() // ---------------------------------------------------------------------------- @@ -750,6 +750,7 @@ iPreviousFmTxPSValue = aValue; } } +*/ // ---------------------------------------------------------------------------- // CSysApPubSubObserver::HandleWlanCategoryL() diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/SysAp/Src/sysapremconobserver.cpp --- a/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp Fri May 14 16:01:13 2010 +0300 @@ -102,13 +102,13 @@ || aOperationId == ERemConCoreApiMute ) { // A volume key is pressed down - TRAPD( err, iSysApAppUi.ShowUiNoteL( EFmTxVolumeDisabledNote ) ); +/* TRAPD( err, iSysApAppUi.ShowUiNoteL( EFmTxVolumeDisabledNote ) ); if ( err != KErrNone ) { TRACES( RDebug::Print( _L("CSysApRemConObserver::MrccatoCommand: err=%d"), err ) ); } - } +*/ } } } diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp --- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Fri May 14 16:01:13 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include "AccFwUiNoteNotifier.h" @@ -67,7 +67,6 @@ { API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::~CAccFwUiNoteNotifier()" ); - // delete iNote; delete iNoteText; CActive::Cancel(); @@ -227,13 +226,7 @@ iMessage = aMessage; if( showNote ) { - if ( FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) ) - { - API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Cover UI supported" ); - iPublishNote = ETrue; - } - - iIsCancelled = EFalse; + iIsCancelled = EFalse; SetActive(); TRequestStatus* status = &iStatus; User::RequestComplete( status, KErrNone ); // RunL() function will get called @@ -315,7 +308,7 @@ iIsCancelled = ETrue; - // Cancel active object, delete dialog and free resources + // Cancel active object and free resources if ( IsActive() ) { CActive::Cancel(); diff -r b0b858956ed5 -r 6a787171e1de coreapplicationuis/advancedtspcontroller/group/bld.inf --- a/coreapplicationuis/advancedtspcontroller/group/bld.inf Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/advancedtspcontroller/group/bld.inf Fri May 14 16:01:13 2010 +0300 @@ -27,15 +27,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 b0b858956ed5 -r 6a787171e1de coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Mon May 03 12:40:23 2010 +0300 +++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Fri May 14 16:01:13 2010 +0300 @@ -23,6 +23,7 @@ #include #include #include +#include // USER INCLUDE #include "formatterrfsplugin.h" #include "formatterrfspluginprivatecrkeys.h" @@ -48,12 +49,13 @@ 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; } + TInt pos = 0; file.Seek(ESeekEnd,pos); TInt size = files.Count(); @@ -74,6 +76,7 @@ CleanupStack::PopAndDestroy();//Filename file.Flush(); } + file.Close(); fileSession.Close(); } @@ -93,14 +96,20 @@ User::LeaveIfError(fileSession.Connect()); TInt ret = excludeFileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelist.txt"),EFileRead); - TInt err1 = fileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText); - - fileName.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); @@ -153,8 +162,9 @@ file.Flush(); file.Close(); + dir.Close(); fileSession.Close(); - + Swi::RSisRegistrySession session; CleanupClosePushL(session); User::LeaveIfError(session.Connect()); @@ -456,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 b0b858956ed5 -r 6a787171e1de printingsupport/printinguisupport/group/print.iby --- a/printingsupport/printinguisupport/group/print.iby Mon May 03 12:40:23 2010 +0300 +++ b/printingsupport/printinguisupport/group/print.iby Fri May 14 16:01:13 2010 +0300 @@ -18,7 +18,7 @@ #ifndef __PRINT_IBY__ #define __PRINT_IBY__ -#ifdef SYMBIAN_EXCLUDE_PRINT +#ifndef __UPNP_PRINT_FRAMEWORK REM Feature PRINT is not included in this ROM #else REM Print diff -r b0b858956ed5 -r 6a787171e1de startupservices/SplashScreen/group/bld.inf --- a/startupservices/SplashScreen/group/bld.inf Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/SplashScreen/group/bld.inf Fri May 14 16:01:13 2010 +0300 @@ -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,12 +25,9 @@ ../rom/splashscreen.iby CORE_MW_LAYER_IBY_EXPORT_PATH(splashscreen.iby) ../rom/splashscreen_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(splashscreen_variant.iby) +/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 splashscreen.mmp -PRJ_EXTENSIONS -START EXTENSION s60/mifconv - OPTION TARGETFILE splashscreen.mif - OPTION HEADERFILE splashscreen.mbg - OPTION SOURCES -c8 qgn_startup_screen -END diff -r b0b858956ed5 -r 6a787171e1de startupservices/SplashScreen/group/splashscreen.mmp --- a/startupservices/SplashScreen/group/splashscreen.mmp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/SplashScreen/group/splashscreen.mmp Fri May 14 16:01:13 2010 +0300 @@ -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" @@ -45,7 +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 b0b858956ed5 -r 6a787171e1de startupservices/SplashScreen/inc/SplashScreen.h --- a/startupservices/SplashScreen/inc/SplashScreen.h Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/SplashScreen/inc/SplashScreen.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de startupservices/SplashScreen/inc/SplashScreenDefines.h --- a/startupservices/SplashScreen/inc/SplashScreenDefines.h Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/SplashScreen/inc/SplashScreenDefines.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de startupservices/SplashScreen/rom/splashscreen.iby --- a/startupservices/SplashScreen/rom/splashscreen.iby Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/SplashScreen/rom/splashscreen.iby Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de startupservices/SplashScreen/src/SplashScreen.cpp --- a/startupservices/SplashScreen/src/SplashScreen.cpp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/SplashScreen/src/SplashScreen.cpp Fri May 14 16:01:13 2010 +0300 @@ -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,9 +407,7 @@ if ( !err ) { TRACES("CMainWindow::ConstructL(): Image found"); - iBitmap = AknIconUtils::CreateIconL( fp->FullName(), EMbmSplashscreenQgn_startup_screen ); - AknIconUtils::ExcludeFromCache(iBitmap); - AknIconUtils::SetSize( iBitmap, iRect.Size(), EAspectRatioPreservedAndUnusedSpaceRemoved ); + iBitmap = ReadSVGL(fp->FullName()); } else { @@ -428,8 +472,7 @@ void CMainWindow::HandlePointerEvent (TPointerEvent& /*aPointerEvent*/) { TRACES("CMainWindow::HandlePointerEvent(): Start"); -// TPoint point = aPointerEvent.iPosition; -// (void)point; + TRACES("CMainWindow::HandlePointerEvent(): End"); } diff -r b0b858956ed5 -r 6a787171e1de startupservices/Startup/group/startup.mmp --- a/startupservices/Startup/group/startup.mmp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/group/startup.mmp Fri May 14 16:01:13 2010 +0300 @@ -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,25 +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 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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupAppUi.h --- a/startupservices/Startup/inc/StartupAppUi.h Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/inc/StartupAppUi.h Fri May 14 16:01:13 2010 +0300 @@ -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 +#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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupApplication.h --- a/startupservices/Startup/inc/StartupApplication.h Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/inc/StartupApplication.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupDocument.h --- a/startupservices/Startup/inc/StartupDocument.h Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/inc/StartupDocument.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupOperatorAnimation.h --- a/startupservices/Startup/inc/StartupOperatorAnimation.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupPopupList.h --- a/startupservices/Startup/inc/StartupPopupList.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupQueryDialog.h --- a/startupservices/Startup/inc/StartupQueryDialog.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupTone.h --- a/startupservices/Startup/inc/StartupTone.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupUserWelcomeNote.h --- a/startupservices/Startup/inc/StartupUserWelcomeNote.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/StartupWelcomeAnimation.h --- a/startupservices/Startup/inc/StartupWelcomeAnimation.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/inc/startupview.h --- a/startupservices/Startup/inc/startupview.h Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/inc/startupview.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/StartupAppUi.cpp --- a/startupservices/Startup/src/StartupAppUi.cpp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/src/StartupAppUi.cpp Fri May 14 16:01:13 2010 +0300 @@ -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 @@ -33,54 +26,22 @@ #include "startupappprivatepskeys.h" #include #include -#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,64 +547,30 @@ { 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(); @@ -875,6 +587,7 @@ } // End of temporary fix. } + TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Setting KPSStartupAppState = EStartupAppStateFinished"); TInt err = RProperty::Set( KPSUidStartupApp, KPSStartupAppState, EStartupAppStateFinished ); if( KErrNone != err ) @@ -883,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() @@ -944,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 ) ); @@ -958,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() // --------------------------------------------------------------------------- @@ -1029,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 } } @@ -1127,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() // --------------------------------------------------------------------------- @@ -1476,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"); } @@ -1525,7 +728,7 @@ { TRACES("CStartupAppUi::SetEmergencyCallsOnlyL(): Entered emergency calls only state."); - DoNextStartupPhaseL( EStartupWaitingCUIStartupReady ); + DoNextStartupPhaseL( EStartupStartupOK ); } TRACES("CStartupAppUi::SetEmergencyCallsOnlyL(): End"); } @@ -1547,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() // ---------------------------------------------------------------------------- @@ -1651,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; @@ -1698,7 +882,7 @@ { TRACES1("CStartupAppUi::ShowOfflineModeQueryL(): KStartupBootIntoOffline set err %d", err); } - + TRACES("CStartupAppUi::ShowOfflineModeQueryL(): End"); } @@ -1708,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() @@ -2198,7 +1000,7 @@ } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + // --------------------------------------------------------------------------- // CStartupAppUi::AnimationFinished() // --------------------------------------------------------------------------- @@ -2240,7 +1042,7 @@ } else if ( iInternalState == EStartupShowingOperatorAnimation ) { - TRAP(err, DoNextStartupPhaseL( EStartupShowingUserWelcomeNote )); + TRAP(err, DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck)); } if ( err != KErrNone ) @@ -2250,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() @@ -2315,14 +1072,7 @@ return iSimSupported; } -// ---------------------------------------------------------------------------- -// CStartupAppUi::CoverUISupported() -// ---------------------------------------------------------------------------- -TBool CStartupAppUi::CoverUISupported() - { - TRACES("CStartupAppUi::CoverUISupported()"); - return iCoverUISupported; - } + // --------------------------------------------------------------------------- // CStartupAppUi::DoNextStartupPhaseL( TStartupInternalState toState ) @@ -2334,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 - @@ -2377,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(); @@ -2429,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: @@ -2453,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 ) @@ -2521,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; @@ -2550,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"); @@ -2604,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"); @@ -2669,7 +1266,6 @@ case EStartupOfflineModeQuery: case EStartupShowingWelcomeAnimation: case EStartupShowingOperatorAnimation: - case EStartupShowingUserWelcomeNote: case EStartupFirstBootAndRTCCheck: case EStartupWaitingCUIStartupReady: case EStartupStartupOK: @@ -2725,7 +1321,7 @@ return ret_val; } -#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION + // --------------------------------------------------------------------------- // CStartupAppUi::UpdateStartupUiPhase() // --------------------------------------------------------------------------- @@ -2740,5 +1336,5 @@ TRACES1("CStartupAppUi::UpdateStartupUiPhase(): KPSStartupUiPhase set err %d", err); } } -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + // End of file diff -r b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/StartupMediatorObserver.cpp --- a/startupservices/Startup/src/StartupMediatorObserver.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/StartupOperatorAnimation.cpp --- a/startupservices/Startup/src/StartupOperatorAnimation.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/StartupPopupList.cpp --- a/startupservices/Startup/src/StartupPopupList.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/StartupQueryDialog.cpp --- a/startupservices/Startup/src/StartupQueryDialog.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/StartupTone.cpp --- a/startupservices/Startup/src/StartupTone.cpp Mon May 03 12:40:23 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,324 +0,0 @@ -/* -* 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" -* which accompanies 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 10000 - -//=============================== 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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/StartupUserWelcomeNote.cpp --- a/startupservices/Startup/src/StartupUserWelcomeNote.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/StartupWelcomeAnimation.cpp --- a/startupservices/Startup/src/StartupWelcomeAnimation.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/src/startupview.cpp --- a/startupservices/Startup/src/startupview.cpp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/src/startupview.cpp Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/group/syserrcmd.mmp --- a/startupservices/Startup/syserrcmd/group/syserrcmd.mmp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/syserrcmd/group/syserrcmd.mmp Fri May 14 16:01:13 2010 +0300 @@ -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 diff -r b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/inc/syserrcmd.h --- a/startupservices/Startup/syserrcmd/inc/syserrcmd.h Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/syserrcmd/inc/syserrcmd.h Fri May 14 16:01:13 2010 +0300 @@ -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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/src/syserrcmd.cpp --- a/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Fri May 14 16:01:13 2010 +0300 @@ -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 #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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/group/bld.inf --- a/startupservices/Startup/syserrcmd/tsrc/group/bld.inf Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/syserrcmdtestu.def --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/syserrcmdtestu.def Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/syserrcmdtest.cfg --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/syserrcmdtest.cfg Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/syserrcmdtestu.def --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/syserrcmdtestu.def Mon May 03 12:40:23 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - _Z9LibEntryLR13CTestModuleIf @ 1 NONAME - diff -r b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/bld.inf --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/bld.inf Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envrecall.cmd --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envrecall.cmd Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envsetup.cmd --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envsetup.cmd Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.mmp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.mmp Mon May 03 12:40:23 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +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 - - -SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.pkg --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.pkg Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/asyncrequesthandler.h --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/asyncrequesthandler.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/syserrcmdtest.h --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/syserrcmdtest.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/trace.h --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/trace.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/traceconfiguration.hrh --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/traceconfiguration.hrh Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/syserrcmdtest.ini --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/syserrcmdtest.ini Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/syserrcmdtest.cpp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/syserrcmdtest.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/syserrcmdtestsstubu.def --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/syserrcmdtestsstubu.def Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/syserrcmdtestsstubu.def --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/syserrcmdtestsstubu.def Mon May 03 12:40:23 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - _ZN18SysErrCmdTestsStub21CustomCommandEnvStubLER3RFs @ 1 NONAME - diff -r b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/bld.inf --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/bld.inf Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/syserrcmdtestsstub.mmp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/syserrcmdtestsstub.mmp Mon May 03 12:40:23 2010 +0300 +++ /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: -* 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 - - - - - -SMPSAFE diff -r b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/syserrcmdtestsstub.h --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/syserrcmdtestsstub.h Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/ssmcustomcommandenvstub.cpp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/ssmcustomcommandenvstub.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/syserrcmdtestsstub.cpp --- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/syserrcmdtestsstub.cpp Mon May 03 12:40:23 2010 +0300 +++ /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 b0b858956ed5 -r 6a787171e1de startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp --- a/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp Fri May 14 16:01:13 2010 +0300 @@ -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 diff -r b0b858956ed5 -r 6a787171e1de startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp --- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Mon May 03 12:40:23 2010 +0300 +++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Fri May 14 16:01:13 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2010 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,15 +16,16 @@ */ -#include -#include + + #include + #include #include #include #include #include #include "sanimengine.h" -#include +#include #include "sanimstartupctrl.h" #include "trace.h" @@ -35,7 +36,7 @@ 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 b0b858956ed5 -r 6a787171e1de sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp --- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp Mon May 03 12:40:23 2010 +0300 +++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp Fri May 14 16:01:13 2010 +0300 @@ -110,7 +110,7 @@ CHbDeviceMessageBoxSymbian* globalNote = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning); CleanupStack::PushL(globalNote); globalNote->SetTextL(aMessage); - globalNote->SetTimeoutL(0); + globalNote->SetTimeout(0); globalNote->ExecL(); CleanupStack::PopAndDestroy(globalNote); diff -r b0b858956ed5 -r 6a787171e1de systemsettings/accindicatorplugin/accindicatorsettings/resources/headset.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/headset.docml Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b0b858956ed5 -r 6a787171e1de systemsettings/accindicatorplugin/accindicatorsettings/resources/tvout.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/tvout.docml Fri May 14 16:01:13 2010 +0300 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +