--- a/commondrm/drmrightsmanagerui/help/inc/drm.hlp.hrh Thu Jan 07 12:54:19 2010 +0200
+++ b/commondrm/drmrightsmanagerui/help/inc/drm.hlp.hrh Mon Jan 18 20:30:37 2010 +0200
@@ -2,9 +2,9 @@
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
--- a/commondrm/drmutility/src/DrmUiHandlingImpl.cpp Thu Jan 07 12:54:19 2010 +0200
+++ b/commondrm/drmutility/src/DrmUiHandlingImpl.cpp Mon Jan 18 20:30:37 2010 +0200
@@ -1612,6 +1612,12 @@
{
permission = iOmaClient.GetActiveRightsL( aIntent, *aContentUri,
reason );
+
+ if( !permission )
+ {
+ User::Leave( KErrCANoPermission); //coverity check
+ }
+
CleanupStack::PushL( permission );
toplevel = permission->TopLevelConstraint();
@@ -3772,9 +3778,9 @@
CAknLaunchAppService* launchAppService( CAknLaunchAppService::NewL(
KUidDRMUI, this, paramList ) );
+ CleanupStack::PushL( launchAppService );
iWait.Start();
- delete launchAppService;
- CleanupStack::PopAndDestroy( paramList );
+ CleanupStack::PopAndDestroy( 2, paramList );
}
else
{
--- a/commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp Thu Jan 07 12:54:19 2010 +0200
+++ b/commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp Mon Jan 18 20:30:37 2010 +0200
@@ -622,9 +622,9 @@
CAknLaunchAppService::NewL( KUidDRMUI,
this,
paramList ) );
+ CleanupStack::PushL( launchAppService );
iWait.Start();
- delete launchAppService;
- CleanupStack::PopAndDestroy( paramList );
+ CleanupStack::PopAndDestroy( 2, paramList );
}
else
{
--- a/drm_plat/camese_utility_api/group/bld.inf Thu Jan 07 12:54:19 2010 +0200
+++ b/drm_plat/camese_utility_api/group/bld.inf Mon Jan 18 20:30:37 2010 +0200
@@ -23,5 +23,5 @@
PRJ_EXPORTS
-../inc/cameseutility.h MW_LAYER_PLATFORM_EXPORT_PATH(cameseutility.h)
-../inc/cameseobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(cameseobserver.h)
+../inc/CameseUtility.h MW_LAYER_PLATFORM_EXPORT_PATH(cameseutility.h)
+../inc/CameseObserver.h MW_LAYER_PLATFORM_EXPORT_PATH(cameseobserver.h)
--- a/omadrm/drmengine/group/DRMCommon.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DRMCommon.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -26,11 +26,11 @@
MACRO CLIENT_STARTS_SERVER
-USERINCLUDE ../AgentV2/inc
-USERINCLUDE ../RO/inc
-USERINCLUDE ../DCF/inc
-USERINCLUDE ../Server/inc
-USERINCLUDE ../Utils/inc
+USERINCLUDE ../agentv2/inc
+USERINCLUDE ../ro/inc
+USERINCLUDE ../dcf/inc
+USERINCLUDE ../server/inc
+USERINCLUDE ../utils/inc
USERINCLUDE ../legacy/inc
USERINCLUDE ../legacy/src
USERINCLUDE ../../../inc // ADo level inc dir
@@ -43,7 +43,7 @@
SOURCEPATH ../legacy/src
SOURCE DRMCommon.cpp
-START RESOURCE DRMCommon.rss
+START RESOURCE drmcommon.rss
HEADER
TARGET DRMCommon.rsc
TARGETPATH resource
--- a/omadrm/drmengine/group/DcfRep.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DcfRep.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -26,14 +26,14 @@
//macro _DRM_TESTING
-SOURCEPATH ../DcfRepository/client/src
+SOURCEPATH ../dcfrepository/client/src
SOURCE DcfRepCli.cpp
SOURCE DcfRep.cpp
SOURCE DcfEntry.cpp
-USERINCLUDE ../DcfRepository/client/inc
-USERINCLUDE ../DcfRepository/common
+USERINCLUDE ../dcfrepository/client/inc
+USERINCLUDE ../dcfrepository/common
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
--- a/omadrm/drmengine/group/DcfRepSrv.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DcfRepSrv.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -27,7 +27,7 @@
//macro _DRM_TESTING
-SOURCEPATH ../DcfRepository/server/src
+SOURCEPATH ../dcfrepository/server/src
SOURCE DcfRepSrv.cpp
SOURCE DcfRepSrvSes.cpp
SOURCE FileScan.cpp
@@ -38,8 +38,8 @@
SOURCE procwatcher.cpp
-USERINCLUDE ../DcfRepository/server/inc
-USERINCLUDE ../DcfRepository/common
+USERINCLUDE ../dcfrepository/server/inc
+USERINCLUDE ../dcfrepository/common
USERINCLUDE ../utils/inc
USERINCLUDE ../../../inc // ADo level inc dir
--- a/omadrm/drmengine/group/DrmCrypto.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmCrypto.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -24,9 +24,9 @@
CAPABILITY CAP_GENERAL_DLL DRM CommDD
VENDORID VID_DEFAULT
-USERINCLUDE ../Utils/inc
-USERINCLUDE ../DrmCrypto/inc
-USERINCLUDE ../KeyStorage/inc
+USERINCLUDE ../utils/inc
+USERINCLUDE ../drmcrypto/inc
+USERINCLUDE ../keystorage/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
@@ -34,14 +34,14 @@
SYSTEMINCLUDE /epoc32/include/libc
SYSTEMINCLUDE /epoc32/include/ecom
-SOURCEPATH ../Utils/src
+SOURCEPATH ../utils/src
SOURCE Base64.cpp
-SOURCE DrmAesCrypto.cpp
+SOURCE drmaescrypto.cpp
-SOURCEPATH ../DrmCrypto/build
-SOURCE OmaCrypto.cpp
-SOURCE CmlaCrypto.cpp
+SOURCEPATH ../drmcrypto/build
+SOURCE omacrypto.cpp
+SOURCE cmlacrypto.cpp
LIBRARY euser.lib
LIBRARY efsrv.lib
--- a/omadrm/drmengine/group/DrmDcf.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmDcf.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -24,22 +24,22 @@
CAPABILITY CAP_GENERAL_DLL DRM CommDD
VENDORID VID_DEFAULT
-USERINCLUDE ../DCF/inc
-USERINCLUDE ../RO/inc
-USERINCLUDE ../ROAP/inc
-USERINCLUDE ../Utils/inc
-USERINCLUDE ../DM/inc
-USERINCLUDE ../Legacy/inc
-USERINCLUDE ../AgentV2/inc
-USERINCLUDE ../Server/inc
-USERINCLUDE ../Notifier/inc
-USERINCLUDE ../RoapStorage/inc
+USERINCLUDE ../dcf/inc
+USERINCLUDE ../ro/inc
+USERINCLUDE ../roap/inc
+USERINCLUDE ../utils/inc
+USERINCLUDE ../dm/inc
+USERINCLUDE ../legacy/inc
+USERINCLUDE ../agentv2/inc
+USERINCLUDE ../server/inc
+USERINCLUDE ../notifier/inc
+USERINCLUDE ../roapstorage/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
MW_LAYER_SYSTEMINCLUDE
-SOURCEPATH ../DCF/src
+SOURCEPATH ../dcf/src
SOURCE DcfCommon.cpp
SOURCE Oma1Dcf.cpp
SOURCE Oma2Dcf.cpp
--- a/omadrm/drmengine/group/DrmKeyStorage.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmKeyStorage.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -24,8 +24,8 @@
CAPABILITY CAP_GENERAL_DLL DRM CommDD
VENDORID VID_DEFAULT
-USERINCLUDE ../KeyStorage/inc
-USERINCLUDE ../Utils/inc
+USERINCLUDE ../keystorage/inc
+USERINCLUDE ../utils/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
@@ -33,7 +33,7 @@
SYSTEMINCLUDE /epoc32/include/libc
SYSTEMINCLUDE /epoc32/include/ecom
-SOURCEPATH ../KeyStorage/src
+SOURCEPATH ../keystorage/src
SOURCE DrmKeyStorage.cpp
LIBRARY euser.lib
--- a/omadrm/drmengine/group/DrmParsers.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmParsers.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -24,18 +24,18 @@
CAPABILITY CAP_GENERAL_DLL DRM
VENDORID VID_DEFAULT
-USERINCLUDE ../DCF/inc
-USERINCLUDE ../RO/inc
-USERINCLUDE ../ROAP/inc
-USERINCLUDE ../Utils/inc
-USERINCLUDE ../DM/inc
-USERINCLUDE ../Legacy/inc
-USERINCLUDE ../AgentV2/inc
-USERINCLUDE ../Server/inc
-USERINCLUDE ../Notifier/inc
-USERINCLUDE ../RoapStorage/inc
-USERINCLUDE ../DcfRepository/client/inc
-USERINCLUDE ../KeyStorage/inc
+USERINCLUDE ../dcf/inc
+USERINCLUDE ../ro/inc
+USERINCLUDE ../roap/inc
+USERINCLUDE ../utils/inc
+USERINCLUDE ../dm/inc
+USERINCLUDE ../legacy/inc
+USERINCLUDE ../agentv2/inc
+USERINCLUDE ../server/inc
+USERINCLUDE ../notifier/inc
+USERINCLUDE ../roapstorage/inc
+USERINCLUDE ../dcfrepository/client/inc
+USERINCLUDE ../keystorage/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
@@ -44,12 +44,12 @@
SYSTEMINCLUDE /epoc32/include/ecom
SYSTEMINCLUDE /epoc32/include/caf
-SOURCEPATH ../DM/src
+SOURCEPATH ../dm/src
SOURCE Oma1DcfCreator.cpp
SOURCE DRMMessageParser.cpp
SOURCE b64.cpp
-SOURCEPATH ../RO/src
+SOURCEPATH ../ro/src
SOURCE DrmRightsParser.cpp
SOURCE DrmProtectedRoParser.cpp
--- a/omadrm/drmengine/group/DrmRel1_0StringDict00.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmRel1_0StringDict00.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -31,10 +31,10 @@
// Default system include paths for middleware layer modules.
MW_LAYER_SYSTEMINCLUDE
-USERINCLUDE ../RO/inc
+USERINCLUDE ../ro/inc
USERINCLUDE ../../../inc // ADo level inc dir
-SOURCEPATH ../RO/src
+SOURCEPATH ../ro/src
SOURCE DrmRel1_0StringDict00TagTable.cpp
SOURCE DrmRel1_0StringDict00AttributeTable.cpp
SOURCE DrmRel1_0StringDict00AttributeValueTable.cpp
--- a/omadrm/drmengine/group/DrmRel2_1StringDict00.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmRel2_1StringDict00.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -28,9 +28,9 @@
SOURCEPATH ../utils/src
SOURCE DrmRel2_1StringDict00.cpp
-SOURCE DrmRel2_1StringDict00TagTable.cpp
-SOURCE DrmRel2_1StringDict00AttributeTable.cpp
-SOURCE DrmRel2_1StringDict00AttributeValueTable.cpp
+SOURCE drmrel2_1stringdict00tagtable.cpp
+SOURCE drmrel2_1stringdict00attributetable.cpp
+SOURCE drmrel2_1stringdict00attributevaluetable.cpp
MW_LAYER_SYSTEMINCLUDE
USERINCLUDE ../utils/inc
--- a/omadrm/drmengine/group/DrmRights.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmRights.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -24,16 +24,16 @@
CAPABILITY CAP_GENERAL_DLL DRM CommDD
VENDORID VID_DEFAULT
-USERINCLUDE ../DCF/inc
-USERINCLUDE ../RO/inc
-USERINCLUDE ../ROAP/inc
-USERINCLUDE ../Utils/inc
-USERINCLUDE ../DM/inc
-USERINCLUDE ../Legacy/inc
-USERINCLUDE ../AgentV2/inc
-USERINCLUDE ../Server/inc
-USERINCLUDE ../Notifier/inc
-USERINCLUDE ../RoapStorage/inc
+USERINCLUDE ../dcf/inc
+USERINCLUDE ../ro/inc
+USERINCLUDE ../roap/inc
+USERINCLUDE ../utils/inc
+USERINCLUDE ../dm/inc
+USERINCLUDE ../legacy/inc
+USERINCLUDE ../agentv2/inc
+USERINCLUDE ../server/inc
+USERINCLUDE ../notifier/inc
+USERINCLUDE ../roapstorage/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
@@ -42,10 +42,10 @@
SYSTEMINCLUDE /epoc32/include/ecom
SYSTEMINCLUDE /epoc32/include/caf
-SOURCEPATH ../RO/src
+SOURCEPATH ../ro/src
SOURCE DrmRights.cpp
-SOURCE DrmPermission.cpp
-SOURCE DrmConstraint.cpp
+SOURCE DRMPermission.cpp
+SOURCE DRMConstraint.cpp
SOURCE DrmAsset.cpp
LIBRARY drmcrypto.lib
--- a/omadrm/drmengine/group/DrmServerInterfaces.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmServerInterfaces.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -24,19 +24,19 @@
CAPABILITY CAP_GENERAL_DLL DRM CommDD
VENDORID VID_DEFAULT
-USERINCLUDE ../DCF/inc
-USERINCLUDE ../RO/inc
-USERINCLUDE ../ROAP/inc
-USERINCLUDE ../Utils/inc
-USERINCLUDE ../DM/inc
-USERINCLUDE ../Legacy/inc
-USERINCLUDE ../AgentV2/inc
-USERINCLUDE ../Server/inc
-USERINCLUDE ../Notifier/inc
-USERINCLUDE ../RoapStorage/inc
-USERINCLUDE ../DrmClock/inc
+USERINCLUDE ../dcf/inc
+USERINCLUDE ../ro/inc
+USERINCLUDE ../roap/inc
+USERINCLUDE ../utils/inc
+USERINCLUDE ../dm/inc
+USERINCLUDE ../legacy/inc
+USERINCLUDE ../agentv2/inc
+USERINCLUDE ../server/inc
+USERINCLUDE ../notifier/inc
+USERINCLUDE ../roapstorage/inc
+USERINCLUDE ../drmclock/inc
#ifdef __DRM_FULL
-USERINCLUDE ../../DRMHelper/inc
+USERINCLUDE ../../drmhelper/inc
#endif
USERINCLUDE ../../../inc // ADo level inc dir
@@ -46,10 +46,10 @@
SYSTEMINCLUDE /epoc32/include/ecom
SYSTEMINCLUDE /epoc32/include/caf
-SOURCEPATH ../Server/src
+SOURCEPATH ../server/src
SOURCE DRMRightsClient.cpp
-SOURCEPATH ../Notifier/src
+SOURCEPATH ../notifier/src
SOURCE DRMEvent.cpp
SOURCE DRMEventAddRemove.cpp
SOURCE DRMEventModify.cpp
@@ -58,16 +58,16 @@
SOURCE DRMEventHandler.cpp
SOURCE DRMNotifierClient.cpp
-SOURCEPATH ../RoapStorage/src
-SOURCE DrmDomainContext.cpp
-SOURCE DrmRiContext.cpp
+SOURCEPATH ../roapstorage/src
+SOURCE DRMDomainContext.cpp
+SOURCE DRMRIContext.cpp
SOURCE RoapStorageClient.cpp
-SOURCEPATH ../DRMClock/src
+SOURCEPATH ../drmclock/src
SOURCE DRMClockClient2.cpp
#ifdef __DRM_FULL
-SOURCEPATH ../../DRMHelper/src
+SOURCEPATH ../../drmhelper/src
SOURCE RDRMHelper.cpp
#endif
--- a/omadrm/drmengine/group/DrmStdKeyStorage.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/DrmStdKeyStorage.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -24,8 +24,8 @@
CAPABILITY CAP_GENERAL_DLL DRM CommDD
VENDORID VID_DEFAULT
-USERINCLUDE ../KeyStorage/inc
-USERINCLUDE ../Utils/inc
+USERINCLUDE ../keystorage/inc
+USERINCLUDE ../utils/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
@@ -33,7 +33,7 @@
SYSTEMINCLUDE /epoc32/include/libc
SYSTEMINCLUDE /epoc32/include/ecom
-SOURCEPATH ../KeyStorage/src
+SOURCEPATH ../keystorage/src
SOURCE DrmStdKeyStorage.cpp
LIBRARY euser.lib
--- a/omadrm/drmengine/group/OmaDrmAgent.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/OmaDrmAgent.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -24,21 +24,21 @@
CAPABILITY CAP_ECOM_PLUGIN DRM
VENDORID VID_DEFAULT
-USERINCLUDE ../DCF/inc
-USERINCLUDE ../RO/inc
-USERINCLUDE ../DM/inc
-USERINCLUDE ../AgentV2/inc
-USERINCLUDE ../Server/inc
-USERINCLUDE ../Utils/inc
-USERINCLUDE ../Notifier/inc
-USERINCLUDE ../DcfRepository/client/inc
+USERINCLUDE ../dcf/inc
+USERINCLUDE ../ro/inc
+USERINCLUDE ../dm/inc
+USERINCLUDE ../agentv2/inc
+USERINCLUDE ../server/inc
+USERINCLUDE ../utils/inc
+USERINCLUDE ../notifier/inc
+USERINCLUDE ../dcfrepository/client/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/ecom
-SOURCEPATH ../AgentV2/src
+SOURCEPATH ../agentv2/src
SOURCE Oma2Agent.cpp
SOURCE Oma2AgentFactory.cpp
SOURCE Oma2AgentContent.cpp
@@ -49,7 +49,7 @@
SOURCE Oma2AgentRightsManager.cpp
SOURCE DcfCache.cpp
-START RESOURCE 101F6DB4.RSS
+START RESOURCE 101F6DB4.rss
TARGET OmaDrmAgent
END
--- a/omadrm/drmengine/group/ROAPHandler.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/ROAPHandler.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -25,16 +25,16 @@
CAPABILITY CAP_GENERAL_DLL DRM
VENDORID VID_DEFAULT
-USERINCLUDE ../DCF/inc
-USERINCLUDE ../DM/inc
-USERINCLUDE ../AgentV2/inc
-USERINCLUDE ../RO/inc
-USERINCLUDE ../ROAP/inc
-USERINCLUDE ../Utils/inc
-USERINCLUDE ../Server/inc
-USERINCLUDE ../RoapStorage/inc
-USERINCLUDE ../DRMClock/inc
-USERINCLUDE ../DcfRepository/client/inc
+USERINCLUDE ../dcf/inc
+USERINCLUDE ../dm/inc
+USERINCLUDE ../agentv2/inc
+USERINCLUDE ../ro/inc
+USERINCLUDE ../roap/inc
+USERINCLUDE ../utils/inc
+USERINCLUDE ../server/inc
+USERINCLUDE ../roapstorage/inc
+USERINCLUDE ../drmclock/inc
+USERINCLUDE ../dcfrepository/client/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
@@ -80,7 +80,7 @@
SOURCE MeteringReportRespParser.cpp
#endif
-SOURCEPATH ../Utils/src
+SOURCEPATH ../utils/src
SOURCE MultipartHandler.cpp
LIBRARY euser.lib
--- a/omadrm/drmengine/group/RightsServer.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/group/RightsServer.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -30,20 +30,20 @@
SYSTEMINCLUDE /epoc32/include/libc
SYSTEMINCLUDE /epoc32/include/connect
-USERINCLUDE ../Server/inc
-USERINCLUDE ../AgentV2/inc
-USERINCLUDE ../RO/inc
-USERINCLUDE ../DCF/inc
-USERINCLUDE ../Notifier/inc
-USERINCLUDE ../Utils/inc
-USERINCLUDE ../ROAP/inc
-USERINCLUDE ../RoapStorage/inc
-USERINCLUDE ../DRMClock/inc
-USERINCLUDE ../KeyStorage/inc
-USERINCLUDE ../DRMBackup/inc
+USERINCLUDE ../server/inc
+USERINCLUDE ../agentv2/inc
+USERINCLUDE ../ro/inc
+USERINCLUDE ../dcf/inc
+USERINCLUDE ../notifier/inc
+USERINCLUDE ../utils/inc
+USERINCLUDE ../roap/inc
+USERINCLUDE ../roapstorage/inc
+USERINCLUDE ../drmclock/inc
+USERINCLUDE ../keystorage/inc
+USERINCLUDE ../drmbackup/inc
USERINCLUDE ../../../inc // ADo level inc dir
-SOURCEPATH ../Server/src
+SOURCEPATH ../server/src
// DRM Engine (server side)
SOURCE DRMRightsServer.cpp
@@ -51,14 +51,14 @@
// SOURCE drmpermissionlist.cpp
SOURCE drmparentstorage.cpp
// SOURCE drmpermissionitem.cpp
-SOURCE drmreplaycache.cpp
-SOURCE drmxoma.cpp
+SOURCE DRMReplayCache.cpp
+SOURCE DRMXOma.cpp
SOURCE DRMActiveOperation.cpp
SOURCE DRMObsoleteFinder.cpp
SOURCE drmconsume.cpp
// DRM Rights Database
-SOURCE DRMRightsDB.cpp
+SOURCE drmrightsdb.cpp
SOURCE DRMRightsData.cpp
SOURCE DRMCommonData.cpp
SOURCE DRMRightsCleaner.cpp
@@ -70,19 +70,19 @@
SOURCE drmmeteringdb.cpp
// DRM Backup implementation
-SOURCEPATH ../DRMBackup/src
+SOURCEPATH ../drmbackup/src
SOURCE DRMBackup.cpp
SOURCE DRMBackupObserver.cpp
// DRM Notifier
-SOURCEPATH ../Notifier/src
+SOURCEPATH ../notifier/src
SOURCE DRMMessageStorage.cpp
SOURCE DRMNotifierServer.cpp
SOURCE DRMNotifierSession.cpp
// RoapStorage
-SOURCEPATH ../RoapStorage/src
+SOURCEPATH ../roapstorage/src
SOURCE RoapStorageClient.cpp
SOURCE RoapStorageServer.cpp
@@ -97,7 +97,7 @@
// DRM Clock
#ifdef __DRM_CLOCK
-SOURCEPATH ../DRMClock/src
+SOURCEPATH ../drmclock/src
SOURCE DRMClock.cpp
SOURCE DRMClockServer.cpp
SOURCE DRMClockSession.cpp
--- a/omadrm/drmengine/notifier/src/DRMEventHandler.cpp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/notifier/src/DRMEventHandler.cpp Mon Jan 18 20:30:37 2010 +0200
@@ -235,13 +235,22 @@
switch( aEvent )
{
case KEventAddRemove:
- iAddRemoveObservers->AppendL( observer );
+ if( this->iAddRemoveObservers ) // coverity check
+ {
+ iAddRemoveObservers->AppendL( observer );
+ }
break;
case KEventModify:
- iModifyObservers->AppendL( observer );
+ if( this->iModifyObservers ) // coverity check
+ {
+ iModifyObservers->AppendL( observer );
+ }
break;
case KEventTimeChange:
- iTimeChangeObservers->AppendL( observer );
+ if( this->iTimeChangeObservers ) // coverity check
+ {
+ iTimeChangeObservers->AppendL( observer );
+ }
break;
default:
User::Leave(KErrArgument);
@@ -521,10 +530,16 @@
switch( aEvent )
{
case KEventAddRemove:
- iAddRemoveObservers->AppendL( observer );
+ if( this->iAddRemoveObservers ) // coverity check
+ {
+ iAddRemoveObservers->AppendL( observer );
+ }
break;
case KEventModify:
- iModifyObservers->AppendL( observer );
+ if( this->iModifyObservers ) // coverity check
+ {
+ iModifyObservers->AppendL( observer );
+ }
break;
default:
User::Leave(KErrArgument);
--- a/omadrm/drmengine/notifier/src/DRMNotifierSession.cpp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/notifier/src/DRMNotifierSession.cpp Mon Jan 18 20:30:37 2010 +0200
@@ -101,7 +101,10 @@
for( i = 0; i < iMessageQueue.Count(); i++ )
{
- iStorage->UpdateMessage(iMessageQueue[i]);
+ if( this->iStorage ) // coverity check
+ {
+ iStorage->UpdateMessage(iMessageQueue[i]);
+ }
}
iMessageQueue.Reset();
--- a/omadrm/drmengine/ro/src/101F6DB6.RSS Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/ro/src/101F6DB6.RSS Mon Jan 18 20:30:37 2010 +0200
@@ -17,7 +17,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO DrmRel1_0StringDict00Info
{
--- a/omadrm/drmengine/utils/src/200B48A.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmengine/utils/src/200B48A.rss Mon Jan 18 20:30:37 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO DrmRel2_1StringDict00Info
{
--- a/omadrm/drmhelper/group/Drmhelper.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmhelper/group/Drmhelper.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -26,7 +26,7 @@
VENDORID VID_DEFAULT
#ifdef __DRM
-SOURCE ../src/DRMHelper.cpp
+SOURCE ../src/drmhelper.cpp
SOURCE ../src/ConsumeData.cpp
SOURCE ../src/RDRMHelper.cpp
SOURCE ../src/DRMHelperGlobalNoteWrapper.cpp
@@ -39,16 +39,16 @@
#endif
SOURCE ../src/DRMHelperDll.cpp
-START RESOURCE DRMHelper.rss
+START RESOURCE Drmhelper.rss
HEADER
TARGETPATH RESOURCE_FILES_DIR
LANGUAGE_IDS
END
USERINCLUDE ../inc
-USERINCLUDE ../../DRMEngine/Server/inc
-USERINCLUDE ../../DRMEngine/Roap/inc
-USERINCLUDE ../../DRMEngine/RoapStorage/inc
+USERINCLUDE ../../drmengine/server/inc
+USERINCLUDE ../../drmengine/roap/inc
+USERINCLUDE ../../drmengine/roapstorage/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
@@ -100,7 +100,7 @@
#if defined(ARMCC)
-deffile ../eabi/
+deffile ../EABI/
#elif defined( WINSCW )
deffile ../bwinscw/
#elif defined( WINS )
--- a/omadrm/drmhelper/group/Drmhelper.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmhelper/group/Drmhelper.rss Mon Jan 18 20:30:37 2010 +0200
@@ -28,7 +28,7 @@
#include <avkon.loc>
#include <avkon.mbg>
#ifdef __DRM
-#include <DRMCommon.loc>
+#include <drmcommon.loc>
#endif
// CONSTANTS
--- a/omadrm/drmhelper/group/drmhelperdmgrwrapper.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmhelper/group/drmhelperdmgrwrapper.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -26,7 +26,7 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
-SOURCE ../src/drmhelperdmgrwrapper.cpp
+SOURCE ../src/DRMHelperDMgrWrapper.cpp
START RESOURCE drmhelperdmgrwrapper.rss
HEADER
@@ -35,7 +35,7 @@
END
USERINCLUDE ../inc
-USERINCLUDE ../../DRMEngine/Roap/inc
+USERINCLUDE ../../drmengine/roap/inc
USERINCLUDE ../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
@@ -67,7 +67,7 @@
END
#if defined(ARMCC)
-deffile ../eabi/
+deffile ../EABI/
#elif defined( WINSCW )
deffile ../bwinscw/
#elif defined( WINS )
--- a/omadrm/drmhelper/group/drmhelperdmgrwrapper.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmhelper/group/drmhelperdmgrwrapper.rss Mon Jan 18 20:30:37 2010 +0200
@@ -27,7 +27,7 @@
#include <avkon.loc>
#include <avkon.mbg>
#ifdef __DRM
-#include <DRMCommon.loc>
+#include <drmcommon.loc>
#endif
// CONSTANTS
--- a/omadrm/drmhelper/src/drmhelper.cpp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmhelper/src/drmhelper.cpp Mon Jan 18 20:30:37 2010 +0200
@@ -5604,10 +5604,11 @@
CAknLaunchAppService* launchAppService =
CAknLaunchAppService::NewL( KUidDRMUI, this, paramList );
+
+ CleanupStack::PushL( launchAppService );
iWait.Start();
- delete launchAppService;
-
- CleanupStack::PopAndDestroy( paramList ); // paramList
+
+ CleanupStack::PopAndDestroy( 2, paramList ); // paramList, launchAppService
}
else
{
--- a/omadrm/drmplugins/drmfilter/data/101F9710.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmplugins/drmfilter/data/101F9710.rss Mon Jan 18 20:30:37 2010 +0200
@@ -19,7 +19,7 @@
// application/vnd.oma.drm.message
// OMA-Download-DRM-v1_0-20020905-a, Version 05-September-2002
-#include "Ecom/RegistryInfoV2.rh"
+#include "ecom/registryinfov2.rh"
RESOURCE REGISTRY_INFO theInfo
{
--- a/omadrm/drmplugins/drmrecognizer/group/RecDRM.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmplugins/drmrecognizer/group/RecDRM.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -26,15 +26,15 @@
capability CAP_ECOM_PLUGIN TrustedUI ProtServ
-SOURCEPATH ../SRC
-USERINCLUDE ../INC
+SOURCEPATH ../src
+USERINCLUDE ../inc
USERINCLUDE ../../../../inc // ADo level inc dir
// Default system include paths for middleware layer modules.
MW_LAYER_SYSTEMINCLUDE
-systeminclude /epoc32/INCLUDE/Ecom
+systeminclude /epoc32/include/ecom
-source RECDRM.CPP
+source RecDRM.CPP
START RESOURCE 101F51F4.RSS
TARGET RECDRM
--- a/omadrm/drmplugins/drmrecognizer/src/101F51F4.RSS Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmplugins/drmrecognizer/src/101F51F4.RSS Mon Jan 18 20:30:37 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include <RegistryInfo.rh>
+#include <registryinfo.rh>
RESOURCE REGISTRY_INFO r_registry
{
dll_uid = 0x101F51F4;
--- a/omadrm/drmplugins/drmrohandler/group/crohandler.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmplugins/drmrohandler/group/crohandler.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -31,7 +31,7 @@
SOURCE StringResourceReader.cpp
SOURCE rohandlerdmgrwrapper.cpp
-START RESOURCE 101F7B92.RSS
+START RESOURCE 101F7B92.rss
TARGET RoHandler
END
@@ -46,7 +46,7 @@
USERINCLUDE ../inc
-USERINCLUDE ../../../DRMEngine/Roap/inc
+USERINCLUDE ../../../drmengine/roap/inc
USERINCLUDE ../../drmromtm/client/inc
USERINCLUDE ../../../../inc // ADo level inc dir
--- a/omadrm/drmplugins/drmrohandler/src/CRoHandler.cpp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmplugins/drmrohandler/src/CRoHandler.cpp Mon Jan 18 20:30:37 2010 +0200
@@ -758,7 +758,7 @@
User::LeaveIfError( ret );
}
- if ( iPutRightsToInbox )
+ if ( iPutRightsToInbox && contentURI ) // coverity check
{
buffer = HBufC16::NewL( contentURI->Length() );
TPtr uri16( buffer->Des() );
--- a/omadrm/drmplugins/drmromtm/group/RoMtmUi.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmplugins/drmromtm/group/RoMtmUi.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -27,7 +27,7 @@
VENDORID VID_DEFAULT
SOURCEPATH ../ui/src
-SOURCE RoMtmui.cpp
+SOURCE RoMtmUi.cpp
USERINCLUDE ../inc
USERINCLUDE ../ui/inc
--- a/omadrm/drmplugins/drmromtm/uiData/inc/RoMtmCommands.hrh Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmplugins/drmromtm/uiData/inc/RoMtmCommands.hrh Mon Jan 18 20:30:37 2010 +0200
@@ -22,7 +22,7 @@
// INCLUDE FILES
-#include <MTMExtendedCapabilities.hrh>
+#include <MtmExtendedCapabilities.hrh>
/**
* The following enum constants define those Ro MTM specific commands that
--- a/omadrm/drmplugins/drmromtm/uiData/src/RoMtmUi.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/drmplugins/drmromtm/uiData/src/RoMtmUi.rss Mon Jan 18 20:30:37 2010 +0200
@@ -29,8 +29,8 @@
#include <avkon.rsg>
#include <avkon.loc>
#include <mtud.rh>
-#include <MTMExtendedCapabilities.hrh>
-#include <Muiu.mbg>
+#include <MtmExtendedCapabilities.hrh>
+#include <muiu.mbg>
#include <data_caging_paths_strings.hrh>
#include "RoMtmCommands.hrh"
--- a/omadrm/group/bld.inf Thu Jan 07 12:54:19 2010 +0200
+++ b/omadrm/group/bld.inf Mon Jan 18 20:30:37 2010 +0200
@@ -26,7 +26,7 @@
../conf/drm5_10205CBF.crml MW_LAYER_CRML(drm5_10205CBF.crml)
../conf/drmsettings.confml MW_LAYER_CONFML(drmsettings.confml)
../conf/drmsettings_102823B4.crml MW_LAYER_CRML(drmsettings_102823B4.crml)
-../conf/drm5_200195AD.crml MW_LAYER_CRML(drm5_200195AD.crml)
+../conf/drm5_200195ad.crml MW_LAYER_CRML(drm5_200195AD.crml)
../conf/drmutility.confml MW_LAYER_CONFML(drmutility.confml)
../conf/drmutility_20022D51.crml MW_LAYER_CRML(drmutility_20022D51.crml)
../drmengine/group/CryptoPrep.flm /epoc32/tools/makefile_templates/s60/CryptoPrep.flm
@@ -36,31 +36,31 @@
//Loc files
// Ro Handler (only used if OMA DRM 1.0 Full is enabled)
#ifdef __DRM_FULL
-../drmplugins/drmrohandler/loc/rohandler.loc MW_LAYER_LOC_EXPORT_PATH( rohandler.loc )
+../drmplugins/drmrohandler/loc/RoHandler.loc MW_LAYER_LOC_EXPORT_PATH( rohandler.loc )
#endif
-../drmplugins/drmromtm/loc/romtmui.loc MW_LAYER_LOC_EXPORT_PATH( romtmui.loc )
+../drmplugins/drmromtm/loc/RoMtmUi.loc MW_LAYER_LOC_EXPORT_PATH( romtmui.loc )
// CMLA RnD keys
-../drmengine/keystorage/data/cmla/DevicePrivateKey.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
-../drmengine/keystorage/data/cmla/DeviceCert.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
-../drmengine/keystorage/data/cmla/SigningCert00.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
-../drmengine/keystorage/data/cmla/SigningCert01.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
+../drmengine/keystorage/data/CMLA/DevicePrivateKey.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
+../drmengine/keystorage/data/CMLA/DeviceCert.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
+../drmengine/keystorage/data/CMLA/SigningCert00.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
+../drmengine/keystorage/data/CMLA/SigningCert01.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
-../drmengine/keystorage/data/cmla/DevicePrivateKey.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
-../drmengine/keystorage/data/cmla/DeviceCert.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
-../drmengine/keystorage/data/cmla/SigningCert00.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
-../drmengine/keystorage/data/cmla/SigningCert01.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
+../drmengine/keystorage/data/CMLA/DevicePrivateKey.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
+../drmengine/keystorage/data/CMLA/DeviceCert.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
+../drmengine/keystorage/data/CMLA/SigningCert00.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
+../drmengine/keystorage/data/CMLA/SigningCert01.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
-../drmengine/keystorage/data/cmla/DevicePrivateKey.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
-../drmengine/keystorage/data/cmla/DeviceCert.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
-../drmengine/keystorage/data/cmla/SigningCert00.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
-../drmengine/keystorage/data/cmla/SigningCert01.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
+../drmengine/keystorage/data/CMLA/DevicePrivateKey.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
+../drmengine/keystorage/data/CMLA/DeviceCert.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
+../drmengine/keystorage/data/CMLA/SigningCert00.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
+../drmengine/keystorage/data/CMLA/SigningCert01.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
-../drmengine/keystorage/data/cmla/DevicePrivateKey.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
-../drmengine/keystorage/data/cmla/DeviceCert.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
-../drmengine/keystorage/data/cmla/SigningCert00.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
-../drmengine/keystorage/data/cmla/SigningCert01.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
+../drmengine/keystorage/data/CMLA/DevicePrivateKey.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
+../drmengine/keystorage/data/CMLA/DeviceCert.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
+../drmengine/keystorage/data/CMLA/SigningCert00.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
+../drmengine/keystorage/data/CMLA/SigningCert01.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
// Default UDT Key
#ifdef __DRM_USER_DATA_TRANSFER
@@ -83,15 +83,15 @@
../data/OmaDrm_Stub.SIS /epoc32/data/z/system/install/OmaDrm_Stub.SIS
// IBY files
-../rom/drm5.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drm5.iby )
-../rom/drmhelper.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmhelper.iby)
-../rom/drmhelperresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmhelperresources.iby )
-../rom/drmlicensemanager.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmlicensemanager.iby )
+../rom/DRM5.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drm5.iby )
+../rom/DRMHelper.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmhelper.iby)
+../rom/DRMHelperResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmhelperresources.iby )
+../rom/DRMLicenseManager.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmlicensemanager.iby )
../rom/drmroapwbxmlparser.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmroapwbxmlparser.iby )
-../rom/drmrohandlerresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmrohandlerresources.iby )
-../rom/drmromtmresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmromtmresources.iby )
-../rom/httpfilterdrm.iby CORE_MW_LAYER_IBY_EXPORT_PATH( httpfilterdrm.iby )
-../rom/romtm.iby CORE_MW_LAYER_IBY_EXPORT_PATH( romtm.iby )
+../rom/DRMRoHandlerResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmrohandlerresources.iby )
+../rom/DRMRoMtmResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmromtmresources.iby )
+../rom/HTTPFilterDRM.iby CORE_MW_LAYER_IBY_EXPORT_PATH( httpfilterdrm.iby )
+../rom/RoMTM.iby CORE_MW_LAYER_IBY_EXPORT_PATH( romtm.iby )
PRJ_MMPFILES
@@ -144,18 +144,18 @@
../drmlicensemanager/group/DRMLicenseChecker.mmp
// Recognizer
-../drmplugins/drmrecognizer/group/recdrm.mmp
+../drmplugins/drmrecognizer/group/RecDRM.mmp
// Ro Handler (only used if OMA DRM 1.0 Full is enabled)
#ifdef __DRM_FULL
-../drmplugins/drmrohandler/group/CRohandler.mmp
+../drmplugins/drmrohandler/group/crohandler.mmp
#endif
// DRMFilter
../drmplugins/drmfilter/group/HTTPFilterDRM.mmp
// DRMHelper
-../drmhelper/group/DRMHelper.mmp
+../drmhelper/group/Drmhelper.mmp
../drmhelper/group/drmhelperdmgrwrapper.mmp
#ifdef SBSV2
--- a/wmdrm/camese/httpfiltercamese/Data/10282936.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/wmdrm/camese/httpfiltercamese/Data/10282936.rss Mon Jan 18 20:30:37 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDES
#include <ecom/registryinfo.rh>
-#include "../inc/httpfiltercamese.hrh"
+#include "../Inc/httpfiltercamese.hrh"
// RESOURCE DEFINITIONS
// -----------------------------------------------------------------------------
--- a/wmdrm/camese/httpfiltercamese/group/httpfiltercamese.mmp Thu Jan 07 12:54:19 2010 +0200
+++ b/wmdrm/camese/httpfiltercamese/group/httpfiltercamese.mmp Mon Jan 18 20:30:37 2010 +0200
@@ -27,18 +27,18 @@
VENDORID VID_DEFAULT
CAPABILITY CAP_ECOM_PLUGIN
-USERINCLUDE ../inc
+USERINCLUDE ../Inc
USERINCLUDE ../../inc
USERINCLUDE ../../wmdrmdla/inc
MW_LAYER_SYSTEMINCLUDE
-SOURCEPATH ../src
+SOURCEPATH ../Src
SOURCE httpfiltercamesedrmheader.cpp
SOURCE httpfiltercamesemain.cpp
SOURCE httpfiltercamesedatasupplier.cpp
-START RESOURCE ../data/10282936.rss
+START RESOURCE ../Data/10282936.rss
HEADER
TARGET httpfiltercamese.rsc
// *** Uncomment LANGUAGE_IDS below if and only if the resource file needs localisation
--- a/wmdrm/camese/wmdrmdladefaulthttpplugin/src/20019574.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/wmdrm/camese/wmdrmdladefaulthttpplugin/src/20019574.rss Mon Jan 18 20:30:37 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include "RegistryInfo.rh"
+#include "registryinfo.rh"
RESOURCE REGISTRY_INFO theInfo
{
--- a/wmdrm/camese/wmdrmdladefaultuiplugin/src/20019575.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/wmdrm/camese/wmdrmdladefaultuiplugin/src/20019575.rss Mon Jan 18 20:30:37 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include "RegistryInfo.rh"
+#include "registryinfo.rh"
RESOURCE REGISTRY_INFO theInfo
{
--- a/wmdrm/camese/wmdrmdlautils/data/wmdrmdlautils.rss Thu Jan 07 12:54:19 2010 +0200
+++ b/wmdrm/camese/wmdrmdlautils/data/wmdrmdlautils.rss Mon Jan 18 20:30:37 2010 +0200
@@ -29,7 +29,7 @@
#include <eikon.rsg>
#include <appinfo.rh>
#include <avkon.loc>
-#include <avkonicons.hrh>
+#include <AvkonIcons.hrh>
#include <data_caging_paths_strings.hrh>
#include <drmcommon.loc>
--- a/wmdrm/group/bld.inf Thu Jan 07 12:54:19 2010 +0200
+++ b/wmdrm/group/bld.inf Mon Jan 18 20:30:37 2010 +0200
@@ -24,8 +24,8 @@
#endif // __WINDOWS_MEDIA_DRM
// IBY files
-../rom/wmdrm.iby CORE_MW_LAYER_IBY_EXPORT_PATH( wmdrm.iby )
-../rom/wmdrmresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( wmdrmresources.iby )
+../rom/WMDRM.iby CORE_MW_LAYER_IBY_EXPORT_PATH( wmdrm.iby )
+../rom/WMDRMResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( wmdrmresources.iby )
// Configuration files
../conf/wmdrm.confml MW_LAYER_CONFML(wmdrm.confml)