# HG changeset patch # User Christian Morlok # Date 1270643719 -7200 # Node ID 666a2952b5b3366cfbd29a74e2a5213c5c5b234e # Parent 282cea3dd14cf34e6a80b97e82fcafe2970017df renamed dlls+exe to prevent conflicts with existing files in emulator; changelog attached. * renamed dlls/exe: - aifw.dll to aifw_hs.dll - cputils to cputils_hs - aiidleint.dll to aiidleint_hs.dll - aiutils.dll to aiutils_hs.dll - MenuInterface.dll to MenuInterface_hs.dll - XCFW.dll to XCFW_hs.dll - homescreen.exe to homescreen_hs.exe - ailaunch.exe to ailaunch_hs.exe * new UID for Active Idle (aifw_hs.dll, aiidleint_hs.dll and homescreen.exe): #define AI_UID3_AIFW_COMMON 0xEDFF45C4 (was 0x102750F0 = 271012080) * new UID for cputils_hs.dll: 0xE3E7134E (was 0x20016B7F = 536963967) * new UID for AI Utilities Factory (aiutils_hs.dll): 0xEC55106C (was 0x10281865 = 271063141) * new UID for MenuInterface_hs.dll: 0xEEE24485 (was 0x10210EAB = 270601899) * new UID for XCFW_hs.dll: 0xEB12332F (was 0x10210EA0 = 270601888) * new UID for ailaunch_hs.exe: 0xEF5A047A (was 0x200286E3 = 537036515) diff -r 282cea3dd14c -r 666a2952b5b3 .project --- a/.project Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - homescreensrv - - - - - - com.nokia.carbide.cdt.builder.carbideCPPBuilder - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - com.nokia.carbide.cdt.builder.carbideCPPBuilderNature - - diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentharvester/factorysettingsplugin/group/chfactorysettingsplugin.mmp --- a/contentpublishingsrv/contentharvester/factorysettingsplugin/group/chfactorysettingsplugin.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentharvester/factorysettingsplugin/group/chfactorysettingsplugin.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -51,7 +51,7 @@ LIBRARY euser.lib LIBRARY estor.lib LIBRARY efsrv.lib -LIBRARY xcfw.lib +LIBRARY XCFW_hs.lib LIBRARY bafl.lib LIBRARY ecom.lib //AIW Plugin diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentharvester/factorysettingsplugin/inc/chfactorysettingsparser.h --- a/contentpublishingsrv/contentharvester/factorysettingsplugin/inc/chfactorysettingsparser.h Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentharvester/factorysettingsplugin/inc/chfactorysettingsparser.h Wed Apr 07 14:35:19 2010 +0200 @@ -37,7 +37,7 @@ /** * Factory Settings Observer. * - * @lib XCFW.lib + * @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class MADatFactorySettingsObserver diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingserver/cpserver/group/cpserver.mmp --- a/contentpublishingsrv/contentpublishingserver/cpserver/group/cpserver.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/group/cpserver.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -48,7 +48,7 @@ LIBRARY eikcore.lib LIBRARY cone.lib LIBRARY estor.lib -LIBRARY cputils.lib +LIBRARY cputils_hs.lib LIBRARY cpstorage.lib LIBRARY inetprotutil.lib #ifdef CONTENT_PUBLISHER_DEBUG diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingserver/cpsqlitestorage/group/cpstorage.mmp --- a/contentpublishingsrv/contentpublishingserver/cpsqlitestorage/group/cpstorage.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpsqlitestorage/group/cpstorage.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -39,7 +39,7 @@ LIBRARY estor.lib LIBRARY sqldb.lib LIBRARY efsrv.lib -LIBRARY cputils.lib +LIBRARY cputils_hs.lib LIBRARY liwservicehandler.lib LIBRARY centralrepository.lib diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/contentpublishingmap/bwins/cputils_hsu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/bwins/cputils_hsu.def Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,16 @@ +EXPORTS + ?GetProperty@CCPLiwMap@@QBEHABVTDesC8@@AAJ@Z @ 1 NONAME ; int CCPLiwMap::GetProperty(class TDesC8 const &, long &) const + ?GetPropertyL@CCPLiwMap@@QBEHABVTDesC8@@AAVRBuf16@@@Z @ 2 NONAME ; int CCPLiwMap::GetPropertyL(class TDesC8 const &, class RBuf16 &) const + ?GetPropertyL@CCPLiwMap@@QBEHABVTDesC8@@AAVRBuf8@@@Z @ 3 NONAME ; int CCPLiwMap::GetPropertyL(class TDesC8 const &, class RBuf8 &) const + ?IsValidForActionL@CCPLiwMap@@QBEXXZ @ 4 NONAME ; void CCPLiwMap::IsValidForActionL(void) const + ?IsValidForNotificationL@CCPLiwMap@@QBEXXZ @ 5 NONAME ; void CCPLiwMap::IsValidForNotificationL(void) const + ?NewL@CCPLiwMap@@SAPAV1@AAVRDesReadStream@@@Z @ 6 NONAME ; class CCPLiwMap * CCPLiwMap::NewL(class RDesReadStream &) + ?NewL@CCPLiwMap@@SAPAV1@ABVCLiwGenericParamList@@@Z @ 7 NONAME ; class CCPLiwMap * CCPLiwMap::NewL(class CLiwGenericParamList const &) + ?NewL@CContentMap@@SAPAV1@XZ @ 8 NONAME ; class CContentMap * CContentMap::NewL(void) + ?NewL@CPublisherRegistryMap@@SAPAV1@XZ @ 9 NONAME ; class CPublisherRegistryMap * CPublisherRegistryMap::NewL(void) + ?NewLC@CContentMap@@SAPAV1@XZ @ 10 NONAME ; class CContentMap * CContentMap::NewLC(void) + ?NewLC@CPublisherRegistryMap@@SAPAV1@XZ @ 11 NONAME ; class CPublisherRegistryMap * CPublisherRegistryMap::NewLC(void) + ?PackForServerLC@CCPLiwMap@@QBEPAVHBufC8@@XZ @ 12 NONAME ; class HBufC8 * CCPLiwMap::PackForServerLC(void) const + ?Reset@CCPLiwMap@@QBEXXZ @ 13 NONAME ; void CCPLiwMap::Reset(void) const + ?SetSecurityL@CCPLiwMap@@QAEXABVRMessage2@@@Z @ 14 NONAME ; void CCPLiwMap::SetSecurityL(class RMessage2 const &) + diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/contentpublishingmap/bwins/cputilsu.def --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/bwins/cputilsu.def Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -EXPORTS - ?GetProperty@CCPLiwMap@@QBEHABVTDesC8@@AAJ@Z @ 1 NONAME ; int CCPLiwMap::GetProperty(class TDesC8 const &, long &) const - ?GetPropertyL@CCPLiwMap@@QBEHABVTDesC8@@AAVRBuf16@@@Z @ 2 NONAME ; int CCPLiwMap::GetPropertyL(class TDesC8 const &, class RBuf16 &) const - ?GetPropertyL@CCPLiwMap@@QBEHABVTDesC8@@AAVRBuf8@@@Z @ 3 NONAME ; int CCPLiwMap::GetPropertyL(class TDesC8 const &, class RBuf8 &) const - ?IsValidForActionL@CCPLiwMap@@QBEXXZ @ 4 NONAME ; void CCPLiwMap::IsValidForActionL(void) const - ?IsValidForNotificationL@CCPLiwMap@@QBEXXZ @ 5 NONAME ; void CCPLiwMap::IsValidForNotificationL(void) const - ?NewL@CCPLiwMap@@SAPAV1@AAVRDesReadStream@@@Z @ 6 NONAME ; class CCPLiwMap * CCPLiwMap::NewL(class RDesReadStream &) - ?NewL@CCPLiwMap@@SAPAV1@ABVCLiwGenericParamList@@@Z @ 7 NONAME ; class CCPLiwMap * CCPLiwMap::NewL(class CLiwGenericParamList const &) - ?NewL@CContentMap@@SAPAV1@XZ @ 8 NONAME ; class CContentMap * CContentMap::NewL(void) - ?NewL@CPublisherRegistryMap@@SAPAV1@XZ @ 9 NONAME ; class CPublisherRegistryMap * CPublisherRegistryMap::NewL(void) - ?NewLC@CContentMap@@SAPAV1@XZ @ 10 NONAME ; class CContentMap * CContentMap::NewLC(void) - ?NewLC@CPublisherRegistryMap@@SAPAV1@XZ @ 11 NONAME ; class CPublisherRegistryMap * CPublisherRegistryMap::NewLC(void) - ?PackForServerLC@CCPLiwMap@@QBEPAVHBufC8@@XZ @ 12 NONAME ; class HBufC8 * CCPLiwMap::PackForServerLC(void) const - ?Reset@CCPLiwMap@@QBEXXZ @ 13 NONAME ; void CCPLiwMap::Reset(void) const - ?SetSecurityL@CCPLiwMap@@QAEXABVRMessage2@@@Z @ 14 NONAME ; void CCPLiwMap::SetSecurityL(class RMessage2 const &) - diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/contentpublishingmap/eabi/cputils_hsu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/eabi/cputils_hsu.def Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,18 @@ +EXPORTS + _ZN11CContentMap4NewLEv @ 1 NONAME + _ZN11CContentMap5NewLCEv @ 2 NONAME + _ZN21CPublisherRegistryMap4NewLEv @ 3 NONAME + _ZN21CPublisherRegistryMap5NewLCEv @ 4 NONAME + _ZN9CCPLiwMap12SetSecurityLERK9RMessage2 @ 5 NONAME + _ZN9CCPLiwMap4NewLER14RDesReadStream @ 6 NONAME + _ZN9CCPLiwMap4NewLERK20CLiwGenericParamList @ 7 NONAME + _ZNK9CCPLiwMap11GetPropertyERK6TDesC8Rl @ 8 NONAME + _ZNK9CCPLiwMap12GetPropertyLERK6TDesC8R5RBuf8 @ 9 NONAME + _ZNK9CCPLiwMap12GetPropertyLERK6TDesC8R6RBuf16 @ 10 NONAME + _ZNK9CCPLiwMap15PackForServerLCEv @ 11 NONAME + _ZNK9CCPLiwMap17IsValidForActionLEv @ 12 NONAME + _ZNK9CCPLiwMap23IsValidForNotificationLEv @ 13 NONAME + _ZNK9CCPLiwMap5ResetEv @ 14 NONAME + _ZTI9CCPLiwMap @ 15 NONAME ; ## + _ZTV9CCPLiwMap @ 16 NONAME ; ## + diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/contentpublishingmap/eabi/cputilsu.def --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/eabi/cputilsu.def Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -EXPORTS - _ZN11CContentMap4NewLEv @ 1 NONAME - _ZN11CContentMap5NewLCEv @ 2 NONAME - _ZN21CPublisherRegistryMap4NewLEv @ 3 NONAME - _ZN21CPublisherRegistryMap5NewLCEv @ 4 NONAME - _ZN9CCPLiwMap12SetSecurityLERK9RMessage2 @ 5 NONAME - _ZN9CCPLiwMap4NewLER14RDesReadStream @ 6 NONAME - _ZN9CCPLiwMap4NewLERK20CLiwGenericParamList @ 7 NONAME - _ZNK9CCPLiwMap11GetPropertyERK6TDesC8Rl @ 8 NONAME - _ZNK9CCPLiwMap12GetPropertyLERK6TDesC8R5RBuf8 @ 9 NONAME - _ZNK9CCPLiwMap12GetPropertyLERK6TDesC8R6RBuf16 @ 10 NONAME - _ZNK9CCPLiwMap15PackForServerLCEv @ 11 NONAME - _ZNK9CCPLiwMap17IsValidForActionLEv @ 12 NONAME - _ZNK9CCPLiwMap23IsValidForNotificationLEv @ 13 NONAME - _ZNK9CCPLiwMap5ResetEv @ 14 NONAME - _ZTI9CCPLiwMap @ 15 NONAME ; ## - _ZTV9CCPLiwMap @ 16 NONAME ; ## - diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/contentpublishingmap/group/cputils.mmp --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/group/cputils.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/group/cputils.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -18,10 +18,12 @@ // To get the MW_LAYER_SYSTEMINCLUDE-definition #include -TARGET cputils.dll +TARGET cputils_hs.dll TARGETTYPE dll -UID 0x1000008D 0x20016B7F +// new UID for cputils_hs.dll +// UID 0x1000008D 0x20016B7F +UID 0x1000008D 0xE3E7134E CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/ccontentmap.h --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/ccontentmap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/ccontentmap.h Wed Apr 07 14:35:19 2010 +0200 @@ -25,7 +25,7 @@ * Map which contains ids and serialized data stored by * Content Publisher * - * @lib cputils.dll + * @lib cputils_hs_hs.dll * @since S60 v5.0 */ NONSHARABLE_CLASS( CContentMap ): public CCPLiwMap diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpliwmap.h --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpliwmap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpliwmap.h Wed Apr 07 14:35:19 2010 +0200 @@ -29,7 +29,7 @@ /** * Base Map class for Publisher Registry and Content * - * @lib cputils.dll + * @lib cputils_hs_hs.dll * @since S60 v5.0 */ class CCPLiwMap : public CLiwMap diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpublisherregistrymap.h --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpublisherregistrymap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpublisherregistrymap.h Wed Apr 07 14:35:19 2010 +0200 @@ -24,7 +24,7 @@ /** * Map which contains Publisher Registry information * - * @lib cputils.dll + * @lib cputils_hs_hs.dll * @since S60 v5.0 */ NONSHARABLE_CLASS( CPublisherRegistryMap ): public CCPLiwMap diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/contentpublishingutils/pluginvalidator/inc/charvesterpluginvalidator.h --- a/contentpublishingsrv/contentpublishingutils/pluginvalidator/inc/charvesterpluginvalidator.h Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/pluginvalidator/inc/charvesterpluginvalidator.h Wed Apr 07 14:35:19 2010 +0200 @@ -29,7 +29,8 @@ //CONSTS //PubSub Category AI plug-in registry API -const TUid KPSUidActiveIdle2 = {0x102750F0}; // ActiveIdle2 SID +// changed from 0x102750F0 to 0xEDFF45C4 for standalone app +const TUid KPSUidActiveIdle2 = {0xEDFF45C4}; // ActiveIdle2 SID // Indicates that all the CPS Harvester plugins have been updated const TUint KActiveIdleCpsPluginsUpdated = 0x0000000C; enum EPSActiveIdleCpsPluginsUpdated diff -r 282cea3dd14c -r 666a2952b5b3 contentpublishingsrv/rom/contentpublishingservice.iby --- a/contentpublishingsrv/rom/contentpublishingservice.iby Fri Apr 02 20:17:48 2010 +0200 +++ b/contentpublishingsrv/rom/contentpublishingservice.iby Wed Apr 07 14:35:19 2010 +0200 @@ -21,7 +21,7 @@ file=ABI_DIR\BUILD_DIR\cpserver.exe SHARED_LIB_DIR\cpserver.exe file=ABI_DIR\BUILD_DIR\cpstorage.dll SHARED_LIB_DIR\cpstorage.dll -file=ABI_DIR\BUILD_DIR\cputils.dll SHARED_LIB_DIR\cputils.dll +file=ABI_DIR\BUILD_DIR\cputils_hs.dll SHARED_LIB_DIR\cputils_hs.dll file=ABI_DIR\BUILD_DIR\contentharvesterclient.dll SHARED_LIB_DIR\contentharvesterclient.dll file=ABI_DIR\BUILD_DIR\contentharvester.exe SHARED_LIB_DIR\contentharvester.exe file=ABI_DIR\BUILD_DIR\pluginvalidator.dll SHARED_LIB_DIR\pluginvalidator.dll diff -r 282cea3dd14c -r 666a2952b5b3 dependencies/uncategorized/ccontentmap.h --- a/dependencies/uncategorized/ccontentmap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/dependencies/uncategorized/ccontentmap.h Wed Apr 07 14:35:19 2010 +0200 @@ -25,7 +25,7 @@ * Map which contains ids and serialized data stored by * Content Publisher * - * @lib cputils.dll + * @lib cputils_hs_hs.dll * @since S60 v5.0 */ NONSHARABLE_CLASS( CContentMap ): public CCPLiwMap diff -r 282cea3dd14c -r 666a2952b5b3 dependencies/uncategorized/cpliwmap.h --- a/dependencies/uncategorized/cpliwmap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/dependencies/uncategorized/cpliwmap.h Wed Apr 07 14:35:19 2010 +0200 @@ -29,7 +29,7 @@ /** * Base Map class for Publisher Registry and Content * - * @lib cputils.dll + * @lib cputils_hs_hs.dll * @since S60 v5.0 */ class CCPLiwMap : public CLiwMap diff -r 282cea3dd14c -r 666a2952b5b3 homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp --- a/homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp Wed Apr 07 14:35:19 2010 +0200 @@ -79,7 +79,8 @@ _LIT( KDummyVersionInfo, "dummyversioninfo" ); const TUint KAppId_hspsAS = 270486738; // 0x101F4CD2 from S60 3.1 Xuikon AppShell in 3.1 product. -const TUint KAppId_hspsAI = 271012080 ; // 0x102750F0 support for Xuikon-based ActiveIdle +// changed from 0x102750F0 = 271012080 to 0xEDFF45C4 = 3992929732 for standalone app +const TUint KAppId_hspsAI = 3992929732 ; // 0xEDFF45C4 support for Xuikon-based ActiveIdle const TUint KAppId_LE = 270551469 ; // 0x102049AD LayoutTest const TInt KAppIdAny = -1; // All applications diff -r 282cea3dd14c -r 666a2952b5b3 homescreenpluginsrv/inc/hspsthememanagement.h --- a/homescreenpluginsrv/inc/hspsthememanagement.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreenpluginsrv/inc/hspsthememanagement.h Wed Apr 07 14:35:19 2010 +0200 @@ -155,7 +155,8 @@ const TUid KSecureId_LE = {0x102049AD}; const TUid KSecureId_XTA = {0x1020747D}; // Xuikon Test Automation const TUid KSecureId_XKON = {0x102049AF}; // Xuikon Demo -const TUid KSecureId_hspsAI = {0x102750F0}; // 271012080 support for Xuikon-based ActiveIdle +// changed from 0x102750F0 = 271012080 to 0xEDFF45C4 = 3992929732 for standalone app +const TUid KSecureId_hspsAI = {0xEDFF45C4}; // 3992929732 support for Xuikon-based ActiveIdle const TUid KSecureId_GS = {0x100058EC}; // S60 3.1 GS-application(General Settings). const TUid KSecureId_HUIMenu = {0x102828BD}; const TUid KSecureId_EUnit = {0x20000FB1}; diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/ai_plugin_information_api/ai_plugin_information_api.metaxml --- a/homescreensrv_plat/ai_plugin_information_api/ai_plugin_information_api.metaxml Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/ai_plugin_information_api/ai_plugin_information_api.metaxml Wed Apr 07 14:35:19 2010 +0200 @@ -5,7 +5,7 @@ c++ activeidle - + diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/ai_plugin_information_api/inc/activeidle2domainpskeys.h --- a/homescreensrv_plat/ai_plugin_information_api/inc/activeidle2domainpskeys.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/ai_plugin_information_api/inc/activeidle2domainpskeys.h Wed Apr 07 14:35:19 2010 +0200 @@ -148,7 +148,8 @@ /** * PubSub Category AI plug-in registry API */ -const TUid KPSUidActiveIdle2 = {0x102750F0}; // ActiveIdle2 SID +// changed from 0x102750F0 to 0xEDFF45C4 for standalone app +const TUid KPSUidActiveIdle2 = {0xEDFF45C4}; // ActiveIdle2 SID /** * diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/ai_plugin_management_api/ai_plugin_management_api.metaxml --- a/homescreensrv_plat/ai_plugin_management_api/ai_plugin_management_api.metaxml Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/ai_plugin_management_api/ai_plugin_management_api.metaxml Wed Apr 07 14:35:19 2010 +0200 @@ -5,7 +5,7 @@ c++ activeidle - + diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/ai_plugin_management_api/inc/aiscutdefs.h --- a/homescreensrv_plat/ai_plugin_management_api/inc/aiscutdefs.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/ai_plugin_management_api/inc/aiscutdefs.h Wed Apr 07 14:35:19 2010 +0200 @@ -28,7 +28,8 @@ // ============================================================================= // Active Idle UID. -const TUid KScutActiveIdleUid = { 0x102750F0 }; +// changed from 0x102750F0 to 0xEDFF45C4 for standalone app +const TUid KScutActiveIdleUid = { 0xEDFF45C4 }; // Shortcut Settings DLL UID. const TUid KScutSettingsDllUid = { AI_UID_ECOM_DLL_SETTINGS_SCUTPLUGIN }; diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/ai_utilities_api/ai_utilities_api.metaxml --- a/homescreensrv_plat/ai_utilities_api/ai_utilities_api.metaxml Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/ai_utilities_api/ai_utilities_api.metaxml Wed Apr 07 14:35:19 2010 +0200 @@ -5,7 +5,7 @@ c++ activeidle - + diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/ai_utilities_api/inc/contentprioritymap.h --- a/homescreensrv_plat/ai_utilities_api/inc/contentprioritymap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/ai_utilities_api/inc/contentprioritymap.h Wed Apr 07 14:35:19 2010 +0200 @@ -27,7 +27,7 @@ /** * Content priority map for UI controllers. * - * @lib aiutils.lib + * @lib aiutils_hs_hs.lib * @since S60 3.2 */ class CContentPriorityMap : public CBase diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/menu_content_service_api/tsrc/group/mcsapitest.mmp --- a/homescreensrv_plat/menu_content_service_api/tsrc/group/mcsapitest.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/menu_content_service_api/tsrc/group/mcsapitest.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -56,7 +56,7 @@ LIBRARY swinstcli.lib LIBRARY aknicon.lib ///Sat -LIBRARY menuinterface.lib +LIBRARY MenuInterface_hs.lib LIBRARY mcsmenuutils.lib LANG SC diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/menu_sat_interface_api/inc/MenuSatInterface.h --- a/homescreensrv_plat/menu_sat_interface_api/inc/MenuSatInterface.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/menu_sat_interface_api/inc/MenuSatInterface.h Wed Apr 07 14:35:19 2010 +0200 @@ -30,7 +30,7 @@ /** * Interface for accessing application shell externally. * -* @lib MenuInterface.dll +* @lib MenuInterface_hs_hs.dll * @since Series 60 3.1 */ class CMenuSATInterface : public CBase diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml --- a/homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml Wed Apr 07 14:35:19 2010 +0200 @@ -5,7 +5,7 @@ c++ menucontentsrv - + diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest.mmp --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -33,7 +33,7 @@ LIBRARY euser.lib LIBRARY stiftestinterface.lib -LIBRARY MenuInterface.lib +LIBRARY MenuInterface_hs.lib LANG SC diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/sapi_contentpublishing/group/cpclient.mmp --- a/homescreensrv_plat/sapi_contentpublishing/group/cpclient.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/group/cpclient.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -54,7 +54,7 @@ LIBRARY estor.lib LIBRARY efsrv.lib LIBRARY liwservicehandler.lib -LIBRARY cputils.lib +LIBRARY cputils_hs.lib #ifdef CONTENT_PUBLISHER_DEBUG LIBRARY cpdebug.lib diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/src/mt_hspsconfigurationif.cpp --- a/homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/src/mt_hspsconfigurationif.cpp Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/src/mt_hspsconfigurationif.cpp Wed Apr 07 14:35:19 2010 +0200 @@ -176,7 +176,8 @@ { // Remove all resource files from the test client's private folder (files are // copied back when an application configuration is fecthed) - _LIT( KClientFolder, "c:\\private\\102750f0\\"); + // changed from 0x102750F0 to 0xEDFF45C4 for standalone app + _LIT( KClientFolder, "c:\\private\\EDFF45C4\\"); TFileName folderPath; folderPath.Copy( KClientFolder ); if( BaflUtils::FolderExists( iFileserver, folderPath ) ) @@ -191,7 +192,8 @@ } folderPath.Copy( KClientFolder ); - folderPath.Append( _L("271012080\\") ); + // changed from 0x102750F0 = 271012080 to 0xEDFF45C4 = 3992929732 for standalone app + folderPath.Append( _L("3992929732\\") ); if( BaflUtils::FolderExists( iFileserver, folderPath ) ) { User::LeaveIfError( fileMan->RmDir( folderPath ) ); diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/inc/gecoattributeprovider.h --- a/homescreensrv_plat/xcfw_api/inc/gecoattributeprovider.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/inc/gecoattributeprovider.h Wed Apr 07 14:35:19 2010 +0200 @@ -28,7 +28,7 @@ * to allow generic access to attribute names/values/localisation reference ids * and possible object text data in string format. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class MGECOAttributeProvider diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/inc/gecodefaultobject.h --- a/homescreensrv_plat/xcfw_api/inc/gecodefaultobject.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/inc/gecodefaultobject.h Wed Apr 07 14:35:19 2010 +0200 @@ -31,7 +31,7 @@ * Default implementation for CGECOObjectBase * Implements basic descriptor type arrays for storing object attributes. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CGECODefaultObject: public CGECOObjectBase, public MGECOAttributeProvider diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/inc/gecodefaultobjectfactory.h --- a/homescreensrv_plat/xcfw_api/inc/gecodefaultobjectfactory.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/inc/gecodefaultobjectfactory.h Wed Apr 07 14:35:19 2010 +0200 @@ -30,7 +30,7 @@ /** * Generic content object factory. All object factories derive from this class. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CGECODefaultObjectFactory: public CGECOObjectFactoryBase diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/inc/gecoobjectbase.h --- a/homescreensrv_plat/xcfw_api/inc/gecoobjectbase.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/inc/gecoobjectbase.h Wed Apr 07 14:35:19 2010 +0200 @@ -29,7 +29,7 @@ * Generic Content Object Base Class * Base class that all content objects derive from. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CGECOObjectBase : public CBase diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/inc/gecoobjectfactorybase.h --- a/homescreensrv_plat/xcfw_api/inc/gecoobjectfactorybase.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/inc/gecoobjectfactorybase.h Wed Apr 07 14:35:19 2010 +0200 @@ -33,7 +33,7 @@ * Abstract base class for object factories. * All object factories derive from this class. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CGECOObjectFactoryBase: public CBase, diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/inc/xcfwengine.h --- a/homescreensrv_plat/xcfw_api/inc/xcfwengine.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/inc/xcfwengine.h Wed Apr 07 14:35:19 2010 +0200 @@ -44,7 +44,7 @@ /** * Engine observer interface. Engine user must implement this interface * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class MXCFWEngineObserver @@ -84,7 +84,7 @@ * Responsible for internalizing / externalizing XML files * to and from a XCFW tree * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CXCFWEngine: public CActive, diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/inc/xcfwnodeinterface.h --- a/homescreensrv_plat/xcfw_api/inc/xcfwnodeinterface.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/inc/xcfwnodeinterface.h Wed Apr 07 14:35:19 2010 +0200 @@ -31,7 +31,7 @@ * * Node interface for accessing data and relative nodes * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class MXCFWNode diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/inc/xcfwtree.h --- a/homescreensrv_plat/xcfw_api/inc/xcfwtree.h Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/inc/xcfwtree.h Wed Apr 07 14:35:19 2010 +0200 @@ -39,7 +39,7 @@ * XCFW Tree interface * Provides access to tree functions * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class MXCFWTree @@ -153,7 +153,7 @@ /** * CXCFWTree implements MXCFWTree interface. It owns the actual tree nodes. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CXCFWTree : public CBase, public MXCFWTree diff -r 282cea3dd14c -r 666a2952b5b3 homescreensrv_plat/xcfw_api/xcfw_api.metaxml --- a/homescreensrv_plat/xcfw_api/xcfw_api.metaxml Fri Apr 02 20:17:48 2010 +0200 +++ b/homescreensrv_plat/xcfw_api/xcfw_api.metaxml Wed Apr 07 14:35:19 2010 +0200 @@ -5,7 +5,7 @@ c++ xcfw - + diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/BWINS/aiidleintU.def --- a/idlefw/BWINS/aiidleintU.def Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -EXPORTS - ?NewLC@CAiIdleAppRegister@@SAPAV1@XZ @ 1 NONAME ; class CAiIdleAppRegister * CAiIdleAppRegister::NewLC(void) - ?NewL@CAiWsPluginManager@@SAPAV1@AAVCCoeEnv@@@Z @ 2 NONAME ; class CAiWsPluginManager * CAiWsPluginManager::NewL(class CCoeEnv &) - ?NewL@CAiUiIdleIntegration@@SAPAV1@AAVCEikonEnv@@ABUTAiIdleKeySoundConfig@@PAVMAiFwEventHandler@@@Z @ 3 NONAME ; class CAiUiIdleIntegration * CAiUiIdleIntegration::NewL(class CEikonEnv &, struct TAiIdleKeySoundConfig const &, class MAiFwEventHandler *) - diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/BWINS/aiidleint_hsU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlefw/BWINS/aiidleint_hsU.def Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,5 @@ +EXPORTS + ?NewLC@CAiIdleAppRegister@@SAPAV1@XZ @ 1 NONAME ; class CAiIdleAppRegister * CAiIdleAppRegister::NewLC(void) + ?NewL@CAiWsPluginManager@@SAPAV1@AAVCCoeEnv@@@Z @ 2 NONAME ; class CAiWsPluginManager * CAiWsPluginManager::NewL(class CCoeEnv &) + ?NewL@CAiUiIdleIntegration@@SAPAV1@AAVCEikonEnv@@ABUTAiIdleKeySoundConfig@@PAVMAiFwEventHandler@@@Z @ 3 NONAME ; class CAiUiIdleIntegration * CAiUiIdleIntegration::NewL(class CEikonEnv &, struct TAiIdleKeySoundConfig const &, class MAiFwEventHandler *) + diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/BWINS/aiutilsU.DEF --- a/idlefw/BWINS/aiutilsU.DEF Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -EXPORTS - ?CreateContentItemArrayIteratorL@AiUtility@@YAPAVMAiContentItemIterator@@PBUTAiContentItem@@H@Z @ 1 NONAME ; class MAiContentItemIterator * AiUtility::CreateContentItemArrayIteratorL(struct TAiContentItem const *, int) - ?CreatePSPropertyObserverL@AiUtility@@YAPAVMAiPSPropertyObserver@@VTCallBack@@VTUid@@H@Z @ 2 NONAME ; class MAiPSPropertyObserver * AiUtility::CreatePSPropertyObserverL(class TCallBack, class TUid, int) - ?CreatePluginSettingsL@AiUtility@@YAPAVMAiPluginSettings@@XZ @ 3 NONAME ; class MAiPluginSettings * AiUtility::CreatePluginSettingsL(void) - ?CreateStrParserL@AiUtility@@YAPAVMAiStrParser@@XZ @ 4 NONAME ; class MAiStrParser * AiUtility::CreateStrParserL(void) - ?CopyToBufferL@AiUtility@@YAPAVHBufC16@@PAV2@ABVTDesC16@@@Z @ 5 NONAME ; class HBufC16 * AiUtility::CopyToBufferL(class HBufC16 *, class TDesC16 const &) - ?CopyToBufferL@AiUtility@@YAPAVHBufC16@@PAV2@ABVTDesC8@@@Z @ 6 NONAME ; class HBufC16 * AiUtility::CopyToBufferL(class HBufC16 *, class TDesC8 const &) - ?CopyToBufferL@AiUtility@@YAPAVHBufC8@@PAV2@ABVTDesC16@@@Z @ 7 NONAME ; class HBufC8 * AiUtility::CopyToBufferL(class HBufC8 *, class TDesC16 const &) - ?CopyToBufferL@AiUtility@@YAPAVHBufC8@@PAV2@ABVTDesC8@@@Z @ 8 NONAME ; class HBufC8 * AiUtility::CopyToBufferL(class HBufC8 *, class TDesC8 const &) - ?EnsureBufMaxLengthL@AiUtility@@YA?AVTPtr16@@AAPAVHBufC16@@H@Z @ 9 NONAME ; class TPtr16 AiUtility::EnsureBufMaxLengthL(class HBufC16 * &, int) - ?ParseInt@AiUtility@@YAHAAJABVTDesC8@@@Z @ 10 NONAME ; int AiUtility::ParseInt(long &, class TDesC8 const &) - ?CreatePluginToolL@AiUtility@@YAPAVMAiPluginTool@@XZ @ 11 NONAME ; class MAiPluginTool * AiUtility::CreatePluginToolL(void) - ?ClearPriority@CContentPriorityMap@AiUtility@@QAEXABVTDesC8@@@Z @ 12 NONAME ; void AiUtility::CContentPriorityMap::ClearPriority(class TDesC8 const &) - ?CurrentPriority@CContentPriorityMap@AiUtility@@QBEHABVTDesC8@@@Z @ 13 NONAME ; int AiUtility::CContentPriorityMap::CurrentPriority(class TDesC8 const &) const - ?NewL@CContentPriorityMap@AiUtility@@SAPAV12@XZ @ 14 NONAME ; class AiUtility::CContentPriorityMap * AiUtility::CContentPriorityMap::NewL(void) - ?OverrideContent@CContentPriorityMap@AiUtility@@QBEHABVTDesC8@@H@Z @ 15 NONAME ; int AiUtility::CContentPriorityMap::OverrideContent(class TDesC8 const &, int) const - ?Reset@CContentPriorityMap@AiUtility@@QAEXXZ @ 16 NONAME ; void AiUtility::CContentPriorityMap::Reset(void) - ?SetCurrentPriority@CContentPriorityMap@AiUtility@@QAEHABVTDesC8@@H@Z @ 17 NONAME ; int AiUtility::CContentPriorityMap::SetCurrentPriority(class TDesC8 const &, int) - ?ParseInt@AiUtility@@YAHAAJABVTDesC16@@@Z @ 18 NONAME ; int AiUtility::ParseInt(long &, class TDesC16 const &) - diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/BWINS/aiutils_hsU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlefw/BWINS/aiutils_hsU.DEF Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,20 @@ +EXPORTS + ?CreateContentItemArrayIteratorL@AiUtility@@YAPAVMAiContentItemIterator@@PBUTAiContentItem@@H@Z @ 1 NONAME ; class MAiContentItemIterator * AiUtility::CreateContentItemArrayIteratorL(struct TAiContentItem const *, int) + ?CreatePSPropertyObserverL@AiUtility@@YAPAVMAiPSPropertyObserver@@VTCallBack@@VTUid@@H@Z @ 2 NONAME ; class MAiPSPropertyObserver * AiUtility::CreatePSPropertyObserverL(class TCallBack, class TUid, int) + ?CreatePluginSettingsL@AiUtility@@YAPAVMAiPluginSettings@@XZ @ 3 NONAME ; class MAiPluginSettings * AiUtility::CreatePluginSettingsL(void) + ?CreateStrParserL@AiUtility@@YAPAVMAiStrParser@@XZ @ 4 NONAME ; class MAiStrParser * AiUtility::CreateStrParserL(void) + ?CopyToBufferL@AiUtility@@YAPAVHBufC16@@PAV2@ABVTDesC16@@@Z @ 5 NONAME ; class HBufC16 * AiUtility::CopyToBufferL(class HBufC16 *, class TDesC16 const &) + ?CopyToBufferL@AiUtility@@YAPAVHBufC16@@PAV2@ABVTDesC8@@@Z @ 6 NONAME ; class HBufC16 * AiUtility::CopyToBufferL(class HBufC16 *, class TDesC8 const &) + ?CopyToBufferL@AiUtility@@YAPAVHBufC8@@PAV2@ABVTDesC16@@@Z @ 7 NONAME ; class HBufC8 * AiUtility::CopyToBufferL(class HBufC8 *, class TDesC16 const &) + ?CopyToBufferL@AiUtility@@YAPAVHBufC8@@PAV2@ABVTDesC8@@@Z @ 8 NONAME ; class HBufC8 * AiUtility::CopyToBufferL(class HBufC8 *, class TDesC8 const &) + ?EnsureBufMaxLengthL@AiUtility@@YA?AVTPtr16@@AAPAVHBufC16@@H@Z @ 9 NONAME ; class TPtr16 AiUtility::EnsureBufMaxLengthL(class HBufC16 * &, int) + ?ParseInt@AiUtility@@YAHAAJABVTDesC8@@@Z @ 10 NONAME ; int AiUtility::ParseInt(long &, class TDesC8 const &) + ?CreatePluginToolL@AiUtility@@YAPAVMAiPluginTool@@XZ @ 11 NONAME ; class MAiPluginTool * AiUtility::CreatePluginToolL(void) + ?ClearPriority@CContentPriorityMap@AiUtility@@QAEXABVTDesC8@@@Z @ 12 NONAME ; void AiUtility::CContentPriorityMap::ClearPriority(class TDesC8 const &) + ?CurrentPriority@CContentPriorityMap@AiUtility@@QBEHABVTDesC8@@@Z @ 13 NONAME ; int AiUtility::CContentPriorityMap::CurrentPriority(class TDesC8 const &) const + ?NewL@CContentPriorityMap@AiUtility@@SAPAV12@XZ @ 14 NONAME ; class AiUtility::CContentPriorityMap * AiUtility::CContentPriorityMap::NewL(void) + ?OverrideContent@CContentPriorityMap@AiUtility@@QBEHABVTDesC8@@H@Z @ 15 NONAME ; int AiUtility::CContentPriorityMap::OverrideContent(class TDesC8 const &, int) const + ?Reset@CContentPriorityMap@AiUtility@@QAEXXZ @ 16 NONAME ; void AiUtility::CContentPriorityMap::Reset(void) + ?SetCurrentPriority@CContentPriorityMap@AiUtility@@QAEHABVTDesC8@@H@Z @ 17 NONAME ; int AiUtility::CContentPriorityMap::SetCurrentPriority(class TDesC8 const &, int) + ?ParseInt@AiUtility@@YAHAAJABVTDesC16@@@Z @ 18 NONAME ; int AiUtility::ParseInt(long &, class TDesC16 const &) + diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/EABI/aiidleintU.def --- a/idlefw/EABI/aiidleintU.def Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -EXPORTS - _ZN18CAiWsPluginManager4NewLER7CCoeEnv @ 1 NONAME - _ZN18CAiIdleAppRegister5NewLCEv @ 2 NONAME - _ZN20CAiUiIdleIntegration4NewLER9CEikonEnvRK21TAiIdleKeySoundConfigP17MAiFwEventHandler @ 3 NONAME - diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/EABI/aiidleint_hsU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlefw/EABI/aiidleint_hsU.def Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,5 @@ +EXPORTS + _ZN18CAiWsPluginManager4NewLER7CCoeEnv @ 1 NONAME + _ZN18CAiIdleAppRegister5NewLCEv @ 2 NONAME + _ZN20CAiUiIdleIntegration4NewLER9CEikonEnvRK21TAiIdleKeySoundConfigP17MAiFwEventHandler @ 3 NONAME + diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/EABI/aiutilsU.DEF --- a/idlefw/EABI/aiutilsU.DEF Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -EXPORTS - _ZN9AiUtility16CreateStrParserLEv @ 1 NONAME - _ZN9AiUtility21CreatePluginSettingsLEv @ 2 NONAME - _ZN9AiUtility25CreatePSPropertyObserverLE9TCallBack4TUidi @ 3 NONAME - _ZN9AiUtility31CreateContentItemArrayIteratorLEPK14TAiContentItemi @ 4 NONAME - _ZN9AiUtility13CopyToBufferLEP6HBufC8RK6TDesC8 @ 5 NONAME - _ZN9AiUtility13CopyToBufferLEP6HBufC8RK7TDesC16 @ 6 NONAME - _ZN9AiUtility13CopyToBufferLEP7HBufC16RK6TDesC8 @ 7 NONAME - _ZN9AiUtility13CopyToBufferLEP7HBufC16RK7TDesC16 @ 8 NONAME - _ZN9AiUtility19EnsureBufMaxLengthLERP7HBufC16i @ 9 NONAME - _ZN9AiUtility8ParseIntERlRK6TDesC8 @ 10 NONAME - _ZN9AiUtility17CreatePluginToolLEv @ 11 NONAME - _ZN9AiUtility19CContentPriorityMap13ClearPriorityERK6TDesC8 @ 12 NONAME - _ZN9AiUtility19CContentPriorityMap18SetCurrentPriorityERK6TDesC8i @ 13 NONAME - _ZN9AiUtility19CContentPriorityMap4NewLEv @ 14 NONAME - _ZN9AiUtility19CContentPriorityMap5ResetEv @ 15 NONAME - _ZNK9AiUtility19CContentPriorityMap15CurrentPriorityERK6TDesC8 @ 16 NONAME - _ZNK9AiUtility19CContentPriorityMap15OverrideContentERK6TDesC8i @ 17 NONAME - _ZTIN9AiUtility19CContentPriorityMapE @ 18 NONAME ; ## - _ZTVN9AiUtility19CContentPriorityMapE @ 19 NONAME ; ## - _ZN9AiUtility8ParseIntERlRK7TDesC16 @ 20 NONAME - diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/EABI/aiutils_hsU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlefw/EABI/aiutils_hsU.DEF Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,22 @@ +EXPORTS + _ZN9AiUtility16CreateStrParserLEv @ 1 NONAME + _ZN9AiUtility21CreatePluginSettingsLEv @ 2 NONAME + _ZN9AiUtility25CreatePSPropertyObserverLE9TCallBack4TUidi @ 3 NONAME + _ZN9AiUtility31CreateContentItemArrayIteratorLEPK14TAiContentItemi @ 4 NONAME + _ZN9AiUtility13CopyToBufferLEP6HBufC8RK6TDesC8 @ 5 NONAME + _ZN9AiUtility13CopyToBufferLEP6HBufC8RK7TDesC16 @ 6 NONAME + _ZN9AiUtility13CopyToBufferLEP7HBufC16RK6TDesC8 @ 7 NONAME + _ZN9AiUtility13CopyToBufferLEP7HBufC16RK7TDesC16 @ 8 NONAME + _ZN9AiUtility19EnsureBufMaxLengthLERP7HBufC16i @ 9 NONAME + _ZN9AiUtility8ParseIntERlRK6TDesC8 @ 10 NONAME + _ZN9AiUtility17CreatePluginToolLEv @ 11 NONAME + _ZN9AiUtility19CContentPriorityMap13ClearPriorityERK6TDesC8 @ 12 NONAME + _ZN9AiUtility19CContentPriorityMap18SetCurrentPriorityERK6TDesC8i @ 13 NONAME + _ZN9AiUtility19CContentPriorityMap4NewLEv @ 14 NONAME + _ZN9AiUtility19CContentPriorityMap5ResetEv @ 15 NONAME + _ZNK9AiUtility19CContentPriorityMap15CurrentPriorityERK6TDesC8 @ 16 NONAME + _ZNK9AiUtility19CContentPriorityMap15OverrideContentERK6TDesC8i @ 17 NONAME + _ZTIN9AiUtility19CContentPriorityMapE @ 18 NONAME ; ## + _ZTVN9AiUtility19CContentPriorityMapE @ 19 NONAME ; ## + _ZN9AiUtility8ParseIntERlRK7TDesC16 @ 20 NONAME + diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/group/aifw.mmp --- a/idlefw/group/aifw.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/group/aifw.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -19,7 +19,7 @@ #include #include -TARGET aifw.dll +TARGET aifw_hs.dll TARGETTYPE dll UID 0x1000008D AI_UID3_AIFW_DLL VENDORID VID_DEFAULT @@ -74,7 +74,7 @@ LIBRARY networkhandling.lib // Active Idle internal dependencies -LIBRARY aiutils.lib aiidleint.lib +LIBRARY aiutils_hs.lib aiidleint_hs.lib // Debugging dependencies LIBRARY flogger.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/group/aiidleint.mmp --- a/idlefw/group/aiidleint.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/group/aiidleint.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -20,7 +20,7 @@ #include #include -TARGET aiidleint.dll +TARGET aiidleint_hs.dll TARGETTYPE dll UID 0x1000008D AI_UID3_AIFW_DLL VENDORID VID_DEFAULT @@ -48,4 +48,4 @@ LIBRARY cone.lib eikcore.lib LIBRARY avkon.lib aknnotify.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/group/aiutils.mmp --- a/idlefw/group/aiutils.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/group/aiutils.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -19,9 +19,11 @@ #include //#include -TARGET aiutils.dll +// new UID +// UID 0x1000008D 0x10281865 +TARGET aiutils_hs.dll TARGETTYPE dll -UID 0x1000008D 0x10281865 +UID 0x1000008D 0xEC55106C VENDORID VID_DEFAULT CAPABILITY CAP_GENERAL_DLL diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/group/homescreen.mmp --- a/idlefw/group/homescreen.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/group/homescreen.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -19,7 +19,7 @@ #include #include -TARGET homescreen.exe +TARGET homescreen_hs.exe TARGETTYPE exe UID 0x100039CE AI_UID3_AIFW_EXE SECUREID AI_SID_AIFW_EXE @@ -51,7 +51,7 @@ LIBRARY euser.lib LIBRARY apparc.lib -LIBRARY aifw.lib +LIBRARY aifw_hs.lib LIBRARY eikcore.lib LIBRARY ecom.lib LIBRARY flogger.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/hslaunch/group/hslaunch.mmp --- a/idlefw/hslaunch/group/hslaunch.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/hslaunch/group/hslaunch.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -17,14 +17,17 @@ #include -TARGET ailaunch.exe +TARGET ailaunch_hs.exe targettype exe -UID 0x1000008d 0x200286E3 +//new UID +// UID 0x1000008d 0x200286E3 +UID 0x1000008d 0xEF5A047A CAPABILITY ReadDeviceData WriteDeviceData VENDORID VID_DEFAULT -SECUREID 0x200286E3 +// SECUREID 0x200286E3 +SECUREID 0xEF5A047A EPOCHEAPSIZE 0x1000 0x100000 // 4KB - 1 MB EPOCSTACKSIZE 0x5000 diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/hslaunch/src/hslaunch.cpp --- a/idlefw/hslaunch/src/hslaunch.cpp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/hslaunch/src/hslaunch.cpp Wed Apr 07 14:35:19 2010 +0200 @@ -19,10 +19,11 @@ #include "hslaunch.h" // ========================= DECLARATIONS ================================== -_LIT( KHsExeName, "homescreen.exe" ); +_LIT( KHsExeName, "homescreen_hs.exe" ); _LIT( KHsProcessName, "Home screen" ); const TInt KSleepOnRetry = 250000; // 250ms -const TUid KPSCategoryUid = TUid::Uid( 0x200286E3 ); +// changed from 0x200286E3 to 0xEF5A047A for standalone app +const TUid KPSCategoryUid = TUid::Uid( 0xEF5A047A ); const TInt KPSCrashCountKey = 1; _LIT_SECURITY_POLICY_C1( KPSReadPolicy, ECapabilityReadDeviceData ); _LIT_SECURITY_POLICY_C1( KPSWritePolicy, ECapabilityWriteDeviceData ); diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aibackuprestorestatusobserver.h --- a/idlefw/inc/framework/aibackuprestorestatusobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aibackuprestorestatusobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -30,7 +30,7 @@ * * Publish and subscribe key observer * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aicallstatusobserver.h --- a/idlefw/inc/framework/aicallstatusobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aicallstatusobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -30,7 +30,7 @@ * * Publish and subscribe key observer * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aicontentpluginmanager.h --- a/idlefw/inc/framework/aicontentpluginmanager.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aicontentpluginmanager.h Wed Apr 07 14:35:19 2010 +0200 @@ -40,7 +40,7 @@ * * Content plugin manager class for Active idle framework. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( CAiContentPluginManager ) : public CBase diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aidevicestatusobserver.h --- a/idlefw/inc/framework/aidevicestatusobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aidevicestatusobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -24,7 +24,7 @@ /** * description * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ class MAiDeviceStatusObserver diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aienvironmentchangeobserver.h --- a/idlefw/inc/framework/aienvironmentchangeobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aienvironmentchangeobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -31,7 +31,7 @@ * * System enviroment change observer. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( CAiEnvironmentChangeObserver ) : public CBase, diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aifocusobserver.h --- a/idlefw/inc/framework/aifocusobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aifocusobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -33,7 +33,7 @@ * * Focus change observer. Using telephony idle visiblity PS. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aikeylockobserver.h --- a/idlefw/inc/framework/aikeylockobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aikeylockobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -30,7 +30,7 @@ * * Keylock status change observer. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/ailightstatusobserver.h --- a/idlefw/inc/framework/ailightstatusobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/ailightstatusobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -31,7 +31,7 @@ * * Publish and subscribe key observer * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aipluginfactory.h --- a/idlefw/inc/framework/aipluginfactory.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aipluginfactory.h Wed Apr 07 14:35:19 2010 +0200 @@ -41,7 +41,7 @@ * * Content plugin factory class for Active idle framework. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( CAiPluginFactory ) : public CBase diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aipluginlifecycleobserver.h --- a/idlefw/inc/framework/aipluginlifecycleobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aipluginlifecycleobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -40,7 +40,7 @@ /** * Plugin lifecycle observer base class. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ class MAiPluginLifecycleObserver diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aipluginstate.h --- a/idlefw/inc/framework/aipluginstate.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aipluginstate.h Wed Apr 07 14:35:19 2010 +0200 @@ -24,7 +24,7 @@ /** * Plugin state interface. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ class MAiPluginState diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aipluginstatemachine.h --- a/idlefw/inc/framework/aipluginstatemachine.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aipluginstatemachine.h Wed Apr 07 14:35:19 2010 +0200 @@ -94,7 +94,7 @@ * * Plugin state resource interface. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ class MAiPluginStateResources @@ -128,7 +128,7 @@ /** * Plugin state machine interface. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ class MAiPluginStateMachine : public MAiPluginStateResources diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aipluginstatemachineimpl.h --- a/idlefw/inc/framework/aipluginstatemachineimpl.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aipluginstatemachineimpl.h Wed Apr 07 14:35:19 2010 +0200 @@ -32,7 +32,7 @@ /** * Plugin state machine implementation. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( CAiPluginStateMachine ) : public CBase, diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aipluginstatemanager.h --- a/idlefw/inc/framework/aipluginstatemanager.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aipluginstatemanager.h Wed Apr 07 14:35:19 2010 +0200 @@ -40,7 +40,7 @@ /** * Plugin state manager implementation. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( CAiPluginStateManager ) : public CBase, diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aipsstatusobserver.h --- a/idlefw/inc/framework/aipsstatusobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aipsstatusobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -29,7 +29,7 @@ /** * description * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aissaverstatusobserver.h --- a/idlefw/inc/framework/aissaverstatusobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aissaverstatusobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -28,7 +28,7 @@ /** * Publish and subscribe key observer * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aistatealive.h --- a/idlefw/inc/framework/aistatealive.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aistatealive.h Wed Apr 07 14:35:19 2010 +0200 @@ -27,7 +27,7 @@ * * Alive active state * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( TAiStateAliveActive ) : public MAiPluginState @@ -52,7 +52,7 @@ /** * Alive inactive state * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( TAiStateAliveInactive ) : public MAiPluginState @@ -76,7 +76,7 @@ /** * Alive incall state * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( TAiStateAliveIncall ) : public MAiPluginState @@ -100,7 +100,7 @@ /** * Alive switch state * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( TAiStateAlive ) : public MAiPluginState, diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aistateidle.h --- a/idlefw/inc/framework/aistateidle.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aistateidle.h Wed Apr 07 14:35:19 2010 +0200 @@ -27,7 +27,7 @@ * * Idle state. * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( TAiStateIdle ) : public MAiPluginState diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aistatemanager.h --- a/idlefw/inc/framework/aistatemanager.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aistatemanager.h Wed Apr 07 14:35:19 2010 +0200 @@ -24,7 +24,7 @@ /** * description * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ class MAiStateManager diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aistatesuspended.h --- a/idlefw/inc/framework/aistatesuspended.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aistatesuspended.h Wed Apr 07 14:35:19 2010 +0200 @@ -26,7 +26,7 @@ * * Suspended state * - * @lib aifw + * @lib aifw_hs * @since S60 3.2 */ NONSHARABLE_CLASS( TAiStateSuspended ) : public MAiPluginState diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/framework/aiuiframeworkobserverimpl.h --- a/idlefw/inc/framework/aiuiframeworkobserverimpl.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/framework/aiuiframeworkobserverimpl.h Wed Apr 07 14:35:19 2010 +0200 @@ -30,7 +30,7 @@ * Active Idle framework. It is also a bridge between MAiUiFrameworkObserver * and Active Idle system state manager. * - * @lib aifw.lib + * @lib aifw_hs.lib * @since S60 3.2 */ NONSHARABLE_CLASS( CAiUiFrameworkObserverImpl ) diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/inc/utility/caipspropertyobserver.h --- a/idlefw/inc/utility/caipspropertyobserver.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/inc/utility/caipspropertyobserver.h Wed Apr 07 14:35:19 2010 +0200 @@ -28,7 +28,7 @@ * * Publish and subscribe key observer * - * @lib aiutils.lib + * @lib aiutils_hs_hs.lib * @since S60 3.2 */ diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/group/aidevstaplg.mmp --- a/idlefw/plugins/group/aidevstaplg.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/group/aidevstaplg.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -83,7 +83,7 @@ LIBRARY cdlengine.lib LIBRARY gdi.lib LIBRARY bitgdi.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib LIBRARY flogger.lib LIBRARY bafl.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/group/aiwsplugin.mmp --- a/idlefw/plugins/group/aiwsplugin.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/group/aiwsplugin.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -55,6 +55,6 @@ LIBRARY ptiengine.lib LIBRARY keylockpolicyapi.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib // End of File diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/mcsplugin/group/mcsplugin.mmp --- a/idlefw/plugins/mcsplugin/group/mcsplugin.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/mcsplugin/group/mcsplugin.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -58,7 +58,7 @@ LIBRARY egul.lib LIBRARY cone.lib LIBRARY ecom.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib LIBRARY aknskins.lib LIBRARY aknicon.lib LIBRARY mcsmenuutils.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/mcsplugin/group/mcspluginsettings.mmp --- a/idlefw/plugins/mcsplugin/group/mcspluginsettings.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/mcsplugin/group/mcspluginsettings.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -90,6 +90,6 @@ //LIBRARY flogger.lib LIBRARY mcsmenu.lib LIBRARY hspluginsettings.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib // End of File. diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/mcsplugin/publisher/src/mcsplugindata.cpp --- a/idlefw/plugins/mcsplugin/publisher/src/mcsplugindata.cpp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/mcsplugin/publisher/src/mcsplugindata.cpp Wed Apr 07 14:35:19 2010 +0200 @@ -24,7 +24,8 @@ using namespace HSPluginSettingsIf; -_LIT8( KAppUid, "271012080" ); +// changed from 0x102750F0 = 271012080 to 0xEDFF45C4 = 3992929732 for standalone app +_LIT8( KAppUid, "3992929732" ); _LIT( KMenuAttrParam, "param" ); _LIT( KMenuAttrLocked, "locked" ); _LIT8( KProperNameType, "type" ); diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsmodel.cpp --- a/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsmodel.cpp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsmodel.cpp Wed Apr 07 14:35:19 2010 +0200 @@ -41,7 +41,8 @@ _LIT( KMenuAttrParam, "param"); _LIT( KMenuAttrLocked, "locked"); _LIT8( KTrue, "true" ); -_LIT8( KAppUid, "271012080" ); +// changed from 0x102750F0 = 271012080 to 0xEDFF45C4 = 3992929732 for standalone app +_LIT8( KAppUid, "3992929732" ); _LIT8( KProperNameType, "type" ); _LIT8( KProperNameParam, "param" ); _LIT8( KProperNameUid, "uid" ); diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/profileplugin/group/aiprofileplugin.mmp --- a/idlefw/plugins/profileplugin/group/aiprofileplugin.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/profileplugin/group/aiprofileplugin.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -49,7 +49,7 @@ LIBRARY euser.lib LIBRARY cone.lib LIBRARY ecom.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib LIBRARY sssettings.lib LIBRARY profileeng.lib LIBRARY bafl.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/pslnactiveidleplugin/inc/pslnactiveidlepluginengine.h --- a/idlefw/plugins/pslnactiveidleplugin/inc/pslnactiveidlepluginengine.h Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/pslnactiveidleplugin/inc/pslnactiveidlepluginengine.h Wed Apr 07 14:35:19 2010 +0200 @@ -22,7 +22,8 @@ #include // UID of Active Idle. -const TUid KUidActiveIdle = { 0x102750F0 }; +// changed from 0x102750F0 to 0xEDFF45C4 for standalone app +const TUid KUidActiveIdle = { 0xEDFF45C4 }; class CPslnFWAppThemeHandler; diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/pslnactiveidleplugin/src/pslnactiveidlepluginengine.cpp --- a/idlefw/plugins/pslnactiveidleplugin/src/pslnactiveidlepluginengine.cpp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/pslnactiveidleplugin/src/pslnactiveidlepluginengine.cpp Wed Apr 07 14:35:19 2010 +0200 @@ -617,7 +617,7 @@ { if (!IsAiRunning()) { - _LIT(KAiExeName, "z:\\sys\\bin\\ailaunch.exe"); + _LIT(KAiExeName, "z:\\sys\\bin\\ailaunch_hs.exe"); RProcess process; TInt ret = process.Create(KAiExeName, KNullDesC); process.Resume(); diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/sapidataplugin/group/sapidataplugin.mmp --- a/idlefw/plugins/sapidataplugin/group/sapidataplugin.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/sapidataplugin/group/sapidataplugin.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -45,7 +45,7 @@ LIBRARY efsrv.lib LIBRARY liwservicehandler.lib LIBRARY ecom.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib LIBRARY cone.lib LIBRARY avkon.lib LIBRARY fbscli.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/shortcutplugin/group/aiscutplugin.mmp --- a/idlefw/plugins/shortcutplugin/group/aiscutplugin.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/shortcutplugin/group/aiscutplugin.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -115,7 +115,7 @@ LIBRARY avkon.lib LIBRARY aknnotify.lib LIBRARY featmgr.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib LIBRARY fbscli.lib LIBRARY aknicon.lib LIBRARY favouritesengine.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/plugins/wrtdataplugin/group/wrtdataplugin.mmp --- a/idlefw/plugins/wrtdataplugin/group/wrtdataplugin.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/plugins/wrtdataplugin/group/wrtdataplugin.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -44,7 +44,7 @@ LIBRARY efsrv.lib LIBRARY liwservicehandler.lib LIBRARY ecom.lib -LIBRARY aiutils.lib +LIBRARY aiutils_hs.lib LIBRARY cone.lib LIBRARY avkon.lib LIBRARY fbscli.lib diff -r 282cea3dd14c -r 666a2952b5b3 idlefw/rom/idlefw.iby --- a/idlefw/rom/idlefw.iby Fri Apr 02 20:17:48 2010 +0200 +++ b/idlefw/rom/idlefw.iby Wed Apr 07 14:35:19 2010 +0200 @@ -20,14 +20,14 @@ #define ACTIVEIDLE3_IBY // Active Idle application and registration file -S60_APP_EXE( ailaunch ) -S60_APP_EXE( homescreen ) +S60_APP_EXE( ailaunch_hs ) +S60_APP_EXE( homescreen_hs ) S60_APP_AIF_RSC( homescreen ) S60_APP_AIF_ICONS( homescreen ) -file=ABI_DIR\BUILD_DIR\aiutils.dll SHARED_LIB_DIR\aiutils.dll -file=ABI_DIR\BUILD_DIR\aiidleint.dll SHARED_LIB_DIR\aiidleint.dll -file=ABI_DIR\BUILD_DIR\aifw.dll SHARED_LIB_DIR\aifw.dll +file=ABI_DIR\BUILD_DIR\aiutils_hs.dll SHARED_LIB_DIR\aiutils_hs.dll +file=ABI_DIR\BUILD_DIR\aiidleint_hs.dll SHARED_LIB_DIR\aiidleint_hs.dll +file=ABI_DIR\BUILD_DIR\aifw_hs.dll SHARED_LIB_DIR\aifw_hs.dll // Content publishing plug-ins ECOM_PLUGIN( aidevstaplg.dll, aidevstaplg.rsc ) diff -r 282cea3dd14c -r 666a2952b5b3 inc/aisystemuids.hrh --- a/inc/aisystemuids.hrh Fri Apr 02 20:17:48 2010 +0200 +++ b/inc/aisystemuids.hrh Wed Apr 07 14:35:19 2010 +0200 @@ -77,7 +77,9 @@ /** * Common UID3 for Active Idle framework components. */ -#define AI_UID3_AIFW_COMMON 0x102750F0 +// new UID for new aifw_hs.dll +// #define AI_UID3_AIFW_COMMON 0x102750F0 +#define AI_UID3_AIFW_COMMON 0xEDFF45C4 /** * Uid3 for AI framework dll. diff -r 282cea3dd14c -r 666a2952b5b3 inc/ccontentmap.h --- a/inc/ccontentmap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/inc/ccontentmap.h Wed Apr 07 14:35:19 2010 +0200 @@ -25,7 +25,7 @@ * Map which contains ids and serialized data stored by * Content Publisher * - * @lib cputils.dll + * @lib cputils_hs_hs.dll * @since S60 v5.0 */ NONSHARABLE_CLASS( CContentMap ): public CCPLiwMap diff -r 282cea3dd14c -r 666a2952b5b3 inc/cpliwmap.h --- a/inc/cpliwmap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/inc/cpliwmap.h Wed Apr 07 14:35:19 2010 +0200 @@ -29,7 +29,7 @@ /** * Base Map class for Publisher Registry and Content * - * @lib cputils.dll + * @lib cputils_hs_hs.dll * @since S60 v5.0 */ class CCPLiwMap : public CLiwMap diff -r 282cea3dd14c -r 666a2952b5b3 inc/cpublisherregistrymap.h --- a/inc/cpublisherregistrymap.h Fri Apr 02 20:17:48 2010 +0200 +++ b/inc/cpublisherregistrymap.h Wed Apr 07 14:35:19 2010 +0200 @@ -24,7 +24,7 @@ /** * Map which contains Publisher Registry information * - * @lib cputils.dll + * @lib cputils_hs_hs.dll * @since S60 v5.0 */ NONSHARABLE_CLASS( CPublisherRegistryMap ): public CCPLiwMap diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/cenrep/menu2privatecrkeys.h --- a/menucontentsrv/cenrep/menu2privatecrkeys.h Fri Apr 02 20:17:48 2010 +0200 +++ b/menucontentsrv/cenrep/menu2privatecrkeys.h Wed Apr 07 14:35:19 2010 +0200 @@ -30,7 +30,7 @@ const TUint32 KMenuSatUIName = 0x00000003; const TUint32 KMenuSatUIIconId = 0x00000004; -//deprecated (no support anymore through MenuInterface.lib) +//deprecated (no support anymore through MenuInterface_hs.lib) const TUint32 KMenuUpdateData = 0x00000001; const TUint32 KMenuLVFlags = 0x00000005; const TUint32 KMenuIconPositionUpdate = 0x00000006; diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/group/mcsmenu.mmp --- a/menucontentsrv/group/mcsmenu.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/menucontentsrv/group/mcsmenu.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -126,5 +126,5 @@ LIBRARY WidgetRegistryClient.lib LIBRARY featmgr.lib LIBRARY liwServiceHandler.lib -LIBRARY xcfw.lib +LIBRARY XCFW_hs.lib diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/group/mcsmenueng.mmp --- a/menucontentsrv/group/mcsmenueng.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/menucontentsrv/group/mcsmenueng.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -51,7 +51,7 @@ LIBRARY euser.lib LIBRARY efsrv.lib -LIBRARY xcfw.lib +LIBRARY XCFW_hs.lib LIBRARY platformenv.lib LIBRARY flogger.lib LIBRARY sysutil.lib diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/menusatinterface/Bwins/MenuInterfaceU.DEF --- a/menucontentsrv/menusatinterface/Bwins/MenuInterfaceU.DEF Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -EXPORTS - ??0CMenuSATInterface@@QAE@XZ @ 1 NONAME ; CMenuSATInterface::CMenuSATInterface(void) - ?MakeSatUiVisible@CMenuSATInterface@@QAEHHABVTDesC16@@@Z @ 2 NONAME ; int CMenuSATInterface::MakeSatUiVisible(int, class TDesC16 const &) - ?MakeSatUiVisible@CMenuSATInterface@@QAEHHABVTDesC16@@E@Z @ 3 NONAME ; int CMenuSATInterface::MakeSatUiVisible(int, class TDesC16 const &, unsigned char) - diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/menusatinterface/Bwins/MenuInterface_hsU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/menucontentsrv/menusatinterface/Bwins/MenuInterface_hsU.DEF Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,5 @@ +EXPORTS + ??0CMenuSATInterface@@QAE@XZ @ 1 NONAME ; CMenuSATInterface::CMenuSATInterface(void) + ?MakeSatUiVisible@CMenuSATInterface@@QAEHHABVTDesC16@@@Z @ 2 NONAME ; int CMenuSATInterface::MakeSatUiVisible(int, class TDesC16 const &) + ?MakeSatUiVisible@CMenuSATInterface@@QAEHHABVTDesC16@@E@Z @ 3 NONAME ; int CMenuSATInterface::MakeSatUiVisible(int, class TDesC16 const &, unsigned char) + diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/menusatinterface/EABI/MenuInterfaceU.DEF --- a/menucontentsrv/menusatinterface/EABI/MenuInterfaceU.DEF Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -EXPORTS - _ZN17CMenuSATInterface16MakeSatUiVisibleEiRK7TDesC16 @ 1 NONAME - _ZN17CMenuSATInterface16MakeSatUiVisibleEiRK7TDesC16h @ 2 NONAME - _ZN17CMenuSATInterfaceC1Ev @ 3 NONAME - _ZN17CMenuSATInterfaceC2Ev @ 4 NONAME - diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/menusatinterface/EABI/MenuInterface_hsU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/menucontentsrv/menusatinterface/EABI/MenuInterface_hsU.DEF Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,6 @@ +EXPORTS + _ZN17CMenuSATInterface16MakeSatUiVisibleEiRK7TDesC16 @ 1 NONAME + _ZN17CMenuSATInterface16MakeSatUiVisibleEiRK7TDesC16h @ 2 NONAME + _ZN17CMenuSATInterfaceC1Ev @ 3 NONAME + _ZN17CMenuSATInterfaceC2Ev @ 4 NONAME + diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/menusatinterface/group/MenuInterface.mmp --- a/menucontentsrv/menusatinterface/group/MenuInterface.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/menucontentsrv/menusatinterface/group/MenuInterface.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -18,9 +18,11 @@ // To get the MW_LAYER_SYSTEMINCLUDE-definition #include -TARGET MenuInterface.dll +TARGET MenuInterface_hs.dll TARGETTYPE DLL -UID 0x1000008D 0x10210EAB +// new UID +// UID 0x1000008D 0x10210EAB +UID 0x1000008D 0xEEE24485 TARGETPATH /system/libs CAPABILITY CAP_GENERAL_DLL diff -r 282cea3dd14c -r 666a2952b5b3 menucontentsrv/rom/mcs.iby --- a/menucontentsrv/rom/mcs.iby Fri Apr 02 20:17:48 2010 +0200 +++ b/menucontentsrv/rom/mcs.iby Wed Apr 07 14:35:19 2010 +0200 @@ -29,7 +29,7 @@ #ifndef APPSHELL_IBY #define APPSHELL_IBY -file=ABI_DIR\BUILD_DIR\menuinterface.dll SHARED_LIB_DIR\menuinterface.dll +file=ABI_DIR\BUILD_DIR\MenuInterface_hs.dll SHARED_LIB_DIR\MenuInterface_hs.dll #endif //APPSHELL_IBY diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/bwins/XCFWU.DEF --- a/xcfw/bwins/XCFWU.DEF Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -EXPORTS - ??0CGECODefaultObject@@IAE@XZ @ 1 NONAME ; CGECODefaultObject::CGECODefaultObject(void) - ??0CGECODefaultObjectFactory@@IAE@XZ @ 2 NONAME ; CGECODefaultObjectFactory::CGECODefaultObjectFactory(void) - ??0CXCFWEntityConverter@@QAE@XZ @ 3 NONAME ; CXCFWEntityConverter::CXCFWEntityConverter(void) - ??1CGECODefaultObject@@UAE@XZ @ 4 NONAME ; CGECODefaultObject::~CGECODefaultObject(void) - ??1CGECODefaultObjectFactory@@UAE@XZ @ 5 NONAME ; CGECODefaultObjectFactory::~CGECODefaultObjectFactory(void) - ??1CXCFWEngine@@UAE@XZ @ 6 NONAME ; CXCFWEngine::~CXCFWEngine(void) - ??1CXCFWEntityConverter@@UAE@XZ @ 7 NONAME ; CXCFWEntityConverter::~CXCFWEntityConverter(void) - ??1CXCFWTree@@UAE@XZ @ 8 NONAME ; CXCFWTree::~CXCFWTree(void) - ?AddNodeL@CXCFWTree@@UAEPAVMXCFWNode@@PAVCGECOObjectBase@@@Z @ 9 NONAME ; class MXCFWNode * CXCFWTree::AddNodeL(class CGECOObjectBase *) - ?AddNodeL@CXCFWTree@@UAEPAVMXCFWNode@@PAVCGECOObjectBase@@PAV2@1@Z @ 10 NONAME ; class MXCFWNode * CXCFWTree::AddNodeL(class CGECOObjectBase *, class MXCFWNode *, class MXCFWNode *) - ?AddNodeL@CXCFWTree@@UAEPAVMXCFWNode@@PAVCGECOObjectBase@@PAV2@@Z @ 11 NONAME ; class MXCFWNode * CXCFWTree::AddNodeL(class CGECOObjectBase *, class MXCFWNode *) - ?AttributeDetailsL@CGECODefaultObject@@UAEXHAAVTPtrC16@@0AAH@Z @ 12 NONAME ; void CGECODefaultObject::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &, int &) - ?AttributeDetailsL@CGECODefaultObjectFactory@@UAEXHAAVTPtrC16@@0AAH@Z @ 13 NONAME ; void CGECODefaultObjectFactory::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &, int &) - ?AttributeDetailsL@CXCFWEngine@@UAEXHAAVTPtrC16@@0AAH@Z @ 14 NONAME ; void CXCFWEngine::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &, int &) - ?BaseConstructL@CGECODefaultObject@@IAEXABVTDesC16@@@Z @ 15 NONAME ; void CGECODefaultObject::BaseConstructL(class TDesC16 const &) - ?CancelOperation@CXCFWEngine@@QAEXXZ @ 16 NONAME ; void CXCFWEngine::CancelOperation(void) - ?CurrentState@CXCFWEngine@@QAE?AW4TXCFWEngineState@1@XZ @ 17 NONAME ; enum CXCFWEngine::TXCFWEngineState CXCFWEngine::CurrentState(void) - ?Data@CXCFWNode@@UAEPAVCGECOObjectBase@@XZ @ 18 NONAME ; class CGECOObjectBase * CXCFWNode::Data(void) - ?FirstChild@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 19 NONAME ; class MXCFWNode * CXCFWNode::FirstChild(void) - ?GetAttribute@CGECODefaultObject@@QAEHABVTDesC16@@AAVTPtrC16@@@Z @ 20 NONAME ; int CGECODefaultObject::GetAttribute(class TDesC16 const &, class TPtrC16 &) - ?GetAttribute@CGECODefaultObject@@QAEHABVTDesC16@@AAVTPtrC16@@AAH@Z @ 21 NONAME ; int CGECODefaultObject::GetAttribute(class TDesC16 const &, class TPtrC16 &, int &) - ?GetChildNodesL@CXCFWTree@@UAEXPAVMXCFWNode@@AAV?$RPointerArray@VMXCFWNode@@@@@Z @ 22 NONAME ; void CXCFWTree::GetChildNodesL(class MXCFWNode *, class RPointerArray &) - ?GetContentObjectAndSetContextL@CGECODefaultObjectFactory@@UAEPAVCGECOObjectBase@@ABVTDesC16@@@Z @ 23 NONAME ; class CGECOObjectBase * CGECODefaultObjectFactory::GetContentObjectAndSetContextL(class TDesC16 const &) - ?GetNodesOfTypeL@CXCFWTree@@UAEXABVTDesC16@@AAV?$RPointerArray@VMXCFWNode@@@@PAVMXCFWNode@@H@Z @ 24 NONAME ; void CXCFWTree::GetNodesOfTypeL(class TDesC16 const &, class RPointerArray &, class MXCFWNode *, int) - ?GetText@CGECODefaultObject@@QAEHAAVTPtrC16@@@Z @ 25 NONAME ; int CGECODefaultObject::GetText(class TPtrC16 &) - ?HasTextData@CGECODefaultObject@@UAEHXZ @ 26 NONAME ; int CGECODefaultObject::HasTextData(void) - ?HasTextData@CGECODefaultObjectFactory@@UAEHXZ @ 27 NONAME ; int CGECODefaultObjectFactory::HasTextData(void) - ?HasTextData@CXCFWEngine@@UAEHXZ @ 28 NONAME ; int CXCFWEngine::HasTextData(void) - ?InitializeObjectL@CGECODefaultObjectFactory@@UAEXAAVMGECOAttributeProvider@@@Z @ 29 NONAME ; void CGECODefaultObjectFactory::InitializeObjectL(class MGECOAttributeProvider &) - ?IsLocked@CXCFWTree@@UAEHXZ @ 30 NONAME ; int CXCFWTree::IsLocked(void) - ?LastChild@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 31 NONAME ; class MXCFWNode * CXCFWNode::LastChild(void) - ?LoadL@CXCFWEngine@@QAEXAAVMXCFWTree@@ABVTDesC16@@1@Z @ 32 NONAME ; void CXCFWEngine::LoadL(class MXCFWTree &, class TDesC16 const &, class TDesC16 const &) - ?LoadL@CXCFWEngine@@QAEXAAVMXCFWTree@@ABVTDesC16@@@Z @ 33 NONAME ; void CXCFWEngine::LoadL(class MXCFWTree &, class TDesC16 const &) - ?MoveNodeL@CXCFWTree@@UAEXPAVMXCFWNode@@00@Z @ 34 NONAME ; void CXCFWTree::MoveNodeL(class MXCFWNode *, class MXCFWNode *, class MXCFWNode *) - ?NewL@CGECODefaultObject@@SAPAV1@ABVTDesC16@@@Z @ 35 NONAME ; class CGECODefaultObject * CGECODefaultObject::NewL(class TDesC16 const &) - ?NewL@CGECODefaultObjectFactory@@SAPAV1@XZ @ 36 NONAME ; class CGECODefaultObjectFactory * CGECODefaultObjectFactory::NewL(void) - ?NewL@CXCFWEngine@@SAPAV1@PAVMXCFWEngineObserver@@@Z @ 37 NONAME ; class CXCFWEngine * CXCFWEngine::NewL(class MXCFWEngineObserver *) - ?NewL@CXCFWTree@@SAPAV1@XZ @ 38 NONAME ; class CXCFWTree * CXCFWTree::NewL(void) - ?NextSibling@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 39 NONAME ; class MXCFWNode * CXCFWNode::NextSibling(void) - ?Nodes@CXCFWTree@@UAEAAV?$RPointerArray@VMXCFWNode@@@@XZ @ 40 NONAME ; class RPointerArray & CXCFWTree::Nodes(void) - ?NumAttributes@CGECODefaultObject@@UAEHXZ @ 41 NONAME ; int CGECODefaultObject::NumAttributes(void) - ?NumAttributes@CGECODefaultObjectFactory@@UAEHXZ @ 42 NONAME ; int CGECODefaultObjectFactory::NumAttributes(void) - ?NumAttributes@CXCFWEngine@@UAEHXZ @ 43 NONAME ; int CXCFWEngine::NumAttributes(void) - ?OutputComposedTextL@CXCFWEntityConverter@@UAEHPAVCMDXMLComposer@@ABVTDesC16@@@Z @ 44 NONAME ; int CXCFWEntityConverter::OutputComposedTextL(class CMDXMLComposer *, class TDesC16 const &) - ?Parent@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 45 NONAME ; class MXCFWNode * CXCFWNode::Parent(void) - ?PrevSibling@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 46 NONAME ; class MXCFWNode * CXCFWNode::PrevSibling(void) - ?RegisterObjectFactoryL@CXCFWEngine@@QAEXPAVCGECOObjectFactoryBase@@@Z @ 47 NONAME ; void CXCFWEngine::RegisterObjectFactoryL(class CGECOObjectFactoryBase *) - ?RemoveAttribute@CGECODefaultObject@@QAEHABVTDesC16@@@Z @ 48 NONAME ; int CGECODefaultObject::RemoveAttribute(class TDesC16 const &) - ?RemoveNodeL@CXCFWTree@@UAEXPAVMXCFWNode@@@Z @ 49 NONAME ; void CXCFWTree::RemoveNodeL(class MXCFWNode *) - ?RemoveText@CGECODefaultObject@@QAEXXZ @ 50 NONAME ; void CGECODefaultObject::RemoveText(void) - ?Root@CXCFWTree@@UAEPAVMXCFWNode@@XZ @ 51 NONAME ; class MXCFWNode * CXCFWTree::Root(void) - ?SaveL@CXCFWEngine@@QAEXAAVMXCFWTree@@ABVTDesC16@@1@Z @ 52 NONAME ; void CXCFWEngine::SaveL(class MXCFWTree &, class TDesC16 const &, class TDesC16 const &) - ?SaveL@CXCFWEngine@@QAEXAAVMXCFWTree@@ABVTDesC16@@@Z @ 53 NONAME ; void CXCFWEngine::SaveL(class MXCFWTree &, class TDesC16 const &) - ?SetAttributeL@CGECODefaultObject@@QAEXABVTDesC16@@0@Z @ 54 NONAME ; void CGECODefaultObject::SetAttributeL(class TDesC16 const &, class TDesC16 const &) - ?SetAttributeL@CGECODefaultObject@@QAEXABVTDesC16@@0H@Z @ 55 NONAME ; void CGECODefaultObject::SetAttributeL(class TDesC16 const &, class TDesC16 const &, int) - ?SetContext@CGECODefaultObjectFactory@@UAEHPAVCGECOObjectBase@@@Z @ 56 NONAME ; int CGECODefaultObjectFactory::SetContext(class CGECOObjectBase *) - ?SetLocked@CXCFWTree@@UAEXH@Z @ 57 NONAME ; void CXCFWTree::SetLocked(int) - ?SetTextL@CGECODefaultObject@@QAEXABVTDesC16@@@Z @ 58 NONAME ; void CGECODefaultObject::SetTextL(class TDesC16 const &) - ?SetTextL@CGECODefaultObject@@QAEXABVTDesC16@@H@Z @ 59 NONAME ; void CGECODefaultObject::SetTextL(class TDesC16 const &, int) - ?TextDetailsL@CGECODefaultObject@@UAEXAAVTPtrC16@@AAH@Z @ 60 NONAME ; void CGECODefaultObject::TextDetailsL(class TPtrC16 &, int &) - ?TextDetailsL@CGECODefaultObjectFactory@@UAEXAAVTPtrC16@@AAH@Z @ 61 NONAME ; void CGECODefaultObjectFactory::TextDetailsL(class TPtrC16 &, int &) - ?TextDetailsL@CXCFWEngine@@UAEXAAVTPtrC16@@AAH@Z @ 62 NONAME ; void CXCFWEngine::TextDetailsL(class TPtrC16 &, int &) - ?TypeIdentifier@CGECODefaultObject@@UAEABVTDesC16@@XZ @ 63 NONAME ; class TDesC16 const & CGECODefaultObject::TypeIdentifier(void) - ?UnRegisterObjectFactory@CXCFWEngine@@QAEHPAVCGECOObjectFactoryBase@@@Z @ 64 NONAME ; int CXCFWEngine::UnRegisterObjectFactory(class CGECOObjectFactoryBase *) - ?AttributeDetailsL@CGECODefaultObject@@UAEXHAAVTPtrC16@@0@Z @ 65 NONAME ; void CGECODefaultObject::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &) - ?AttributeDetailsL@CGECODefaultObjectFactory@@UAEXHAAVTPtrC16@@0@Z @ 66 NONAME ; void CGECODefaultObjectFactory::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &) - ?AttributeDetailsL@CXCFWEngine@@UAEXHAAVTPtrC16@@0@Z @ 67 NONAME ; void CXCFWEngine::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &) - diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/bwins/XCFW_hsU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xcfw/bwins/XCFW_hsU.DEF Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,69 @@ +EXPORTS + ??0CGECODefaultObject@@IAE@XZ @ 1 NONAME ; CGECODefaultObject::CGECODefaultObject(void) + ??0CGECODefaultObjectFactory@@IAE@XZ @ 2 NONAME ; CGECODefaultObjectFactory::CGECODefaultObjectFactory(void) + ??0CXCFWEntityConverter@@QAE@XZ @ 3 NONAME ; CXCFWEntityConverter::CXCFWEntityConverter(void) + ??1CGECODefaultObject@@UAE@XZ @ 4 NONAME ; CGECODefaultObject::~CGECODefaultObject(void) + ??1CGECODefaultObjectFactory@@UAE@XZ @ 5 NONAME ; CGECODefaultObjectFactory::~CGECODefaultObjectFactory(void) + ??1CXCFWEngine@@UAE@XZ @ 6 NONAME ; CXCFWEngine::~CXCFWEngine(void) + ??1CXCFWEntityConverter@@UAE@XZ @ 7 NONAME ; CXCFWEntityConverter::~CXCFWEntityConverter(void) + ??1CXCFWTree@@UAE@XZ @ 8 NONAME ; CXCFWTree::~CXCFWTree(void) + ?AddNodeL@CXCFWTree@@UAEPAVMXCFWNode@@PAVCGECOObjectBase@@@Z @ 9 NONAME ; class MXCFWNode * CXCFWTree::AddNodeL(class CGECOObjectBase *) + ?AddNodeL@CXCFWTree@@UAEPAVMXCFWNode@@PAVCGECOObjectBase@@PAV2@1@Z @ 10 NONAME ; class MXCFWNode * CXCFWTree::AddNodeL(class CGECOObjectBase *, class MXCFWNode *, class MXCFWNode *) + ?AddNodeL@CXCFWTree@@UAEPAVMXCFWNode@@PAVCGECOObjectBase@@PAV2@@Z @ 11 NONAME ; class MXCFWNode * CXCFWTree::AddNodeL(class CGECOObjectBase *, class MXCFWNode *) + ?AttributeDetailsL@CGECODefaultObject@@UAEXHAAVTPtrC16@@0AAH@Z @ 12 NONAME ; void CGECODefaultObject::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &, int &) + ?AttributeDetailsL@CGECODefaultObjectFactory@@UAEXHAAVTPtrC16@@0AAH@Z @ 13 NONAME ; void CGECODefaultObjectFactory::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &, int &) + ?AttributeDetailsL@CXCFWEngine@@UAEXHAAVTPtrC16@@0AAH@Z @ 14 NONAME ; void CXCFWEngine::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &, int &) + ?BaseConstructL@CGECODefaultObject@@IAEXABVTDesC16@@@Z @ 15 NONAME ; void CGECODefaultObject::BaseConstructL(class TDesC16 const &) + ?CancelOperation@CXCFWEngine@@QAEXXZ @ 16 NONAME ; void CXCFWEngine::CancelOperation(void) + ?CurrentState@CXCFWEngine@@QAE?AW4TXCFWEngineState@1@XZ @ 17 NONAME ; enum CXCFWEngine::TXCFWEngineState CXCFWEngine::CurrentState(void) + ?Data@CXCFWNode@@UAEPAVCGECOObjectBase@@XZ @ 18 NONAME ; class CGECOObjectBase * CXCFWNode::Data(void) + ?FirstChild@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 19 NONAME ; class MXCFWNode * CXCFWNode::FirstChild(void) + ?GetAttribute@CGECODefaultObject@@QAEHABVTDesC16@@AAVTPtrC16@@@Z @ 20 NONAME ; int CGECODefaultObject::GetAttribute(class TDesC16 const &, class TPtrC16 &) + ?GetAttribute@CGECODefaultObject@@QAEHABVTDesC16@@AAVTPtrC16@@AAH@Z @ 21 NONAME ; int CGECODefaultObject::GetAttribute(class TDesC16 const &, class TPtrC16 &, int &) + ?GetChildNodesL@CXCFWTree@@UAEXPAVMXCFWNode@@AAV?$RPointerArray@VMXCFWNode@@@@@Z @ 22 NONAME ; void CXCFWTree::GetChildNodesL(class MXCFWNode *, class RPointerArray &) + ?GetContentObjectAndSetContextL@CGECODefaultObjectFactory@@UAEPAVCGECOObjectBase@@ABVTDesC16@@@Z @ 23 NONAME ; class CGECOObjectBase * CGECODefaultObjectFactory::GetContentObjectAndSetContextL(class TDesC16 const &) + ?GetNodesOfTypeL@CXCFWTree@@UAEXABVTDesC16@@AAV?$RPointerArray@VMXCFWNode@@@@PAVMXCFWNode@@H@Z @ 24 NONAME ; void CXCFWTree::GetNodesOfTypeL(class TDesC16 const &, class RPointerArray &, class MXCFWNode *, int) + ?GetText@CGECODefaultObject@@QAEHAAVTPtrC16@@@Z @ 25 NONAME ; int CGECODefaultObject::GetText(class TPtrC16 &) + ?HasTextData@CGECODefaultObject@@UAEHXZ @ 26 NONAME ; int CGECODefaultObject::HasTextData(void) + ?HasTextData@CGECODefaultObjectFactory@@UAEHXZ @ 27 NONAME ; int CGECODefaultObjectFactory::HasTextData(void) + ?HasTextData@CXCFWEngine@@UAEHXZ @ 28 NONAME ; int CXCFWEngine::HasTextData(void) + ?InitializeObjectL@CGECODefaultObjectFactory@@UAEXAAVMGECOAttributeProvider@@@Z @ 29 NONAME ; void CGECODefaultObjectFactory::InitializeObjectL(class MGECOAttributeProvider &) + ?IsLocked@CXCFWTree@@UAEHXZ @ 30 NONAME ; int CXCFWTree::IsLocked(void) + ?LastChild@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 31 NONAME ; class MXCFWNode * CXCFWNode::LastChild(void) + ?LoadL@CXCFWEngine@@QAEXAAVMXCFWTree@@ABVTDesC16@@1@Z @ 32 NONAME ; void CXCFWEngine::LoadL(class MXCFWTree &, class TDesC16 const &, class TDesC16 const &) + ?LoadL@CXCFWEngine@@QAEXAAVMXCFWTree@@ABVTDesC16@@@Z @ 33 NONAME ; void CXCFWEngine::LoadL(class MXCFWTree &, class TDesC16 const &) + ?MoveNodeL@CXCFWTree@@UAEXPAVMXCFWNode@@00@Z @ 34 NONAME ; void CXCFWTree::MoveNodeL(class MXCFWNode *, class MXCFWNode *, class MXCFWNode *) + ?NewL@CGECODefaultObject@@SAPAV1@ABVTDesC16@@@Z @ 35 NONAME ; class CGECODefaultObject * CGECODefaultObject::NewL(class TDesC16 const &) + ?NewL@CGECODefaultObjectFactory@@SAPAV1@XZ @ 36 NONAME ; class CGECODefaultObjectFactory * CGECODefaultObjectFactory::NewL(void) + ?NewL@CXCFWEngine@@SAPAV1@PAVMXCFWEngineObserver@@@Z @ 37 NONAME ; class CXCFWEngine * CXCFWEngine::NewL(class MXCFWEngineObserver *) + ?NewL@CXCFWTree@@SAPAV1@XZ @ 38 NONAME ; class CXCFWTree * CXCFWTree::NewL(void) + ?NextSibling@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 39 NONAME ; class MXCFWNode * CXCFWNode::NextSibling(void) + ?Nodes@CXCFWTree@@UAEAAV?$RPointerArray@VMXCFWNode@@@@XZ @ 40 NONAME ; class RPointerArray & CXCFWTree::Nodes(void) + ?NumAttributes@CGECODefaultObject@@UAEHXZ @ 41 NONAME ; int CGECODefaultObject::NumAttributes(void) + ?NumAttributes@CGECODefaultObjectFactory@@UAEHXZ @ 42 NONAME ; int CGECODefaultObjectFactory::NumAttributes(void) + ?NumAttributes@CXCFWEngine@@UAEHXZ @ 43 NONAME ; int CXCFWEngine::NumAttributes(void) + ?OutputComposedTextL@CXCFWEntityConverter@@UAEHPAVCMDXMLComposer@@ABVTDesC16@@@Z @ 44 NONAME ; int CXCFWEntityConverter::OutputComposedTextL(class CMDXMLComposer *, class TDesC16 const &) + ?Parent@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 45 NONAME ; class MXCFWNode * CXCFWNode::Parent(void) + ?PrevSibling@CXCFWNode@@UAEPAVMXCFWNode@@XZ @ 46 NONAME ; class MXCFWNode * CXCFWNode::PrevSibling(void) + ?RegisterObjectFactoryL@CXCFWEngine@@QAEXPAVCGECOObjectFactoryBase@@@Z @ 47 NONAME ; void CXCFWEngine::RegisterObjectFactoryL(class CGECOObjectFactoryBase *) + ?RemoveAttribute@CGECODefaultObject@@QAEHABVTDesC16@@@Z @ 48 NONAME ; int CGECODefaultObject::RemoveAttribute(class TDesC16 const &) + ?RemoveNodeL@CXCFWTree@@UAEXPAVMXCFWNode@@@Z @ 49 NONAME ; void CXCFWTree::RemoveNodeL(class MXCFWNode *) + ?RemoveText@CGECODefaultObject@@QAEXXZ @ 50 NONAME ; void CGECODefaultObject::RemoveText(void) + ?Root@CXCFWTree@@UAEPAVMXCFWNode@@XZ @ 51 NONAME ; class MXCFWNode * CXCFWTree::Root(void) + ?SaveL@CXCFWEngine@@QAEXAAVMXCFWTree@@ABVTDesC16@@1@Z @ 52 NONAME ; void CXCFWEngine::SaveL(class MXCFWTree &, class TDesC16 const &, class TDesC16 const &) + ?SaveL@CXCFWEngine@@QAEXAAVMXCFWTree@@ABVTDesC16@@@Z @ 53 NONAME ; void CXCFWEngine::SaveL(class MXCFWTree &, class TDesC16 const &) + ?SetAttributeL@CGECODefaultObject@@QAEXABVTDesC16@@0@Z @ 54 NONAME ; void CGECODefaultObject::SetAttributeL(class TDesC16 const &, class TDesC16 const &) + ?SetAttributeL@CGECODefaultObject@@QAEXABVTDesC16@@0H@Z @ 55 NONAME ; void CGECODefaultObject::SetAttributeL(class TDesC16 const &, class TDesC16 const &, int) + ?SetContext@CGECODefaultObjectFactory@@UAEHPAVCGECOObjectBase@@@Z @ 56 NONAME ; int CGECODefaultObjectFactory::SetContext(class CGECOObjectBase *) + ?SetLocked@CXCFWTree@@UAEXH@Z @ 57 NONAME ; void CXCFWTree::SetLocked(int) + ?SetTextL@CGECODefaultObject@@QAEXABVTDesC16@@@Z @ 58 NONAME ; void CGECODefaultObject::SetTextL(class TDesC16 const &) + ?SetTextL@CGECODefaultObject@@QAEXABVTDesC16@@H@Z @ 59 NONAME ; void CGECODefaultObject::SetTextL(class TDesC16 const &, int) + ?TextDetailsL@CGECODefaultObject@@UAEXAAVTPtrC16@@AAH@Z @ 60 NONAME ; void CGECODefaultObject::TextDetailsL(class TPtrC16 &, int &) + ?TextDetailsL@CGECODefaultObjectFactory@@UAEXAAVTPtrC16@@AAH@Z @ 61 NONAME ; void CGECODefaultObjectFactory::TextDetailsL(class TPtrC16 &, int &) + ?TextDetailsL@CXCFWEngine@@UAEXAAVTPtrC16@@AAH@Z @ 62 NONAME ; void CXCFWEngine::TextDetailsL(class TPtrC16 &, int &) + ?TypeIdentifier@CGECODefaultObject@@UAEABVTDesC16@@XZ @ 63 NONAME ; class TDesC16 const & CGECODefaultObject::TypeIdentifier(void) + ?UnRegisterObjectFactory@CXCFWEngine@@QAEHPAVCGECOObjectFactoryBase@@@Z @ 64 NONAME ; int CXCFWEngine::UnRegisterObjectFactory(class CGECOObjectFactoryBase *) + ?AttributeDetailsL@CGECODefaultObject@@UAEXHAAVTPtrC16@@0@Z @ 65 NONAME ; void CGECODefaultObject::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &) + ?AttributeDetailsL@CGECODefaultObjectFactory@@UAEXHAAVTPtrC16@@0@Z @ 66 NONAME ; void CGECODefaultObjectFactory::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &) + ?AttributeDetailsL@CXCFWEngine@@UAEXHAAVTPtrC16@@0@Z @ 67 NONAME ; void CXCFWEngine::AttributeDetailsL(int, class TPtrC16 &, class TPtrC16 &) + diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/eabi/XCFWU.DEF --- a/xcfw/eabi/XCFWU.DEF Fri Apr 02 20:17:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,128 +0,0 @@ -EXPORTS - _ZN11CXCFWEngine11HasTextDataEv @ 1 NONAME - _ZN11CXCFWEngine12CurrentStateEv @ 2 NONAME - _ZN11CXCFWEngine12TextDetailsLER7TPtrC16Ri @ 3 NONAME - _ZN11CXCFWEngine13NumAttributesEv @ 4 NONAME - _ZN11CXCFWEngine15CancelOperationEv @ 5 NONAME - _ZN11CXCFWEngine17AttributeDetailsLEiR7TPtrC16S1_Ri @ 6 NONAME - _ZN11CXCFWEngine22RegisterObjectFactoryLEP22CGECOObjectFactoryBase @ 7 NONAME - _ZN11CXCFWEngine23UnRegisterObjectFactoryEP22CGECOObjectFactoryBase @ 8 NONAME - _ZN11CXCFWEngine4NewLEP19MXCFWEngineObserver @ 9 NONAME - _ZN11CXCFWEngine5LoadLER9MXCFWTreeRK7TDesC16 @ 10 NONAME - _ZN11CXCFWEngine5LoadLER9MXCFWTreeRK7TDesC16S4_ @ 11 NONAME - _ZN11CXCFWEngine5SaveLER9MXCFWTreeRK7TDesC16 @ 12 NONAME - _ZN11CXCFWEngine5SaveLER9MXCFWTreeRK7TDesC16S4_ @ 13 NONAME - _ZN11CXCFWEngineD0Ev @ 14 NONAME - _ZN11CXCFWEngineD1Ev @ 15 NONAME - _ZN11CXCFWEngineD2Ev @ 16 NONAME - _ZN18CGECODefaultObject10RemoveTextEv @ 17 NONAME - _ZN18CGECODefaultObject11HasTextDataEv @ 18 NONAME - _ZN18CGECODefaultObject12GetAttributeERK7TDesC16R7TPtrC16 @ 19 NONAME - _ZN18CGECODefaultObject12GetAttributeERK7TDesC16R7TPtrC16Ri @ 20 NONAME - _ZN18CGECODefaultObject12TextDetailsLER7TPtrC16Ri @ 21 NONAME - _ZN18CGECODefaultObject13NumAttributesEv @ 22 NONAME - _ZN18CGECODefaultObject13SetAttributeLERK7TDesC16S2_ @ 23 NONAME - _ZN18CGECODefaultObject13SetAttributeLERK7TDesC16S2_i @ 24 NONAME - _ZN18CGECODefaultObject14BaseConstructLERK7TDesC16 @ 25 NONAME - _ZN18CGECODefaultObject14TypeIdentifierEv @ 26 NONAME - _ZN18CGECODefaultObject15RemoveAttributeERK7TDesC16 @ 27 NONAME - _ZN18CGECODefaultObject17AttributeDetailsLEiR7TPtrC16S1_Ri @ 28 NONAME - _ZN18CGECODefaultObject4NewLERK7TDesC16 @ 29 NONAME - _ZN18CGECODefaultObject7GetTextER7TPtrC16 @ 30 NONAME - _ZN18CGECODefaultObject8SetTextLERK7TDesC16 @ 31 NONAME - _ZN18CGECODefaultObject8SetTextLERK7TDesC16i @ 32 NONAME - _ZN18CGECODefaultObjectC1Ev @ 33 NONAME - _ZN18CGECODefaultObjectC2Ev @ 34 NONAME - _ZN18CGECODefaultObjectD0Ev @ 35 NONAME - _ZN18CGECODefaultObjectD1Ev @ 36 NONAME - _ZN18CGECODefaultObjectD2Ev @ 37 NONAME - _ZN20CXCFWEntityConverter19OutputComposedTextLEP14CMDXMLComposerRK7TDesC16 @ 38 NONAME - _ZN20CXCFWEntityConverterC1Ev @ 39 NONAME - _ZN20CXCFWEntityConverterC2Ev @ 40 NONAME - _ZN20CXCFWEntityConverterD0Ev @ 41 NONAME - _ZN20CXCFWEntityConverterD1Ev @ 42 NONAME - _ZN20CXCFWEntityConverterD2Ev @ 43 NONAME - _ZN25CGECODefaultObjectFactory10SetContextEP15CGECOObjectBase @ 44 NONAME - _ZN25CGECODefaultObjectFactory11HasTextDataEv @ 45 NONAME - _ZN25CGECODefaultObjectFactory12TextDetailsLER7TPtrC16Ri @ 46 NONAME - _ZN25CGECODefaultObjectFactory13NumAttributesEv @ 47 NONAME - _ZN25CGECODefaultObjectFactory17AttributeDetailsLEiR7TPtrC16S1_Ri @ 48 NONAME - _ZN25CGECODefaultObjectFactory17InitializeObjectLER22MGECOAttributeProvider @ 49 NONAME - _ZN25CGECODefaultObjectFactory30GetContentObjectAndSetContextLERK7TDesC16 @ 50 NONAME - _ZN25CGECODefaultObjectFactory4NewLEv @ 51 NONAME - _ZN25CGECODefaultObjectFactoryC1Ev @ 52 NONAME - _ZN25CGECODefaultObjectFactoryC2Ev @ 53 NONAME - _ZN25CGECODefaultObjectFactoryD0Ev @ 54 NONAME - _ZN25CGECODefaultObjectFactoryD1Ev @ 55 NONAME - _ZN25CGECODefaultObjectFactoryD2Ev @ 56 NONAME - _ZN9CXCFWNode10FirstChildEv @ 57 NONAME - _ZN9CXCFWNode11NextSiblingEv @ 58 NONAME - _ZN9CXCFWNode11PrevSiblingEv @ 59 NONAME - _ZN9CXCFWNode4DataEv @ 60 NONAME - _ZN9CXCFWNode6ParentEv @ 61 NONAME - _ZN9CXCFWNode9LastChildEv @ 62 NONAME - _ZN9CXCFWTree11RemoveNodeLEP9MXCFWNode @ 63 NONAME - _ZN9CXCFWTree14GetChildNodesLEP9MXCFWNodeR13RPointerArrayIS0_E @ 64 NONAME - _ZN9CXCFWTree15GetNodesOfTypeLERK7TDesC16R13RPointerArrayI9MXCFWNodeEPS4_i @ 65 NONAME - _ZN9CXCFWTree4NewLEv @ 66 NONAME - _ZN9CXCFWTree4RootEv @ 67 NONAME - _ZN9CXCFWTree5NodesEv @ 68 NONAME - _ZN9CXCFWTree8AddNodeLEP15CGECOObjectBase @ 69 NONAME - _ZN9CXCFWTree8AddNodeLEP15CGECOObjectBaseP9MXCFWNode @ 70 NONAME - _ZN9CXCFWTree8AddNodeLEP15CGECOObjectBaseP9MXCFWNodeS3_ @ 71 NONAME - _ZN9CXCFWTree8IsLockedEv @ 72 NONAME - _ZN9CXCFWTree9MoveNodeLEP9MXCFWNodeS1_S1_ @ 73 NONAME - _ZN9CXCFWTree9SetLockedEi @ 74 NONAME - _ZN9CXCFWTreeD0Ev @ 75 NONAME - _ZN9CXCFWTreeD1Ev @ 76 NONAME - _ZN9CXCFWTreeD2Ev @ 77 NONAME - _ZTI11CXCFWEngine @ 78 NONAME ; ## - _ZTI14CXCFWLocalizer @ 79 NONAME ; ## - _ZTI18CGECODefaultObject @ 80 NONAME ; ## - _ZTI20CXCFWEntityConverter @ 81 NONAME ; ## - _ZTI25CGECODefaultObjectFactory @ 82 NONAME ; ## - _ZTI9CXCFWNode @ 83 NONAME ; ## - _ZTI9CXCFWTree @ 84 NONAME ; ## - _ZTV11CXCFWEngine @ 85 NONAME ; ## - _ZTV14CXCFWLocalizer @ 86 NONAME ; ## - _ZTV18CGECODefaultObject @ 87 NONAME ; ## - _ZTV20CXCFWEntityConverter @ 88 NONAME ; ## - _ZTV25CGECODefaultObjectFactory @ 89 NONAME ; ## - _ZTV9CXCFWNode @ 90 NONAME ; ## - _ZTV9CXCFWTree @ 91 NONAME ; ## - _ZThn28_N11CXCFWEngine11HasTextDataEv @ 92 NONAME ; ## - _ZThn28_N11CXCFWEngine12TextDetailsLER7TPtrC16Ri @ 93 NONAME ; ## - _ZThn28_N11CXCFWEngine13NumAttributesEv @ 94 NONAME ; ## - _ZThn28_N11CXCFWEngine17AttributeDetailsLEiR7TPtrC16S1_Ri @ 95 NONAME ; ## - _ZThn4_N18CGECODefaultObject11HasTextDataEv @ 96 NONAME ; ## - _ZThn4_N18CGECODefaultObject12TextDetailsLER7TPtrC16Ri @ 97 NONAME ; ## - _ZThn4_N18CGECODefaultObject13NumAttributesEv @ 98 NONAME ; ## - _ZThn4_N18CGECODefaultObject17AttributeDetailsLEiR7TPtrC16S1_Ri @ 99 NONAME ; ## - _ZThn4_N25CGECODefaultObjectFactory11HasTextDataEv @ 100 NONAME ; ## - _ZThn4_N25CGECODefaultObjectFactory12TextDetailsLER7TPtrC16Ri @ 101 NONAME ; ## - _ZThn4_N25CGECODefaultObjectFactory13NumAttributesEv @ 102 NONAME ; ## - _ZThn4_N25CGECODefaultObjectFactory17AttributeDetailsLEiR7TPtrC16S1_Ri @ 103 NONAME ; ## - _ZThn4_N9CXCFWNode10FirstChildEv @ 104 NONAME ; ## - _ZThn4_N9CXCFWNode11NextSiblingEv @ 105 NONAME ; ## - _ZThn4_N9CXCFWNode11PrevSiblingEv @ 106 NONAME ; ## - _ZThn4_N9CXCFWNode4DataEv @ 107 NONAME ; ## - _ZThn4_N9CXCFWNode6ParentEv @ 108 NONAME ; ## - _ZThn4_N9CXCFWNode9LastChildEv @ 109 NONAME ; ## - _ZThn4_N9CXCFWTree11RemoveNodeLEP9MXCFWNode @ 110 NONAME ; ## - _ZThn4_N9CXCFWTree14GetChildNodesLEP9MXCFWNodeR13RPointerArrayIS0_E @ 111 NONAME ; ## - _ZThn4_N9CXCFWTree15GetNodesOfTypeLERK7TDesC16R13RPointerArrayI9MXCFWNodeEPS4_i @ 112 NONAME ; ## - _ZThn4_N9CXCFWTree4RootEv @ 113 NONAME ; ## - _ZThn4_N9CXCFWTree5NodesEv @ 114 NONAME ; ## - _ZThn4_N9CXCFWTree8AddNodeLEP15CGECOObjectBase @ 115 NONAME ; ## - _ZThn4_N9CXCFWTree8AddNodeLEP15CGECOObjectBaseP9MXCFWNode @ 116 NONAME ; ## - _ZThn4_N9CXCFWTree8AddNodeLEP15CGECOObjectBaseP9MXCFWNodeS3_ @ 117 NONAME ; ## - _ZThn4_N9CXCFWTree8IsLockedEv @ 118 NONAME ; ## - _ZThn4_N9CXCFWTree9MoveNodeLEP9MXCFWNodeS1_S1_ @ 119 NONAME ; ## - _ZThn4_N9CXCFWTree9SetLockedEi @ 120 NONAME ; ## - _ZN11CXCFWEngine17AttributeDetailsLEiR7TPtrC16S1_ @ 121 NONAME - _ZN18CGECODefaultObject17AttributeDetailsLEiR7TPtrC16S1_ @ 122 NONAME - _ZN25CGECODefaultObjectFactory17AttributeDetailsLEiR7TPtrC16S1_ @ 123 NONAME - _ZThn28_N11CXCFWEngine17AttributeDetailsLEiR7TPtrC16S1_ @ 124 NONAME ; ## - _ZThn4_N18CGECODefaultObject17AttributeDetailsLEiR7TPtrC16S1_ @ 125 NONAME ; ## - _ZThn4_N25CGECODefaultObjectFactory17AttributeDetailsLEiR7TPtrC16S1_ @ 126 NONAME ; ## - diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/eabi/XCFW_hsU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xcfw/eabi/XCFW_hsU.DEF Wed Apr 07 14:35:19 2010 +0200 @@ -0,0 +1,128 @@ +EXPORTS + _ZN11CXCFWEngine11HasTextDataEv @ 1 NONAME + _ZN11CXCFWEngine12CurrentStateEv @ 2 NONAME + _ZN11CXCFWEngine12TextDetailsLER7TPtrC16Ri @ 3 NONAME + _ZN11CXCFWEngine13NumAttributesEv @ 4 NONAME + _ZN11CXCFWEngine15CancelOperationEv @ 5 NONAME + _ZN11CXCFWEngine17AttributeDetailsLEiR7TPtrC16S1_Ri @ 6 NONAME + _ZN11CXCFWEngine22RegisterObjectFactoryLEP22CGECOObjectFactoryBase @ 7 NONAME + _ZN11CXCFWEngine23UnRegisterObjectFactoryEP22CGECOObjectFactoryBase @ 8 NONAME + _ZN11CXCFWEngine4NewLEP19MXCFWEngineObserver @ 9 NONAME + _ZN11CXCFWEngine5LoadLER9MXCFWTreeRK7TDesC16 @ 10 NONAME + _ZN11CXCFWEngine5LoadLER9MXCFWTreeRK7TDesC16S4_ @ 11 NONAME + _ZN11CXCFWEngine5SaveLER9MXCFWTreeRK7TDesC16 @ 12 NONAME + _ZN11CXCFWEngine5SaveLER9MXCFWTreeRK7TDesC16S4_ @ 13 NONAME + _ZN11CXCFWEngineD0Ev @ 14 NONAME + _ZN11CXCFWEngineD1Ev @ 15 NONAME + _ZN11CXCFWEngineD2Ev @ 16 NONAME + _ZN18CGECODefaultObject10RemoveTextEv @ 17 NONAME + _ZN18CGECODefaultObject11HasTextDataEv @ 18 NONAME + _ZN18CGECODefaultObject12GetAttributeERK7TDesC16R7TPtrC16 @ 19 NONAME + _ZN18CGECODefaultObject12GetAttributeERK7TDesC16R7TPtrC16Ri @ 20 NONAME + _ZN18CGECODefaultObject12TextDetailsLER7TPtrC16Ri @ 21 NONAME + _ZN18CGECODefaultObject13NumAttributesEv @ 22 NONAME + _ZN18CGECODefaultObject13SetAttributeLERK7TDesC16S2_ @ 23 NONAME + _ZN18CGECODefaultObject13SetAttributeLERK7TDesC16S2_i @ 24 NONAME + _ZN18CGECODefaultObject14BaseConstructLERK7TDesC16 @ 25 NONAME + _ZN18CGECODefaultObject14TypeIdentifierEv @ 26 NONAME + _ZN18CGECODefaultObject15RemoveAttributeERK7TDesC16 @ 27 NONAME + _ZN18CGECODefaultObject17AttributeDetailsLEiR7TPtrC16S1_Ri @ 28 NONAME + _ZN18CGECODefaultObject4NewLERK7TDesC16 @ 29 NONAME + _ZN18CGECODefaultObject7GetTextER7TPtrC16 @ 30 NONAME + _ZN18CGECODefaultObject8SetTextLERK7TDesC16 @ 31 NONAME + _ZN18CGECODefaultObject8SetTextLERK7TDesC16i @ 32 NONAME + _ZN18CGECODefaultObjectC1Ev @ 33 NONAME + _ZN18CGECODefaultObjectC2Ev @ 34 NONAME + _ZN18CGECODefaultObjectD0Ev @ 35 NONAME + _ZN18CGECODefaultObjectD1Ev @ 36 NONAME + _ZN18CGECODefaultObjectD2Ev @ 37 NONAME + _ZN20CXCFWEntityConverter19OutputComposedTextLEP14CMDXMLComposerRK7TDesC16 @ 38 NONAME + _ZN20CXCFWEntityConverterC1Ev @ 39 NONAME + _ZN20CXCFWEntityConverterC2Ev @ 40 NONAME + _ZN20CXCFWEntityConverterD0Ev @ 41 NONAME + _ZN20CXCFWEntityConverterD1Ev @ 42 NONAME + _ZN20CXCFWEntityConverterD2Ev @ 43 NONAME + _ZN25CGECODefaultObjectFactory10SetContextEP15CGECOObjectBase @ 44 NONAME + _ZN25CGECODefaultObjectFactory11HasTextDataEv @ 45 NONAME + _ZN25CGECODefaultObjectFactory12TextDetailsLER7TPtrC16Ri @ 46 NONAME + _ZN25CGECODefaultObjectFactory13NumAttributesEv @ 47 NONAME + _ZN25CGECODefaultObjectFactory17AttributeDetailsLEiR7TPtrC16S1_Ri @ 48 NONAME + _ZN25CGECODefaultObjectFactory17InitializeObjectLER22MGECOAttributeProvider @ 49 NONAME + _ZN25CGECODefaultObjectFactory30GetContentObjectAndSetContextLERK7TDesC16 @ 50 NONAME + _ZN25CGECODefaultObjectFactory4NewLEv @ 51 NONAME + _ZN25CGECODefaultObjectFactoryC1Ev @ 52 NONAME + _ZN25CGECODefaultObjectFactoryC2Ev @ 53 NONAME + _ZN25CGECODefaultObjectFactoryD0Ev @ 54 NONAME + _ZN25CGECODefaultObjectFactoryD1Ev @ 55 NONAME + _ZN25CGECODefaultObjectFactoryD2Ev @ 56 NONAME + _ZN9CXCFWNode10FirstChildEv @ 57 NONAME + _ZN9CXCFWNode11NextSiblingEv @ 58 NONAME + _ZN9CXCFWNode11PrevSiblingEv @ 59 NONAME + _ZN9CXCFWNode4DataEv @ 60 NONAME + _ZN9CXCFWNode6ParentEv @ 61 NONAME + _ZN9CXCFWNode9LastChildEv @ 62 NONAME + _ZN9CXCFWTree11RemoveNodeLEP9MXCFWNode @ 63 NONAME + _ZN9CXCFWTree14GetChildNodesLEP9MXCFWNodeR13RPointerArrayIS0_E @ 64 NONAME + _ZN9CXCFWTree15GetNodesOfTypeLERK7TDesC16R13RPointerArrayI9MXCFWNodeEPS4_i @ 65 NONAME + _ZN9CXCFWTree4NewLEv @ 66 NONAME + _ZN9CXCFWTree4RootEv @ 67 NONAME + _ZN9CXCFWTree5NodesEv @ 68 NONAME + _ZN9CXCFWTree8AddNodeLEP15CGECOObjectBase @ 69 NONAME + _ZN9CXCFWTree8AddNodeLEP15CGECOObjectBaseP9MXCFWNode @ 70 NONAME + _ZN9CXCFWTree8AddNodeLEP15CGECOObjectBaseP9MXCFWNodeS3_ @ 71 NONAME + _ZN9CXCFWTree8IsLockedEv @ 72 NONAME + _ZN9CXCFWTree9MoveNodeLEP9MXCFWNodeS1_S1_ @ 73 NONAME + _ZN9CXCFWTree9SetLockedEi @ 74 NONAME + _ZN9CXCFWTreeD0Ev @ 75 NONAME + _ZN9CXCFWTreeD1Ev @ 76 NONAME + _ZN9CXCFWTreeD2Ev @ 77 NONAME + _ZTI11CXCFWEngine @ 78 NONAME ; ## + _ZTI14CXCFWLocalizer @ 79 NONAME ; ## + _ZTI18CGECODefaultObject @ 80 NONAME ; ## + _ZTI20CXCFWEntityConverter @ 81 NONAME ; ## + _ZTI25CGECODefaultObjectFactory @ 82 NONAME ; ## + _ZTI9CXCFWNode @ 83 NONAME ; ## + _ZTI9CXCFWTree @ 84 NONAME ; ## + _ZTV11CXCFWEngine @ 85 NONAME ; ## + _ZTV14CXCFWLocalizer @ 86 NONAME ; ## + _ZTV18CGECODefaultObject @ 87 NONAME ; ## + _ZTV20CXCFWEntityConverter @ 88 NONAME ; ## + _ZTV25CGECODefaultObjectFactory @ 89 NONAME ; ## + _ZTV9CXCFWNode @ 90 NONAME ; ## + _ZTV9CXCFWTree @ 91 NONAME ; ## + _ZThn28_N11CXCFWEngine11HasTextDataEv @ 92 NONAME ; ## + _ZThn28_N11CXCFWEngine12TextDetailsLER7TPtrC16Ri @ 93 NONAME ; ## + _ZThn28_N11CXCFWEngine13NumAttributesEv @ 94 NONAME ; ## + _ZThn28_N11CXCFWEngine17AttributeDetailsLEiR7TPtrC16S1_Ri @ 95 NONAME ; ## + _ZThn4_N18CGECODefaultObject11HasTextDataEv @ 96 NONAME ; ## + _ZThn4_N18CGECODefaultObject12TextDetailsLER7TPtrC16Ri @ 97 NONAME ; ## + _ZThn4_N18CGECODefaultObject13NumAttributesEv @ 98 NONAME ; ## + _ZThn4_N18CGECODefaultObject17AttributeDetailsLEiR7TPtrC16S1_Ri @ 99 NONAME ; ## + _ZThn4_N25CGECODefaultObjectFactory11HasTextDataEv @ 100 NONAME ; ## + _ZThn4_N25CGECODefaultObjectFactory12TextDetailsLER7TPtrC16Ri @ 101 NONAME ; ## + _ZThn4_N25CGECODefaultObjectFactory13NumAttributesEv @ 102 NONAME ; ## + _ZThn4_N25CGECODefaultObjectFactory17AttributeDetailsLEiR7TPtrC16S1_Ri @ 103 NONAME ; ## + _ZThn4_N9CXCFWNode10FirstChildEv @ 104 NONAME ; ## + _ZThn4_N9CXCFWNode11NextSiblingEv @ 105 NONAME ; ## + _ZThn4_N9CXCFWNode11PrevSiblingEv @ 106 NONAME ; ## + _ZThn4_N9CXCFWNode4DataEv @ 107 NONAME ; ## + _ZThn4_N9CXCFWNode6ParentEv @ 108 NONAME ; ## + _ZThn4_N9CXCFWNode9LastChildEv @ 109 NONAME ; ## + _ZThn4_N9CXCFWTree11RemoveNodeLEP9MXCFWNode @ 110 NONAME ; ## + _ZThn4_N9CXCFWTree14GetChildNodesLEP9MXCFWNodeR13RPointerArrayIS0_E @ 111 NONAME ; ## + _ZThn4_N9CXCFWTree15GetNodesOfTypeLERK7TDesC16R13RPointerArrayI9MXCFWNodeEPS4_i @ 112 NONAME ; ## + _ZThn4_N9CXCFWTree4RootEv @ 113 NONAME ; ## + _ZThn4_N9CXCFWTree5NodesEv @ 114 NONAME ; ## + _ZThn4_N9CXCFWTree8AddNodeLEP15CGECOObjectBase @ 115 NONAME ; ## + _ZThn4_N9CXCFWTree8AddNodeLEP15CGECOObjectBaseP9MXCFWNode @ 116 NONAME ; ## + _ZThn4_N9CXCFWTree8AddNodeLEP15CGECOObjectBaseP9MXCFWNodeS3_ @ 117 NONAME ; ## + _ZThn4_N9CXCFWTree8IsLockedEv @ 118 NONAME ; ## + _ZThn4_N9CXCFWTree9MoveNodeLEP9MXCFWNodeS1_S1_ @ 119 NONAME ; ## + _ZThn4_N9CXCFWTree9SetLockedEi @ 120 NONAME ; ## + _ZN11CXCFWEngine17AttributeDetailsLEiR7TPtrC16S1_ @ 121 NONAME + _ZN18CGECODefaultObject17AttributeDetailsLEiR7TPtrC16S1_ @ 122 NONAME + _ZN25CGECODefaultObjectFactory17AttributeDetailsLEiR7TPtrC16S1_ @ 123 NONAME + _ZThn28_N11CXCFWEngine17AttributeDetailsLEiR7TPtrC16S1_ @ 124 NONAME ; ## + _ZThn4_N18CGECODefaultObject17AttributeDetailsLEiR7TPtrC16S1_ @ 125 NONAME ; ## + _ZThn4_N25CGECODefaultObjectFactory17AttributeDetailsLEiR7TPtrC16S1_ @ 126 NONAME ; ## + diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/group/xcfw.mmp --- a/xcfw/group/xcfw.mmp Fri Apr 02 20:17:48 2010 +0200 +++ b/xcfw/group/xcfw.mmp Wed Apr 07 14:35:19 2010 +0200 @@ -19,9 +19,11 @@ #include #include -TARGET XCFW.dll +TARGET XCFW_hs.dll TARGETTYPE DLL -UID 0x1000008d 0x10210EA0 +// new UID +// UID 0x1000008d 0x10210EA0 +UID 0x1000008d 0xEB12332F CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/inc/xcfwentityconverter.h --- a/xcfw/inc/xcfwentityconverter.h Fri Apr 02 20:17:48 2010 +0200 +++ b/xcfw/inc/xcfwentityconverter.h Wed Apr 07 14:35:19 2010 +0200 @@ -30,7 +30,7 @@ * this class is needed only because GMXML would otherwise turn any & character * it finds into a & entity. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CXCFWEntityConverter: public CMDXMLEntityConverter diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/inc/xcfwlocalizer.h --- a/xcfw/inc/xcfwlocalizer.h Fri Apr 02 20:17:48 2010 +0200 +++ b/xcfw/inc/xcfwlocalizer.h Wed Apr 07 14:35:19 2010 +0200 @@ -36,7 +36,7 @@ * and their corresponding text values loaded from a DTD file. Used for content * localization purposes in XCFW. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CXCFWLocalizer : public CBase //CMDXMLEntityConverter diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/inc/xcfwnode.h --- a/xcfw/inc/xcfwnode.h Fri Apr 02 20:17:48 2010 +0200 +++ b/xcfw/inc/xcfwnode.h Wed Apr 07 14:35:19 2010 +0200 @@ -31,7 +31,7 @@ * Node interface for setting data and relative nodes * This interface is not exported, CXCFWTree is the only user. * -* @lib XCFW.lib +* @lib XCFW_hs_hs.lib * @since Series 60 3.1 */ class CXCFWNode : public CBase, public MXCFWNode diff -r 282cea3dd14c -r 666a2952b5b3 xcfw/rom/xcfw.iby --- a/xcfw/rom/xcfw.iby Fri Apr 02 20:17:48 2010 +0200 +++ b/xcfw/rom/xcfw.iby Wed Apr 07 14:35:19 2010 +0200 @@ -22,7 +22,7 @@ #include -file=ABI_DIR\BUILD_DIR\XCFW.dll SHARED_LIB_DIR\XCFW.dll +file=ABI_DIR\BUILD_DIR\XCFW_hs.dll SHARED_LIB_DIR\XCFW_hs.dll #endif