# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701698 -10800 # Node ID 415c00f1675db7d16589a1a2d5cb4537ab23337e # Parent e0c1916b8ddc6e7ce0ab65d482903f3493f349ca Revision: 201035 Kit: 201037 diff -r e0c1916b8ddc -r 415c00f1675d dcmofw/dcmoserver/data/dcmo.rss --- a/dcmofw/dcmoserver/data/dcmo.rss Thu Sep 02 21:22:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Resource file for DCMO component. -* -*/ - - -// INCLUDES -#include -#include -#include -#include -#include - -RESOURCE RSS_SIGNATURE { } - -RESOURCE TBUF { buf=""; } - - -// CONSTANTS - -// MACROS - -// RESOURCE DEFINITIONS - - -// r_dm_run_time_var_disable -// Text for showing Disabled -// Info note for showing the information received. -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_dm_run_time_var_disable { buf = qtn_dm_run_time_var_disable; } - -// r_dm_run_time_var_enable -// Text for showing Enabled -// Info note for showing the information received. -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_dm_run_time_var_enable { buf = qtn_dm_run_time_var_enable; } - -// r_dm_run_time_var_camera -// Text for showing Camera -// Info note for showing the information received. -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_dm_run_time_var_camera { buf = qtn_dm_run_time_var_camera; } - -// r_dm_run_time_var_firmware_update -// Text for showing Firmware Update -// Info note for showing the information received. -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_dm_run_time_var_firmware_update { buf = qtn_dm_run_time_var_firmware_update; } - -// r_dm_run_time_var_external_memory_card -// Text for showing External Memort Card -// Info note for showing the information received. -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_dm_run_time_var_ext_memory { buf = qtn_dm_run_time_var_ext_memory; } - -// r_dm_run_time_var_bluetooth -// Text for showing Bluetooth -// Info note for showing the information received. -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_dm_run_time_var_bluetooth { buf = qtn_dm_run_time_var_bluetooth; } - -// r_dm_run_time_var_wlan -// Text for showing WLAN -// Info note for showing the information received. -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_dm_run_time_var_wlan { buf = qtn_dm_run_time_var_wlan; } - -// r_dm_run_time_var_desktop_sync -// Text for showing Desktop Sync -// Info note for showing the information received. -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_dm_run_time_var_desktop_sync { buf = qtn_dm_run_time_var_desktop_sync; } - - -// End of File diff -r e0c1916b8ddc -r 415c00f1675d dcmofw/dcmoserver/group/bld.inf --- a/dcmofw/dcmoserver/group/bld.inf Thu Sep 02 21:22:11 2010 +0300 +++ b/dcmofw/dcmoserver/group/bld.inf Fri Sep 17 08:34:58 2010 +0300 @@ -20,7 +20,6 @@ PRJ_EXPORTS -../loc/dcmo.loc MW_LAYER_LOC_EXPORT_PATH(dcmo.loc) // Generic configuration interface for component cenrep settings ../conf/dcmo.confml MW_LAYER_CONFML(dcmo.confml) ../conf/dcmo_2001FE47.crml MW_LAYER_CRML(dcmo_2001FE47.crml) diff -r e0c1916b8ddc -r 415c00f1675d dcmofw/dcmoserver/group/dcmoserver.mmp --- a/dcmofw/dcmoserver/group/dcmoserver.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/dcmofw/dcmoserver/group/dcmoserver.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -39,11 +39,6 @@ USERINCLUDE ../inc USERINCLUDE ../../inc -START RESOURCE ../data/dcmo.rss - HEADER - TARGETPATH resource - LANGUAGE_IDS -END LIBRARY euser.lib LIBRARY ecom.lib LIBRARY centralrepository.lib diff -r e0c1916b8ddc -r 415c00f1675d dcmofw/dcmoserver/loc/dcmo.loc --- a/dcmofw/dcmoserver/loc/dcmo.loc Thu Sep 02 21:22:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Localisation file for DCMO framework. -* -*/ - - - -// LOCALISATION STRINGS - -//d:Text to be shown for Disabled -//l:heading_pane_t1 -//r:5.2 -// -#define qtn_dm_run_time_var_disable "Disabled by system administrator:" - -//d:Text to be shown for Enabled -//l:heading_pane_t1 -//r:5.2 -// -#define qtn_dm_run_time_var_enable "Enabled by system administrator:" - -//d:Text to be shown for Camera -//l:list_single_pane_t1_cp2 -//r:5.2 -// -#define qtn_dm_run_time_var_camera "Camera" - -//d:Text to be shown for Firmware Update -//l:list_single_pane_t1_cp2 -//r:5.2 -// -#define qtn_dm_run_time_var_firmware_update "Firmware Update" - -//d:Text to be shown for External Memory Card -//l:list_single_pane_t1_cp2 -//r:5.2 -// -#define qtn_dm_run_time_var_ext_memory "External Memory Card" - -//d:Text to be shown for Bluetooth -//l:list_single_pane_t1_cp2 -//r:5.2 -// -#define qtn_dm_run_time_var_bluetooth "Bluetooth" - -//d:Text to be shown for WLAN -//l:list_single_pane_t1_cp2 -//r:5.2 -// -#define qtn_dm_run_time_var_wlan "WLAN" - -//d:Text to be shown for Desktop Sync -//l:list_single_pane_t1_cp2 -//r:5.2 -// -#define qtn_dm_run_time_var_desktop_sync "Desktop Sync" - -// End of File diff -r e0c1916b8ddc -r 415c00f1675d dcmofw/group/bld.inf --- a/dcmofw/group/bld.inf Thu Sep 02 21:22:11 2010 +0300 +++ b/dcmofw/group/bld.inf Fri Sep 17 08:34:58 2010 +0300 @@ -17,9 +17,10 @@ #include PRJ_EXPORTS -../rom/dcmofw.iby CORE_MW_LAYER_IBY_EXPORT_PATH(dcmofw.iby) + PRJ_MMPFILES +#include "../rom/bld.inf" #include "../dcmoclient/group/bld.inf" #include "../dcmoserver/group/bld.inf" #include "../dcmocustcmd/group/bld.inf" diff -r e0c1916b8ddc -r 415c00f1675d dcmofw/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dcmofw/rom/bld.inf Fri Sep 17 08:34:58 2010 +0300 @@ -0,0 +1,20 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: This file provides building information for DCMO framework ROM +* +*/ +#include + +PRJ_EXPORTS +../rom/dcmofw.iby CORE_MW_LAYER_IBY_EXPORT_PATH(dcmofw.iby) diff -r e0c1916b8ddc -r 415c00f1675d dcmofw/rom/dcmofw.iby --- a/dcmofw/rom/dcmofw.iby Thu Sep 02 21:22:11 2010 +0300 +++ b/dcmofw/rom/dcmofw.iby Fri Sep 17 08:34:58 2010 +0300 @@ -22,7 +22,6 @@ file=ABI_DIR\BUILD_DIR\dcmoclient.dll SHARED_LIB_DIR\dcmoclient.dll #ifdef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION -data=DATAZ_\RESOURCE_FILES_DIR\dcmo.rsc RESOURCE_FILES_DIR\dcmo.rsc file=ABI_DIR\BUILD_DIR\dcmoserver.exe PROGRAMS_DIR\dcmoserver.exe data=\epoc32\data\Z\private\10202BE9\2001FE47.txt private\10202BE9\2001FE47.txt diff -r e0c1916b8ddc -r 415c00f1675d devicemgmtnotifications/group/bld.inf --- a/devicemgmtnotifications/group/bld.inf Thu Sep 02 21:22:11 2010 +0300 +++ b/devicemgmtnotifications/group/bld.inf Fri Sep 17 08:34:58 2010 +0300 @@ -21,9 +21,7 @@ DEFAULT PRJ_EXPORTS -../rom/devicemgmtnotifications.iby CORE_MW_LAYER_IBY_EXPORT_PATH(devicemgmtnotifications.iby) - PRJ_MMPFILES - +#include "../rom/bld.inf" #include "../dmdevdialogclient/bld/bld.inf" #include "../dmdevdialogserver/bld/bld.inf" diff -r e0c1916b8ddc -r 415c00f1675d devicemgmtnotifications/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devicemgmtnotifications/rom/bld.inf Fri Sep 17 08:34:58 2010 +0300 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Build info file for Device management notification ROM +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT +PRJ_EXPORTS + +devicemgmtnotifications.iby CORE_MW_LAYER_IBY_EXPORT_PATH(devicemgmtnotifications.iby) diff -r e0c1916b8ddc -r 415c00f1675d fotaapplication/FotaEngine/group/fotaengine.mmp --- a/fotaapplication/FotaEngine/group/fotaengine.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/fotaapplication/FotaEngine/group/fotaengine.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -41,7 +41,6 @@ MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/uiklaf/private -LIBRARY avkon.lib LIBRARY euser.lib LIBRARY estor.lib LIBRARY apparc.lib @@ -50,10 +49,10 @@ LIBRARY apgrfx.lib LIBRARY mtur.lib LIBRARY eikcore.lib -LIBRARY efsrv.lib -LIBRARY ws32.lib // wssession -LIBRARY centralrepository.lib -LIBRARY flogger.lib +LIBRARY efsrv.lib +LIBRARY ws32.lib // wssession +LIBRARY centralrepository.lib +LIBRARY flogger.lib SMPSAFE diff -r e0c1916b8ddc -r 415c00f1675d fotaapplication/fotaserver/fotaserver.pro --- a/fotaapplication/fotaserver/fotaserver.pro Thu Sep 02 21:22:11 2010 +0300 +++ b/fotaapplication/fotaserver/fotaserver.pro Fri Sep 17 08:34:58 2010 +0300 @@ -12,6 +12,8 @@ TEMPLATE = app TARGET = fotaserver +RSS_RULES += "hidden = KAppIsHidden;" + DEPENDPATH += . \ ./inc \ ./src \ diff -r e0c1916b8ddc -r 415c00f1675d omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp --- a/omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -54,11 +54,9 @@ LIBRARY etelmm.lib LIBRARY etel.lib LIBRARY cryptography.lib -LIBRARY commonui.lib LIBRARY efsrv.lib LIBRARY apmime.lib -LIBRARY centralrepository.lib -LIBRARY eikcoctl.lib +LIBRARY centralrepository.lib LIBRARY xmlframework.lib LIBRARY flogger.lib LIBRARY Sysutil.lib diff -r e0c1916b8ddc -r 415c00f1675d omaprovisioning/pnputil/tsrc/ModuleTest/src/TestPnpUtilBlocks.cpp --- a/omaprovisioning/pnputil/tsrc/ModuleTest/src/TestPnpUtilBlocks.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/omaprovisioning/pnputil/tsrc/ModuleTest/src/TestPnpUtilBlocks.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -26,7 +26,6 @@ #include #include "TestPnpUtil.h" #include -#include #include diff -r e0c1916b8ddc -r 415c00f1675d omaprovisioning/provisioning/AuthTypePlugin/Group/Authtypeplugin.mmp --- a/omaprovisioning/provisioning/AuthTypePlugin/Group/Authtypeplugin.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/omaprovisioning/provisioning/AuthTypePlugin/Group/Authtypeplugin.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -58,11 +58,10 @@ LANGUAGE_IDS END // OperatorLogo resources -LIBRARY eikctl.lib aknnotify.lib eiksrv.lib +LIBRARY eiksrv.lib LIBRARY aknskins.lib // AknsUtils.h LIBRARY apgrfx.lib // RApaLsSession LIBRARY apparc.lib -LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY commdb.lib LIBRARY CommonEngine.lib // RConeResourceLoader @@ -70,16 +69,14 @@ LIBRARY ecom.lib LIBRARY efsrv.lib LIBRARY egul.lib // CGulIcon -LIBRARY eikcoctl.lib LIBRARY eikcore.lib LIBRARY euser.lib LIBRARY featmgr.lib // FeatureManager LIBRARY gsecomplugin.lib LIBRARY gsframework.lib // Base classes LIBRARY gslistbox.lib // CGSListBoxItemTextArray -LIBRARY hlplch.lib // HlpLauncher LIBRARY ws32.lib -LIBRARY akncapserverclient.lib centralrepository.lib provisioningengine.lib +LIBRARY akncapserverclient.lib centralrepository.lib provisioningengine.lib LIBRARY aknicon.lib DEBUGLIBRARY flogger.lib // RFileLogger diff -r e0c1916b8ddc -r 415c00f1675d omaprovisioning/provisioning/AuthTypePlugin/src/Authtypeplugin.cpp --- a/omaprovisioning/provisioning/AuthTypePlugin/src/Authtypeplugin.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/omaprovisioning/provisioning/AuthTypePlugin/src/Authtypeplugin.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -36,7 +36,6 @@ #include #include #include -#include // HlpLauncher #include #include diff -r e0c1916b8ddc -r 415c00f1675d omaprovisioning/provisioning/ProvisioningSC/Group/ProvisioningSC.mmp --- a/omaprovisioning/provisioning/ProvisioningSC/Group/ProvisioningSC.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/omaprovisioning/provisioning/ProvisioningSC/Group/ProvisioningSC.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -77,7 +77,6 @@ LIBRARY wappushutils.lib // cpushmessage LIBRARY smcm.lib // smsheader LIBRARY etext.lib // rich text -LIBRARY aknnotify.lib // global note LIBRARY sysutil.lib LIBRARY wimclient.lib diff -r e0c1916b8ddc -r 415c00f1675d package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Fri Sep 17 08:34:58 2010 +0300 @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r e0c1916b8ddc -r 415c00f1675d package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Sep 17 08:34:58 2010 +0300 @@ -0,0 +1,1 @@ + diff -r e0c1916b8ddc -r 415c00f1675d policymanagement/policyengine/centreptoolserver/src/RepositorySession.cpp --- a/policymanagement/policyengine/centreptoolserver/src/RepositorySession.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/policymanagement/policyengine/centreptoolserver/src/RepositorySession.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -423,8 +423,8 @@ if ( !aSettings.Count() ) { CRangeMeta * setting = CRangeMeta::NewL( aCompareValue, 0, aMask, KBackupBitMask); - aSettings.Append( setting ); - iRangeMetas.Append( setting); + aSettings.AppendL( setting ); + iRangeMetas.AppendL( setting); } } diff -r e0c1916b8ddc -r 415c00f1675d policymanagement/policyengine/group/PolicyEngineUI.mmp --- a/policymanagement/policyengine/group/PolicyEngineUI.mmp Thu Sep 02 21:22:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -/* -* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Implementation of policymanagement components -* -*/ - - -// To get the APP_LAYER_SYSTEMINCLUDE-definition -#include -#include - - -TARGET policyengineui.dll -TARGETTYPE PLUGIN -UID 0x10009D8D 0x10207817 -VENDORID VID_DEFAULT -CAPABILITY CAP_ECOM_PLUGIN - -MW_LAYER_SYSTEMINCLUDE -SYSTEMINCLUDE /epoc32/include/ecom - -START RESOURCE ../policyengineui/data/10207817.rss -TARGET policyengineui.rsc -END - - -START RESOURCE ../policyengineui/data/PolicyEngineUI.rss -HEADER -TARGET policyengineuidlgs.rsc -TARGETPATH RESOURCE_FILES_DIR -LANGUAGE_IDS -END - -// Sources -SOURCEPATH ../policyengineui/src -SOURCE PolicyEngineUi.cpp - -USERINCLUDE . ../policyengineui/inc ../../include -USERINCLUDE ../../../inc // domain private headers - - -// Libraries -LIBRARY euser.lib -LIBRARY eikcore.lib -LIBRARY bafl.lib -LIBRARY avkon.lib -LIBRARY cone.lib -LIBRARY CommonEngine.lib -LIBRARY eikcoctl.lib -LIBRARY eikdlg.lib -LIBRARY eikctl.lib -LIBRARY PlatformEnv.lib -LIBRARY commondialogs.lib -LIBRARY efsrv.lib -LIBRARY eiksrv.lib -LIBRARY flogger.lib -LIBRARY syncservice.lib - - -SMPSAFE diff -r e0c1916b8ddc -r 415c00f1675d policymanagement/policyengine/group/bld.inf --- a/policymanagement/policyengine/group/bld.inf Thu Sep 02 21:22:11 2010 +0300 +++ b/policymanagement/policyengine/group/bld.inf Fri Sep 17 08:34:58 2010 +0300 @@ -28,13 +28,10 @@ ../PMRfsPlugin/scripts/format_e_.txt /epoc32/release/armv5/urel/z/private/1020783f/format_e_.txt ../rom/policyengine.iby CORE_MW_LAYER_IBY_EXPORT_PATH(policyengine.iby) -../rom/policyengineresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(policyengineresources.iby) -//../policyengineui/loc/PolicyEngineUI.loc MW_LAYER_LOC_EXPORT_PATH(policyengineui.loc) PRJ_MMPFILES PolicyEngineClient.mmp CentRepToolClient.mmp -//PolicyEngineUI.mmp PolicyEngineServer.mmp CentRepToolServer.mmp PMRfsPlugin.mmp diff -r e0c1916b8ddc -r 415c00f1675d policymanagement/policyengine/rom/policyengineresources.iby --- a/policymanagement/policyengine/rom/policyengineresources.iby Thu Sep 02 21:22:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Implementation of policymanagement components -* -*/ -#ifndef __POLICYENGINERESOURCES_IBY__ -#define __POLICYENGINERESOURCES_IBY__ - -//#ifdef __SAP_POLICY_MANAGEMENT - -data=DATAZ_\RESOURCE_FILES_DIR\PolicyEngineUIdlgs.rsc RESOURCE_FILES_DIR\PolicyEngineUIdlgs.rsc - -//#endif // __SAP_POLICY_MANAGEMENT - -#endif // __POLICYENGINERESOURCES_IBY__ diff -r e0c1916b8ddc -r 415c00f1675d remotemgmt_plat/dcmo_adapter_api/dcmo_adapter_api.metaxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/remotemgmt_plat/dcmo_adapter_api/dcmo_adapter_api.metaxml Fri Sep 17 08:34:58 2010 +0300 @@ -0,0 +1,13 @@ + + + dcmo_adapter_api + This is the ecom interface that every DCMO (Device Capabilities Management Object) adapter should implement. The adapter, which is an ecom plugins, is loaded by the DCMO framework when needed. + c++ + dcmofw + + + + no + no + + diff -r e0c1916b8ddc -r 415c00f1675d remotemgmt_plat/dcmo_control_api/dcmo_control_api.metaxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/remotemgmt_plat/dcmo_control_api/dcmo_control_api.metaxml Fri Sep 17 08:34:58 2010 +0300 @@ -0,0 +1,15 @@ + + + dcmo_control_api + This is the DCMO (Device Capabilities Management Object) framework API. Clients like OMA DM uses this API to take control over the capabilities of the platform. + c++ + dcmofw + + + + + + no + no + + diff -r e0c1916b8ddc -r 415c00f1675d remotemgmt_plat/devicemgmt_dialogs_api/devicemgmt_dialogs_api.metaxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/remotemgmt_plat/devicemgmt_dialogs_api/devicemgmt_dialogs_api.metaxml Fri Sep 17 08:34:58 2010 +0300 @@ -0,0 +1,12 @@ + + + devicemgmt_dialogs_api + This provides set of constants shared between UI components in remotemgmt, devicecontrol packages and the device dialog's plugin. + c++ + None + + + no + no + + diff -r e0c1916b8ddc -r 415c00f1675d remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp --- a/remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -53,12 +53,10 @@ LIBRARY stiftestengine.lib LIBRARY etelmm.lib LIBRARY etel.lib -LIBRARY cryptography.lib -LIBRARY commonui.lib +LIBRARY cryptography.lib LIBRARY efsrv.lib LIBRARY apmime.lib LIBRARY centralrepository.lib -LIBRARY eikcoctl.lib LIBRARY xmlframework.lib LIBRARY flogger.lib LIBRARY Sysutil.lib diff -r e0c1916b8ddc -r 415c00f1675d remotemgmt_plat/pnpms_utils_api/tsrc/src/TestPnpUtilBlocks.cpp --- a/remotemgmt_plat/pnpms_utils_api/tsrc/src/TestPnpUtilBlocks.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/remotemgmt_plat/pnpms_utils_api/tsrc/src/TestPnpUtilBlocks.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -26,7 +26,6 @@ #include #include "TestPnpUtil.h" #include -#include #include diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/dm/dmnetworkmon/bld/DMNetMon.mmp --- a/syncmlfw/dm/dmnetworkmon/bld/DMNetMon.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/dm/dmnetworkmon/bld/DMNetMon.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -41,7 +41,7 @@ LIBRARY nsmltransporthandler.lib LIBRARY nsmldebug.lib LIBRARY centralrepository.lib -LIBRARY efsrv.lib avkon.lib aknnotify.lib eiksrv.lib +LIBRARY efsrv.lib eiksrv.lib SMPSAFE diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/adapters/dataproviderbase/bld/nsmldataproviderbase.mmp --- a/syncmlfw/ds/adapters/dataproviderbase/bld/nsmldataproviderbase.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/adapters/dataproviderbase/bld/nsmldataproviderbase.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -43,5 +43,5 @@ SYSTEMINCLUDE /epoc32/include/syncml SYSTEMINCLUDE /epoc32/include/ecom -LIBRARY euser.lib estor.lib ECom.lib +LIBRARY euser.lib estor.lib ecom.lib diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/agentlog/src/nsmlagentlog.cpp --- a/syncmlfw/ds/agentlog/src/nsmlagentlog.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/agentlog/src/nsmlagentlog.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -1457,37 +1457,57 @@ break; case ESourceRef: - dbCaps->SetSourceRefL(ptrStringPart); - + if (dbCaps) + { + dbCaps->SetSourceRefL(ptrStringPart); + } break; case EDisplayName: - dbCaps->SetDisplayNameL(ptrStringPart); + if (dbCaps) + { + dbCaps->SetDisplayNameL(ptrStringPart); + } break; case EMaxGUIDSize: - dbCaps->SetMaxGuidSizeL(ptrStringPart); + if (dbCaps) + { + dbCaps->SetMaxGuidSizeL(ptrStringPart); + } break; case ERxPref: separator = ptrStringPart.Locate(KTabSeparator()[0]); - dbCaps->SetRxPrefL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1)); + if (dbCaps) + { + dbCaps->SetRxPrefL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1)); + } break; case ERx: separator = ptrStringPart.Locate(KTabSeparator()[0]); - dbCaps->AddRxL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1)); + if (dbCaps) + { + dbCaps->AddRxL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1)); + } break; case ETxPref: separator = ptrStringPart.Locate(KTabSeparator()[0]); - dbCaps->SetTxPrefL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1)); + if (dbCaps) + { + dbCaps->SetTxPrefL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1)); + } break; case ETx: separator = ptrStringPart.Locate(KTabSeparator()[0]); - dbCaps->AddTxL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1)); + if (dbCaps) + { + dbCaps->AddTxL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1)); + } break; @@ -1495,7 +1515,10 @@ break; case ESupportHierarchicalSync: - dbCaps->SetSupportHierarchicalSyncL(); + if (dbCaps) + { + dbCaps->SetSupportHierarchicalSyncL(); + } break; case ESyncCap: diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/alerthandler/bld/nsmldsalert.mmp --- a/syncmlfw/ds/alerthandler/bld/nsmldsalert.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/alerthandler/bld/nsmldsalert.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -49,8 +49,8 @@ LIBRARY euser.lib LIBRARY estor.lib LIBRARY nsmldebug.lib -LIBRARY NSmlPrivateApi.lib -LIBRARY nsmldssettings.lib +LIBRARY NSmlPrivateAPI.lib +LIBRARY NSmlDSSettings.lib LIBRARY nsmlwbxml.lib LIBRARY nsmlagentcommon.lib LIBRARY ecom.lib diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp --- a/syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -38,7 +38,7 @@ LIBRARY euser.lib LIBRARY estor.lib -LIBRARY nsmldssettings.lib +LIBRARY NSmlDSSettings.lib LIBRARY centralrepository.lib LIBRARY nsmldebug.lib diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/dsutils/dbcaps/src/NSmldbcapsSerializer.cpp --- a/syncmlfw/ds/dsutils/dbcaps/src/NSmldbcapsSerializer.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/dsutils/dbcaps/src/NSmldbcapsSerializer.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -344,9 +344,12 @@ const sml_devinf_datastore_s* dds = aDbCaps.Datastore(); //display name - NSmlUnicodeConverter::HBufC16InUnicodeLC( - TNSmlDbCapsSerializer::SafePtr( dds->displayname ), self->iDisplayName ); - CleanupStack::Pop( self->iDisplayName ); // self->iDisplayName + if(dds) + { + NSmlUnicodeConverter::HBufC16InUnicodeLC( + TNSmlDbCapsSerializer::SafePtr( dds->displayname ), self->iDisplayName ); + CleanupStack::Pop( self->iDisplayName ); // self->iDisplayName + } //sync types TSmlSyncTypeMask& synctype( self->iSyncTypeMask ); @@ -404,31 +407,34 @@ { synctype.SetNotSupported( ESmlRefreshFromClient ); } - - if ( dds->dsmem ) - { - //max size - if ( dds->dsmem->maxmem ) - { - TLex8 lex( dds->dsmem->maxmem->Data() ); - User::LeaveIfError( lex.Val( self->iMaxSize, EDecimal ) ); - self->iFlags |= KSmlDataStore_HasMaxSize; - } - - //max items - if ( dds->dsmem->maxid ) - { - TLex8 lex( dds->dsmem->maxid->Data() ); - User::LeaveIfError( lex.Val( self->iMaxItems, EDecimal ) ); - self->iFlags |= KSmlDataStore_HasMaxItems; - } - } - - //options - if ( dds->supportHierarchicalSync ) - { - self->iFlags |= KSmlDataStore_Hierarchical; - } + if (dds) + { + if ( dds->dsmem ) + { + //max size + if ( dds->dsmem->maxmem ) + { + TLex8 lex( dds->dsmem->maxmem->Data() ); + User::LeaveIfError( lex.Val( self->iMaxSize, EDecimal ) ); + self->iFlags |= KSmlDataStore_HasMaxSize; + } + + //max items + if ( dds->dsmem->maxid ) + { + TLex8 lex( dds->dsmem->maxid->Data() ); + User::LeaveIfError( lex.Val( self->iMaxItems, EDecimal ) ); + self->iFlags |= KSmlDataStore_HasMaxItems; + } + } + + + //options + if ( dds->supportHierarchicalSync ) + { + self->iFlags |= KSmlDataStore_Hierarchical; + } + } //filter caps const sml_devinf_filtercaplist_s* filterList = aDbCaps.FilterCapsList(); @@ -450,90 +456,93 @@ // First search all mime types that server supports at receiving // RX-pref CSmlMimeFormat* tempFormatRX = CSmlMimeFormat::NewLC(); - const TPtrC8& ctTypeRX = TNSmlDbCapsSerializer::SafePtr( dds->rxpref->cttype ); - const TPtrC8& verCtRX = TNSmlDbCapsSerializer::SafePtr( dds->rxpref->verct ); - if ( ctTypeRX.Compare( KNullDesC8 ) != 0 && verCtRX.Compare( KNullDesC8 ) != 0 ) - { - RStringF mimeFormatRX = aStringPool.OpenFStringL( ctTypeRX ); - RStringF mimeVersionRX = aStringPool.OpenFStringL( verCtRX ); - tempFormatRX->SetMimeTypeL( mimeFormatRX ); - tempFormatRX->SetMimeVersionL( mimeVersionRX ); - mimeFormatArray.AppendL( tempFormatRX ); - CleanupStack::Pop(); // tempFormatRX - } - else - { - CleanupStack::PopAndDestroy(); // tempFormatRX - } - // RXs - if ( dds ) - { - SmlDevInfXmitListPtr_t rx = dds->rx; - for ( ; rx ; rx = rx->next ) - { - CSmlMimeFormat* tempFormat = CSmlMimeFormat::NewLC(); - const TPtrC8& ctType = TNSmlDbCapsSerializer::SafePtr( rx->data->cttype ); - const TPtrC8& verCt = TNSmlDbCapsSerializer::SafePtr( rx->data->verct ); - if ( ctType.Compare( KNullDesC8 ) != 0 && verCt.Compare( KNullDesC8 ) != 0 ) - { - RStringF mimeFormat = aStringPool.OpenFStringL( ctType ); - RStringF mimeVersion = aStringPool.OpenFStringL( verCt ); - tempFormat->SetMimeTypeL( mimeFormat ); - tempFormat->SetMimeVersionL( mimeVersion ); - mimeFormatArray.AppendL( tempFormat ); - CleanupStack::Pop(); // tempFormat - } - else - { - CleanupStack::PopAndDestroy(); // tempFormat - } - } - } - - const sml_devinf_ctcaplist_s* ctCapList = dds->ctcap; - if ( ctCapList == 0 ) - { - ctCapList = aDbCaps.CtCaps(); - } - // Then add CTCaps to correct mime types - if ( ctCapList != 0 ) - { - for (; ctCapList; ctCapList = ctCapList->next ) - { - const SmlDevInfCtCapPtr_t ctCap = ctCapList->data; - if ( ctCap->cttype->Data() == KNSmlFolderType ) - { - SmlDevInfPropertyListPtr_t dipl = ctCap->property; - for ( ; dipl; dipl = dipl->next ) - { - const SmlDevInfPropertyPtr_t dip = dipl->data; - if ( dip ) - { - CSmlDataProperty *temppoint = CNSmlDataPropertyFromDbCaps::NewLC( aStringPool, dip ); - self->iFolderProperties.AppendL( temppoint ); - CleanupStack::Pop(); // temppoint - } - } - } - else - { - for ( TInt j(0); j < mimeFormatArray.Count(); j++ ) - { - if ( mimeFormatArray[j]->MimeType().DesC().Compare( ctCap->cttype->Data() ) == 0 ) - { - // Mime version is only in rx-pref or in rx so it must be copied to new mime format - CSmlMimeFormat* temppoint = CNSmlMimeFormatFromDbCaps::NewLC( aStringPool, *ctCap ); - RStringF newMimeVersion = aStringPool.OpenFStringL( mimeFormatArray[j]->MimeVersion().DesC() ); - temppoint->SetMimeVersionL( newMimeVersion ); - delete mimeFormatArray[j]; - mimeFormatArray[j] = NULL; - mimeFormatArray[j] = temppoint; - CleanupStack::Pop(); // temppoint - } - } - } - } - } + if( dds ) + { + const TPtrC8& ctTypeRX = TNSmlDbCapsSerializer::SafePtr( dds->rxpref->cttype ); + const TPtrC8& verCtRX = TNSmlDbCapsSerializer::SafePtr( dds->rxpref->verct ); + + if ( ctTypeRX.Compare( KNullDesC8 ) != 0 && verCtRX.Compare( KNullDesC8 ) != 0 ) + { + RStringF mimeFormatRX = aStringPool.OpenFStringL( ctTypeRX ); + RStringF mimeVersionRX = aStringPool.OpenFStringL( verCtRX ); + tempFormatRX->SetMimeTypeL( mimeFormatRX ); + tempFormatRX->SetMimeVersionL( mimeVersionRX ); + mimeFormatArray.AppendL( tempFormatRX ); + CleanupStack::Pop(); // tempFormatRX + } + else + { + CleanupStack::PopAndDestroy(); // tempFormatRX + } + // RXs + + SmlDevInfXmitListPtr_t rx = dds->rx; + for ( ; rx ; rx = rx->next ) + { + CSmlMimeFormat* tempFormat = CSmlMimeFormat::NewLC(); + const TPtrC8& ctType = TNSmlDbCapsSerializer::SafePtr( rx->data->cttype ); + const TPtrC8& verCt = TNSmlDbCapsSerializer::SafePtr( rx->data->verct ); + if ( ctType.Compare( KNullDesC8 ) != 0 && verCt.Compare( KNullDesC8 ) != 0 ) + { + RStringF mimeFormat = aStringPool.OpenFStringL( ctType ); + RStringF mimeVersion = aStringPool.OpenFStringL( verCt ); + tempFormat->SetMimeTypeL( mimeFormat ); + tempFormat->SetMimeVersionL( mimeVersion ); + mimeFormatArray.AppendL( tempFormat ); + CleanupStack::Pop(); // tempFormat + } + else + { + CleanupStack::PopAndDestroy(); // tempFormat + } + } + + + const sml_devinf_ctcaplist_s* ctCapList = dds->ctcap; + if ( ctCapList == 0 ) + { + ctCapList = aDbCaps.CtCaps(); + } + // Then add CTCaps to correct mime types + if ( ctCapList != 0 ) + { + for (; ctCapList; ctCapList = ctCapList->next ) + { + const SmlDevInfCtCapPtr_t ctCap = ctCapList->data; + if ( ctCap->cttype->Data() == KNSmlFolderType ) + { + SmlDevInfPropertyListPtr_t dipl = ctCap->property; + for ( ; dipl; dipl = dipl->next ) + { + const SmlDevInfPropertyPtr_t dip = dipl->data; + if ( dip ) + { + CSmlDataProperty *temppoint = CNSmlDataPropertyFromDbCaps::NewLC( aStringPool, dip ); + self->iFolderProperties.AppendL( temppoint ); + CleanupStack::Pop(); // temppoint + } + } + } + else + { + for ( TInt j(0); j < mimeFormatArray.Count(); j++ ) + { + if ( mimeFormatArray[j]->MimeType().DesC().Compare( ctCap->cttype->Data() ) == 0 ) + { + // Mime version is only in rx-pref or in rx so it must be copied to new mime format + CSmlMimeFormat* temppoint = CNSmlMimeFormatFromDbCaps::NewLC( aStringPool, *ctCap ); + RStringF newMimeVersion = aStringPool.OpenFStringL( mimeFormatArray[j]->MimeVersion().DesC() ); + temppoint->SetMimeVersionL( newMimeVersion ); + delete mimeFormatArray[j]; + mimeFormatArray[j] = NULL; + mimeFormatArray[j] = temppoint; + CleanupStack::Pop(); // temppoint + } + } + } + } + } + } self->SetMimeFormatsL( mimeFormatArray ); mimeFormatArray.ResetAndDestroy(); CleanupStack::PopAndDestroy(); // mimeFormatArray diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp --- a/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -59,6 +59,6 @@ LIBRARY nsmlchangefinder.lib syncmldatafilter.lib #ifdef ARMCC -LIBRARY ECOM.LIB +LIBRARY ecom.lib #endif diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldsasynccallback.cpp --- a/syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldsasynccallback.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldsasynccallback.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -88,6 +88,7 @@ if ( iReqFinishedFunc != NULL ) { ( *iSession.*iReqFinishedFunc )( this, ECanceled ); + iMessage.Complete( KErrCancel); } } diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/netmon/bld/NetMon.mmp --- a/syncmlfw/ds/netmon/bld/NetMon.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/netmon/bld/NetMon.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -40,7 +40,7 @@ LIBRARY flogger.lib LIBRARY syncmlclientapi.lib LIBRARY nsmltransporthandler.lib -LIBRARY nsmlprofileutil.lib +LIBRARY NsmlProfileUtil.lib LIBRARY nsmldebug.lib LIBRARY centralrepository.lib LIBRARY efsrv.lib diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/provisioningadapter/bld/NSmlDsProvisioningAdapter.mmp --- a/syncmlfw/ds/provisioningadapter/bld/NSmlDsProvisioningAdapter.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/provisioningadapter/bld/NSmlDsProvisioningAdapter.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -49,8 +49,8 @@ MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/ecom -LIBRARY euser.lib ECom.lib commdb.lib charconv.lib cmmanager.lib +LIBRARY euser.lib ecom.lib commdb.lib charconv.lib cmmanager.lib LIBRARY nsmldbcaps.lib bafl.lib efsrv.lib nsmldebug.lib syncmlclientapi.lib -LIBRARY ProvisioningEngine.lib centralrepository.lib +LIBRARY provisioningengine.lib centralrepository.lib SMPSAFE diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp --- a/syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/settings/src/NSmlDSSettings.cpp --- a/syncmlfw/ds/settings/src/NSmlDSSettings.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/settings/src/NSmlDSSettings.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -16,7 +16,7 @@ */ -#include +#include #include #include diff -r e0c1916b8ddc -r 415c00f1675d syncmlfw/ds/syncagent/bld/nsmldsagent.mmp --- a/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -78,7 +78,7 @@ LIBRARY nsmlagentlog.lib LIBRARY nsmldbcaps.lib LIBRARY nsmlchangefinder.lib -LIBRARY nsmldssettings.lib +LIBRARY NSmlDSSettings.lib LIBRARY nsmlfilter.lib LIBRARY nsmldshostclient.lib LIBRARY nsmlhistorylog.lib diff -r e0c1916b8ddc -r 415c00f1675d terminalsecurity/SCP/SCPClient/group/SCPClient.mmp --- a/terminalsecurity/SCP/SCPClient/group/SCPClient.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/terminalsecurity/SCP/SCPClient/group/SCPClient.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -49,22 +49,16 @@ LIBRARY euser.lib LIBRARY cone.lib -LIBRARY eikcoctl.lib -LIBRARY eikctl.lib LIBRARY eikcore.lib LIBRARY fbscli.lib LIBRARY efsrv.lib -LIBRARY avkon.lib -LIBRARY aknnotify.lib -LIBRARY eikdlg.lib LIBRARY ws32.lib LIBRARY CommonEngine.lib LIBRARY bafl.lib LIBRARY flogger.lib LIBRARY featmgr.lib -LIBRARY centralrepository.lib // CenRep -LIBRARY aknnotify.lib -LIBRARY estor.lib +LIBRARY centralrepository.lib // CenRep +LIBRARY estor.lib // End of file diff -r e0c1916b8ddc -r 415c00f1675d terminalsecurity/SCP/SCPServer/group/SCPServer.mmp --- a/terminalsecurity/SCP/SCPServer/group/SCPServer.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/terminalsecurity/SCP/SCPServer/group/SCPServer.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -64,7 +64,6 @@ LIBRARY euser.lib LIBRARY cone.lib -LIBRARY eikcoctl.lib LIBRARY eikcore.lib LIBRARY fbscli.lib LIBRARY efsrv.lib diff -r e0c1916b8ddc -r 415c00f1675d terminalsecurity/SCP/SCPServer/inc/SCPConfiguration.h --- a/terminalsecurity/SCP/SCPServer/inc/SCPConfiguration.h Thu Sep 02 21:22:11 2010 +0300 +++ b/terminalsecurity/SCP/SCPServer/inc/SCPConfiguration.h Fri Sep 17 08:34:58 2010 +0300 @@ -29,9 +29,8 @@ enum TSCPParamType { EParTypeInt = 0, - EParTypeDesc, - EParTypeBool - }; + EParTypeDesc + }; // LOCAL CONSTANTS @@ -57,11 +56,10 @@ const TInt KParamIDBlockedInOOS = 7; // ID number for the encrypted security code. const TInt KParamIDCryptoCode = 8; -//ID number for the boolean for the configuartion check -const TInt KParamIDConfigChecked = 9; + // Total number of Param IDs -const TInt KTotalParamIDs = 9; +const TInt KTotalParamIDs = 8; //#ifdef __SAP_DEVICE_LOCK_ENHANCEMENTS #define SCP_PARAMETERS_WithFlag { &iConfigFlag, \ @@ -71,9 +69,8 @@ &iFailedAttempts, \ &iBlockedAtTime, \ &iBlockedInOOS, \ - &iCryptoCode, \ - &iConfigChecked \ - }; + &iCryptoCode \ + }; #define SCP_PARAMIDS_WithFlag { KParamIDConfigFlag, \ KParamIDMaxTimeout, \ @@ -82,9 +79,8 @@ KParamIDFailedAttempts, \ KParamIDBlockedAtTime, \ KParamIDBlockedInOOS, \ - KParamIDCryptoCode, \ - KParamIDConfigChecked \ - }; + KParamIDCryptoCode \ + }; #define SCP_PARAMTYPES_WithFlag { EParTypeInt, \ EParTypeInt, \ @@ -93,9 +89,8 @@ EParTypeInt, \ EParTypeDesc, \ EParTypeInt, \ - EParTypeDesc, \ - EParTypeBool \ - }; + EParTypeDesc\ + }; //#else // !__SAP_DEVICE_LOCK_ENHANCEMENTS @@ -189,10 +184,7 @@ /** The name of the main configuration file */ TFileName iConfigFileName; TInt iBlockedInOOS; - - //Flag to check whether Configuration checked already - TBool iConfigChecked; - + /** A ptr to a connected RFs, not owned */ RFs* iFsSession; diff -r e0c1916b8ddc -r 415c00f1675d terminalsecurity/SCP/SCPServer/src/SCPConfiguration.cpp --- a/terminalsecurity/SCP/SCPServer/src/SCPConfiguration.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/terminalsecurity/SCP/SCPServer/src/SCPConfiguration.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -155,12 +155,6 @@ break; } - case ( EParTypeBool ): - { - ret = params->Get( KParamIDs[i], *(reinterpret_cast( KParameters[i] )) ); - break; - } - default: // No implementation needed break; @@ -301,13 +295,7 @@ ret = params->Set( KParamIDs[i], *(reinterpret_cast( KParameters[i] )) ); break; } - - case ( EParTypeBool ): - { - ret = params->Set( KParamIDs[i], *(reinterpret_cast( KParameters[i] )) ); - break; - } - + default: // No implementation needed break; diff -r e0c1916b8ddc -r 415c00f1675d terminalsecurity/SCP/SCPServer/src/SCPServer.cpp --- a/terminalsecurity/SCP/SCPServer/src/SCPServer.cpp Thu Sep 02 21:22:11 2010 +0300 +++ b/terminalsecurity/SCP/SCPServer/src/SCPServer.cpp Fri Sep 17 08:34:58 2010 +0300 @@ -115,7 +115,7 @@ // Assign default config flag iConfiguration.iConfigFlag = KSCPConfigUnknown; - iConfiguration.iConfigChecked = EFalse; + // Assign the default codes iConfiguration.iSecCode.Zero(); @@ -172,24 +172,8 @@ } - //If Configuration is not validated already, validate it - - if (!iConfiguration.iConfigChecked) - { - TInt valerr = KErrNone; - TRAP( valerr, ValidateConfigurationL( KSCPComplete )); - if (valerr != KErrNone) - { - Dprint( (_L("CSCPServer::ConstructL(): Configuration Validation failed: %d"), valerr )); - } - else - { - Dprint( (_L("CSCPServer::ConstructL(): Configuration Validation Passed"))); - } - } - - - + + Dprint( (_L("CSCPServer::ConstructL(): Connecting to CenRep") )); iALPeriodRep = CRepository::NewL( KCRUidSecuritySettings ); @@ -654,155 +638,90 @@ // void CSCPServer::ValidateConfigurationL( TInt aMode ) { - Dprint( (_L("--> CSCPServer::ValidateConfigurationL()") )); - RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()")); - TInt startupReason(ENormalStartup); - RProperty::Get(KPSUidStartup, KPSStartupReason, startupReason); - Dprint( (_L("CSCPServer::ValidateConfigurationL(): startupReason = %d"), startupReason)); - if((startupReason == ENormalRFSReset)||(startupReason == EDeepRFSReset)||(startupReason == EFirmwareUpdate)||(iConfiguration.iConfigFlag == KSCPConfigUnknown)) - { + if (aMode == KSCPInitial) { + // Return here, must be checked by complete mode + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()@@aMode == KSCPInitial ")); + User::Leave(KErrAccessDenied); + } - RMobilePhone::TMobilePassword storedCode; + RMobilePhone::TMobilePassword storedCode; storedCode.Zero(); User::LeaveIfError(GetCode(storedCode)); - - - Dprint( (_L("CSCPServer::ValidateConfigurationL(): Checking code: %s"), storedCode.PtrZ() )); - // Check that the ISA code is stored correctly - TRAPD( err, CheckISACodeL( storedCode ) ); - //Bool for the correction of Defaultlockcode cenrep - TBool lCorrectDefaultlockcode = EFalse; - - Dprint( (_L("CSCPServer::ValidateConfigurationL(): iConfigFlag = %d, iConfigChecked = %d"), iConfiguration.iConfigFlag, iConfiguration.iConfigChecked)); - - if ((iConfiguration.iConfigFlag == KSCPConfigOK) - && (iConfiguration.iConfigChecked) && (err == KErrNone)) - { - // The configuration has already been checked, exit - Dprint( (_L("CSCPServer::ValidateConfigurationL(): Configuration is non-default.") )); - User::Leave( KErrNone ); - } - else if ( aMode == KSCPInitial ) - { - // Return here, must be checked by complete mode - User::Leave( KErrAccessDenied ); - } - - - TInt hashedISAcode; - TSCPSecCode hashedCode; -//#ifdef __SAP_DEVICE_LOCK_ENHANCEMENTS -if(FeatureManager::FeatureSupported(KFeatureIdSapDeviceLockEnhancements)) -{ - /*TInt*/ hashedISAcode = HashISACode( iConfiguration.iEnhSecCode ); - // TSCPSecCode hashedCode; - hashedCode.Zero(); - hashedCode.AppendNum( hashedISAcode ); -} -//#endif // __SAP_DEVICE_LOCK_ENHANCEMENTS - - + TBool isDefaultLockcode = ETrue; + TInt err = KErrNone; - - if (err != KErrNone) - { - lCorrectDefaultlockcode = ETrue; + RMobilePhone::TMobilePassword defaultLockcode; + defaultLockcode.Zero(); + defaultLockcode.Copy(KSCPDefaultSecCode); + if (storedCode.Compare(KSCPDefaultSecCode) == 0) { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()@config has KSCPDefaultSecCode ")); + TRAP( err, CheckISACodeL( defaultLockcode ) ); + if (err == KErrNone) { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()@ISA also has KSCPDefaultSecCode ")); + iConfiguration.iConfigFlag = KSCPConfigOK; + isDefaultLockcode = ETrue; } - if ( err == KErrNone ) - { - iConfiguration.iConfigFlag = KSCPConfigOK; - } - else if ( err == KErrAccessDenied ) - { - iConfiguration.iConfigFlag = KSCPConfigInvalid; - } - else if ( err == KErrLocked ) - { - Dprint( (_L("CSCPServer::ValidateConfigurationL(): ISA code locked.") )); + else { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()@ISA doesn't has KSCPDefaultSecCode ")); + iConfiguration.iConfigFlag = KSCPConfigInvalid; + iConfiguration.iFailedAttempts++; + isDefaultLockcode = EFalse; } - else - { - Dprint( (_L("CSCPServer::ValidateConfigurationL(): ERROR in validation.") )); + } + else { + RDebug::Print(_L("CSCPServer::CheckISACodeL(): config lock code %s"), storedCode.PtrZ()); + TRAP( err, CheckISACodeL( storedCode ) ); + if (err == KErrNone) { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()@ISA and config are in SYNC !! ")); + iConfiguration.iConfigFlag = KSCPConfigOK; + isDefaultLockcode = EFalse; } - -//#ifdef __SAP_DEVICE_LOCK_ENHANCEMENTS -if(FeatureManager::FeatureSupported(KFeatureIdSapDeviceLockEnhancements)) -{ - if ( err == KErrNone ) - { - // Check that the codes are in-sync with each other. Especially the default ISA code must - // be changed according to the default enhanced code. - if ( storedCode.Compare( hashedCode ) != 0 ) + else { + iConfiguration.iSecCode.Zero(); + iConfiguration.iSecCode.Append(KSCPDefaultSecCode); + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()@May be ISA has KSCPDefaultSecCode ")); + TRAP(err,ChangeISACodeL(storedCode)); + if (err == KErrNone) { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()chnaged ISA code with config value ")); + iConfiguration.iConfigFlag = KSCPConfigOK; + isDefaultLockcode = EFalse; + } + else { - Dprint( (_L("CSCPServer::ValidateConfigurationL(): Correct ISA code stored.\ - Changing ISA code to match enhanced code => %d"), hashedISAcode )); - - storedCode.Copy( hashedCode ); - // Change the ISA code to match the hashed code - ChangeISACodeL( storedCode ); + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()it shouldn't reach this :( ")); } } - else if ( ( err == KErrAccessDenied ) && ( storedCode.Compare( hashedCode ) != 0 ) ) - { - // Try again with the hashed code - TRAP( err, CheckISACodeL( hashedCode ) ); - - if ( err == KErrNone ) - { - Dprint( (_L("CSCPServer::ValidateConfigurationL(): Hashed code is correct.\ - Storing hashed code(%d)"), hashedISAcode )); - - if ( StoreCode( hashedCode ) == KErrNone ) - { - iConfiguration.iConfigFlag = KSCPConfigOK; - lCorrectDefaultlockcode = ETrue; - } - } - } + } + + CRepository* repository = CRepository::NewL(KCRUidSCPLockCode); + CleanupStack::PushL(repository); + if (isDefaultLockcode ) { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()setting def. lockcode to 12345 ")); + repository->Set(KSCPLockCodeDefaultLockCode, 12345); + } + else { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()setting def. lockcode to 0 ")); + repository->Set(KSCPLockCodeDefaultLockCode, 0); + } + CleanupStack::PopAndDestroy(repository); - //If Correction of Defaultlockcode cenrep is required for the mismatch between Config and ISA - if (lCorrectDefaultlockcode) - { - TInt lDefCode = -1; - CRepository* lRepository = CRepository::NewL(KCRUidSCPLockCode); - CleanupStack::PushL(lRepository); - TInt lRet = lRepository->Get(KSCPLockCodeDefaultLockCode, - lDefCode); - if (lRet == KErrNone && lDefCode != -1) - { - if (lDefCode == 12345) - { - //Although lock code is already set, due to some unexpected condition - //like C drive wipe, cenrep status is wrongly shown. Correcting it here. - lRepository->Set(KSCPLockCodeDefaultLockCode, 0); - Dprint( (_L("RSCPClient::ValidateConfigurationL(): Corrected the Default lock code cenrep status to 0") )); - } - else if (lDefCode == 0) - { - //If only ISA side is formatted, then the lock code on ISA side is default; - //Cenrep status remains wrongly as the lock code is already set. Correcting it here. - lRepository->Set(KSCPLockCodeDefaultLockCode, 12345); - Dprint( (_L("RSCPClient::ValidateConfigurationL(): Corrected the Default lock code cenrep status to 12345") )); - } - } - CleanupStack::PopAndDestroy(lRepository); - } - } -//#endif // __SAP_DEVICE_LOCK_ENHANCEMENTS - //Set the flag to True, after config is validated - iConfiguration.iConfigChecked = ETrue; - - TRAPD( err2, iConfiguration.WriteSetupL() ); - if ( err2 != KErrNone ) - { + TRAP( err, iConfiguration.WriteSetupL() ); + if (err != KErrNone) { Dprint( (_L("CSCPServer::ValidateConfigurationL(): WARNING: failed to write configuration\ - : %d"), err2 )); - } - - User::LeaveIfError( err ); - } - Dprint( (_L("<-- CSCPServer::ValidateConfigurationL()") )); + : %d"), err )); + } + + if (iConfiguration.iConfigFlag == KSCPConfigOK) { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()@iConfigFlag == KSCPConfigOK ")); + err = KErrNone; } + else { + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()@iConfigFlag == KErrAccessDenied ")); + err = KErrAccessDenied; + } + + User::LeaveIfError(err); +} @@ -823,7 +742,10 @@ (void)aCode; #endif // __WINS__ - + + +Dprint( (_L("CSCPServer::CheckISACodeL(): current lock code %s"), aCode.PtrZ() )); +RDebug::Print(_L("CSCPServer::CheckISACodeL(): current lock code %s"), aCode.PtrZ()); RMobilePhone::TMobilePhoneSecurityCode secCodeType; secCodeType = RMobilePhone::ESecurityCodePhonePassword; @@ -859,6 +781,7 @@ { iConfiguration.iBlockedInOOS = 0; Dprint( (_L("CSCPServer::CheckISACodeL():iBlockedInOOS = 0, KErrAccessDenied") )); + RDebug::Print(_L("--> CSCPServer::CheckISACodeL()@@iBlockedInOOS = 0, KErrAccessDenie")); } ret = KErrAccessDenied; } @@ -867,17 +790,20 @@ Dprint( (_L("CSCPServer::CheckISACodeL(): ISA code BLOCKED") )); if (ret==KErrGsmSSPasswordAttemptsViolation) { - Dprint( (_L("CSCPServer::CheckISACodeL(): KErrGsmSSPasswordAttemptsViolation") )); + Dprint( (_L("CSCPServer::CheckISACodeL(): KErrGsmSSPasswordAttemptsViolation") )); + RDebug::Print(_L("--> CSCPServer::CheckISACodeL()@@KErrGsmSSPasswordAttemptsViolation")); } else { Dprint( (_L("CSCPServer::CheckISACodeL(): KErrLocked") )); + RDebug::Print(_L("--> CSCPServer::CheckISACodeL()@@KErrLocked")); } ret = KErrLocked; if (iConfiguration.iBlockedInOOS == 0) { iConfiguration.iBlockedInOOS = 1; Dprint( (_L("CSCPServer::CheckISACodeL():iBlockedInOOS = 1, KSCPErrCodeBlockStarted") )); + RDebug::Print(_L("--> CSCPServer::CheckISACodeL()@@@@@")); ret = KSCPErrCodeBlockStarted; } } @@ -885,6 +811,7 @@ { Dprint( (_L("CSCPServer::CheckISACodeL(): ERROR reply checking ISA code: %d"), status.Int() )); + RDebug::Print(_L("--> CSCPServer::ValidateConfigurationL()")); } } TRAPD( err, iConfiguration.WriteSetupL() ); @@ -1002,6 +929,7 @@ TRAP(err, repository = CRepository :: NewL(KCRUidSCPLockCode)); if(err == KErrNone) { + RDebug::Print(_L("<-- CSCPServer::StoreEnhCode() setting KSCPLockCodeDefaultLockCode to 0")); err = repository->Set(KSCPLockCodeDefaultLockCode, 0); delete repository; } @@ -2183,11 +2111,13 @@ // We might be out-of-sync, no idea about the real code. // Check if the DOS code hashed from the given code is correct. Dprint( (_L("CSCPServer::IsCorrectEnhCode(): Attempting to correct OoS situation.") )); - + if (IsCodeBlocked()) { + Dprint( (_L("CSCPServer::IsCorrectEnhCode(): OOS ->KErrLocked ") )); + return KErrLocked; + } TRAP( ret, CheckISACodeL( pswCandidate ) ); - if ( ret == KErrNone ) - { + if (ret == KErrNone) { // OK, we must assume that this is the correct code, since // the hashed DOS code is correct. Save the codes, and return OK. @@ -2203,39 +2133,34 @@ // Unset the invalid configuration flag iConfiguration.iConfigFlag = KSCPConfigOK; writeSetup = ETrue; - } - else - { - - Dprint( (_L("CSCPServer::IsCorrectEnhCode(): Given code does not have the \ - correct hash: ret; %d user enter password: %d"), ret )); - TRAP( ret, CheckISACodeL( aCode ) ); - if (ret == KErrNone) - { - //store this code in our interal storage as it is used as oldpassword while changing at ISA side in next command - //ChangeISACodeL. - iConfiguration.iSecCode.Zero(); - iConfiguration.iSecCode.Append( aCode ); - TRAP(ret,ChangeISACodeL(pswCandidate)); - } - if (ret == KErrNone) - { - iConfiguration.iEnhSecCode.Zero(); - iConfiguration.iEnhSecCode.Copy( hashBuf ); + } + else { + ret = KErrAccessDenied; + + iConfiguration.iFailedAttempts++; + Dprint( (_L("CSCPServer::IsCorrectEnhCode():@@@: iFailedAttempts (%d)."), iConfiguration.iFailedAttempts )); + writeSetup = ETrue; - iConfiguration.iSecCode.Zero(); - iConfiguration.iSecCode.AppendNum( ISACode ); - - // Unset the invalid configuration flag - iConfiguration.iConfigFlag = KSCPConfigOK; - writeSetup = ETrue; - } + if (iConfiguration.iFailedAttempts == KSCPCodeBlockLimit) { + Dprint( (_L("CSCPServer::IsCorrectEnhCode(): KSCPCodeBlockLimit ") )); + // Block the code + TTime curTime; + curTime.UniversalTime(); + + iConfiguration.iBlockedAtTime.Zero(); + iConfiguration.iBlockedAtTime.AppendNum(curTime.Int64()); + + // The code will be blocked for now on + ret = KSCPErrCodeBlockStarted; } } + + } // Write setup if needed if ( writeSetup ) { + Dprint( (_L("CSCPServer::IsCorrectEnhCode(): 7 ") )); TRAPD( err, iConfiguration.WriteSetupL() ); if ( err != KErrNone ) { @@ -2243,7 +2168,7 @@ failed to write configuration: %d"), err )); } } - Dprint( (_L("CSCPServer::IsCorrectEnhCode %d"), ret )); + return ret; } diff -r e0c1916b8ddc -r 415c00f1675d terminalsecurity/SCP/SCPTimestampPlugin/group/SCPTimestampPlugin.mmp --- a/terminalsecurity/SCP/SCPTimestampPlugin/group/SCPTimestampPlugin.mmp Thu Sep 02 21:22:11 2010 +0300 +++ b/terminalsecurity/SCP/SCPTimestampPlugin/group/SCPTimestampPlugin.mmp Fri Sep 17 08:34:58 2010 +0300 @@ -59,7 +59,6 @@ LIBRARY bafl.lib // for BaFutil LIBRARY cone.lib // CoeEnvironment LIBRARY efsrv.lib // FileServer -LIBRARY aknnotify.lib // For wipe LIBRARY starterclient.lib