--- a/commondrm/drmrightsmanagerui/src/DRMRightsMgrDetailsView.cpp Mon Mar 15 12:41:43 2010 +0200
+++ b/commondrm/drmrightsmanagerui/src/DRMRightsMgrDetailsView.cpp Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -336,12 +336,8 @@
break;
}
-#ifdef RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
-
DrmUtilityWmDrmUtilities::ParseWmDrmStringL( *aRights[0],
rights.iPlayConstraint );
-#endif
-
}
else
{
--- a/commondrm/drmutility/inc/DrmUtilityDmgrWrapper.h Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#ifndef CDRMUTILITYDMGRWRAPPER_H
-#define CDRMUTILITYDMGRWRAPPER_H
-
-#include <downloadmgrclient.h>
-#include <AknProgressDialog.h>
-#include <eikprogi.h>
-
-/**
-* Environment gate function
-*
-* @since S60 v5.0
-* @return pointer to DMgr handler
-*/
-IMPORT_C TAny* GateFunctionDMgr();
-
-class MDrmUtilityDmgrWrapper
- {
-
-public:
- virtual void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl ) = 0;
-
- virtual void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl,
- CCoeEnv& aCoeEnv ) = 0;
-
- virtual HBufC8* GetErrorUrlL() = 0;
-
- };
-
-/**
-* Class for downloading ROAP triggers
-*
-* @lib DrmUtilityDmgrWrapper
-* @since S60 v5.0
-*/
-class CDrmUtilityDmgrWrapper : CBase,
- public MHttpDownloadMgrObserver,
- public MDrmUtilityDmgrWrapper,
- public MProgressDialogCallback
- {
-
-public:
-
- static CDrmUtilityDmgrWrapper* NewL();
-
- static CDrmUtilityDmgrWrapper* NewLC();
-
- virtual ~CDrmUtilityDmgrWrapper();
-
- /**
- * Download a ROAP trigger from URL and handle it
- *
- * @param aUrl URL of ROAP trigger
- */
- void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl );
-
- void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl,
- CCoeEnv& aCoeEnv );
-
- HBufC8* GetErrorUrlL();
-
-
- // from base class MHttpDownloadMgrObserver
-
- /**
- * From MHttpDownloadMgrObserver.
- * Handle download manager events
- *
- * @param aDownload the download
- * @param aEvent the event
- */
- void HandleDMgrEventL( RHttpDownload& aDownload, THttpDownloadEvent aEvent );
-
-public: // Call back methods of MAknProgressDialogCallback
-
- /**
- * ProgressDialog call back method.
- * Get's called when a dialog is dismissed.
- *
- * @param aButtonId ID of the button pressed
- */
- void DialogDismissedL( TInt aButtonId );
-
-protected:
-
-private:
-
- /**
- * C++ default constructor.
- */
- CDrmUtilityDmgrWrapper();
-
- void ConstructL();
-
- /**
- * Set the browser default access point to be used
- */
- void SetDefaultAccessPointL();
-
- void DoDownloadAndHandleRoapTriggerL( const HBufC8* aUrl );
-
- void ShowProgressNoteL( );
-
- void RemoveProgressNoteL( );
-
- void HandlePostResponseUrlL();
-
-
-private: // data
-
- /**
- * Download manager session
- */
- RHttpDownloadMgr iDlMgr;
-
- /**
- * Used to make downloads synchronous
- */
- CActiveSchedulerWait iWait;
-
- /**
- * to store information on download
- */
- TBool iDownloadSuccess;
- TBool iConnectionError;
-
- TBool iDialogDismissed;
-
- /**
- * Progess note dialog and progress info
- */
- CAknProgressDialog* iProgressNoteDialog; // owned
- CEikProgressInfo* iProgressInfo; // not owned
- TInt iCurrentProgressValue; // owned
- TInt iProgressIncrement; // owned
-
- /**
- * Control environment
- */
- CCoeEnv* iCoeEnv;
-
- /**
- * Is CoeEnv given
- */
- TBool iUseCoeEnv;
-
- /**
- * Error url for ROAP temporary error
- */
- HBufC8* iErrorUrl;
-
- /**
- * Post response url for ROAP prUrl
- */
- HBufC8* iPostResponseUrl;
-
- };
-
-#endif // CDRMUTILITYDMGRWRAPPER_H
--- a/commondrm/drmutility/src/DrmUtilityDownloadManager.cpp Mon Mar 15 12:41:43 2010 +0200
+++ b/commondrm/drmutility/src/DrmUtilityDownloadManager.cpp Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,7 +21,7 @@
#include "DrmUtilityDmgrWrapper.h"
// CONSTANTS
-_LIT( KDrmUtilityDmgrHandlerName, "\\system\\libs\\DrmUtilityDmgrWrapper.dll" );
+_LIT( KDrmUtilityDmgrHandlerName, "DrmUtilityDmgrWrapper.dll" );
typedef TAny* (*NewDMgrL)();
--- a/commondrm/group/bld.inf Mon Mar 15 12:41:43 2010 +0200
+++ b/commondrm/group/bld.inf Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -58,10 +58,7 @@
../drmrightsmanagerui/group/DRMRightsManager.mmp
// drmutility
-#if (defined RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM)
-PRJ_MMPFILES
#include "../drmutility/group/bld.inf"
-#endif // RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
PRJ_MMPFILES
#include "../drmserviceapiwrapper/group/bld.inf"
--- a/commondrm/rom/drmutility.iby Mon Mar 15 12:41:43 2010 +0200
+++ b/commondrm/rom/drmutility.iby Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,8 +21,6 @@
#include <data_caging_paths_for_iby.hrh>
-#ifdef RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
-
file=ABI_DIR\BUILD_DIR\DRMUtility.dll SHARED_LIB_DIR\DRMUtility.dll
file=ABI_DIR\BUILD_DIR\drmutilitycommon.dll SHARED_LIB_DIR\drmutilitycommon.dll
@@ -42,6 +40,4 @@
file=ABI_DIR\BUILD_DIR\DRMAutomatedUsage.dll SHARED_LIB_DIR\DRMAutomatedUsage.dll
file=ABI_DIR\BUILD_DIR\DRMAutomatedUsageImpl.dll SHARED_LIB_DIR\DRMAutomatedUsageImpl.dll
-#endif // RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
-
#endif // DRMUTILITY_IBY
--- a/commondrm/rom/drmutility_resources.iby Mon Mar 15 12:41:43 2010 +0200
+++ b/commondrm/rom/drmutility_resources.iby Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,11 +21,7 @@
#include <data_caging_paths_for_iby.hrh>
-#ifdef RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
-
data=DATAZ_\RESOURCE_FILES_DIR\DrmUtility.rsc RESOURCE_FILES_DIR\DrmUtility.rsc
data=DATAZ_\RESOURCE_FILES_DIR\DrmUtilityDmgrWrapper.rsc RESOURCE_FILES_DIR\DrmUtilityDmgrWrapper.rsc
-#endif // RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
-
#endif // DRMUTILITY_RESOURCES_IBY
--- a/drm_plat/drm_utility_api/group/bld.inf Mon Mar 15 12:41:43 2010 +0200
+++ b/drm_plat/drm_utility_api/group/bld.inf Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -11,7 +11,7 @@
*
* Contributors:
*
-* Description: File that exports the files belonging to
+* Description: File that exports the files belonging to
: DRM Utility API
*
*/
@@ -23,8 +23,6 @@
DEFAULT
PRJ_EXPORTS
-
-#if (defined RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM)
// Utility
../inc/drmutility.h MW_LAYER_PLATFORM_EXPORT_PATH( drmutility.h )
@@ -44,5 +42,3 @@
// Types
../inc/drmutilitytypes.h MW_LAYER_PLATFORM_EXPORT_PATH( drmutilitytypes.h )
-
-#endif // RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/DrmUtilityDmgrWrapper.h Wed Mar 31 22:01:10 2010 +0300
@@ -0,0 +1,176 @@
+/*
+* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#ifndef CDRMUTILITYDMGRWRAPPER_H
+#define CDRMUTILITYDMGRWRAPPER_H
+
+#include <downloadmgrclient.h>
+#include <AknProgressDialog.h>
+#include <eikprogi.h>
+
+/**
+* Environment gate function
+*
+* @since S60 v5.0
+* @return pointer to DMgr handler
+*/
+IMPORT_C TAny* GateFunctionDMgr();
+
+class MDrmUtilityDmgrWrapper
+ {
+
+public:
+ virtual void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl ) = 0;
+
+ virtual void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl,
+ CCoeEnv& aCoeEnv ) = 0;
+
+ virtual HBufC8* GetErrorUrlL() = 0;
+
+ };
+
+/**
+* Class for downloading ROAP triggers
+*
+* @lib DrmUtilityDmgrWrapper
+* @since S60 v5.0
+*/
+class CDrmUtilityDmgrWrapper : CBase,
+ public MHttpDownloadMgrObserver,
+ public MDrmUtilityDmgrWrapper,
+ public MProgressDialogCallback
+ {
+
+public:
+
+ static CDrmUtilityDmgrWrapper* NewL();
+
+ static CDrmUtilityDmgrWrapper* NewLC();
+
+ virtual ~CDrmUtilityDmgrWrapper();
+
+ /**
+ * Download a ROAP trigger from URL and handle it
+ *
+ * @param aUrl URL of ROAP trigger
+ */
+ void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl );
+
+ void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl,
+ CCoeEnv& aCoeEnv );
+
+ HBufC8* GetErrorUrlL();
+
+
+ // from base class MHttpDownloadMgrObserver
+
+ /**
+ * From MHttpDownloadMgrObserver.
+ * Handle download manager events
+ *
+ * @param aDownload the download
+ * @param aEvent the event
+ */
+ void HandleDMgrEventL( RHttpDownload& aDownload, THttpDownloadEvent aEvent );
+
+public: // Call back methods of MAknProgressDialogCallback
+
+ /**
+ * ProgressDialog call back method.
+ * Get's called when a dialog is dismissed.
+ *
+ * @param aButtonId ID of the button pressed
+ */
+ void DialogDismissedL( TInt aButtonId );
+
+protected:
+
+private:
+
+ /**
+ * C++ default constructor.
+ */
+ CDrmUtilityDmgrWrapper();
+
+ void ConstructL();
+
+ /**
+ * Set the browser default access point to be used
+ */
+ void SetDefaultAccessPointL();
+
+ void DoDownloadAndHandleRoapTriggerL( const HBufC8* aUrl );
+
+ void ShowProgressNoteL( );
+
+ void RemoveProgressNoteL( );
+
+ void HandlePostResponseUrlL();
+
+
+private: // data
+
+ /**
+ * Download manager session
+ */
+ RHttpDownloadMgr iDlMgr;
+
+ /**
+ * Used to make downloads synchronous
+ */
+ CActiveSchedulerWait iWait;
+
+ /**
+ * to store information on download
+ */
+ TBool iDownloadSuccess;
+ TBool iConnectionError;
+
+ TBool iDialogDismissed;
+
+ /**
+ * Progess note dialog and progress info
+ */
+ CAknProgressDialog* iProgressNoteDialog; // owned
+ CEikProgressInfo* iProgressInfo; // not owned
+ TInt iCurrentProgressValue; // owned
+ TInt iProgressIncrement; // owned
+
+ /**
+ * Control environment
+ */
+ CCoeEnv* iCoeEnv;
+
+ /**
+ * Is CoeEnv given
+ */
+ TBool iUseCoeEnv;
+
+ /**
+ * Error url for ROAP temporary error
+ */
+ HBufC8* iErrorUrl;
+
+ /**
+ * Post response url for ROAP prUrl
+ */
+ HBufC8* iPostResponseUrl;
+
+ };
+
+#endif // CDRMUTILITYDMGRWRAPPER_H
--- a/omadrm/drmengine/drmclock/Inc/GPSTimeUpdater.h Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/drmengine/drmclock/Inc/GPSTimeUpdater.h Wed Mar 31 22:01:10 2010 +0300
@@ -21,7 +21,7 @@
#define GPSTIMEUPDATER_H_
#include <lbs.h>
-#include <LbsSatellite.h>
+#include <lbssatellite.h>
class CDRMClock;
--- a/omadrm/drmengine/drmclock/Inc/GPSWatcher.h Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/drmengine/drmclock/Inc/GPSWatcher.h Wed Mar 31 22:01:10 2010 +0300
@@ -26,7 +26,7 @@
class CGPSTimeUpdater;
class CDRMClock;
-class CGPSWatcher : public CActive
+class CGPSWatcher : public CTimer
{
public:
~CGPSWatcher();
@@ -51,6 +51,9 @@
// not owned
CDRMClock* iClock;
+
+ // Retry counter
+ TInt iRetryCounter;
};
#endif /* GPSWATCHER_H_ */
--- a/omadrm/drmengine/drmclock/Src/GPSWatcher.cpp Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/drmengine/drmclock/Src/GPSWatcher.cpp Wed Mar 31 22:01:10 2010 +0300
@@ -25,6 +25,9 @@
#include "DRMClock.h"
#include "drmlog.h"
+// Wait time in microseconds: wait 5 minutes
+const TInt KGpsDefaultWaitTime = 300000000;
+const TInt KMaxRetryCounter = 20;
// ============================ MEMBER FUNCTIONS ===============================
@@ -36,8 +39,9 @@
// -----------------------------------------------------------------------------
//
CGPSWatcher::CGPSWatcher( CDRMClock* aClock ) :
- CActive(EPriorityHigh),
- iClock( aClock )
+ CTimer(EPriorityHigh),
+ iClock( aClock ),
+ iRetryCounter( 0 )
{
CActiveScheduler::Add(this);
}
@@ -80,6 +84,8 @@
//
void CGPSWatcher::ConstructL()
{
+ CTimer::ConstructL();
+
User::LeaveIfError(iPosServer.Connect());
// Immediately subscribe for module status events
@@ -108,6 +114,9 @@
//
void CGPSWatcher::RunL()
{
+ // If there are errors just leave and stop watching:
+ DRMLOG2(_L("CGPSWatcher::RunL: error: '%d'"), iStatus.Int());
+
// If we already updated the time:
if( iTimeUpdater && iTimeUpdater->TimeReceived() )
{
@@ -116,11 +125,27 @@
DRMLOG( _L("CGPSWatcher::RunL: object deleted, returning"));
return;
}
+
+ // The server was killed:
+ if( iStatus.Int() == KErrServerTerminated )
+ {
+ if( iRetryCounter > KMaxRetryCounter )
+ {
+ DRMLOG( _L("CGPSWatcher::RunL: Maximum retries reached, stopping watcher.") );
+ iClock->Notify( CDRMClock::ENotifyGPSTimeReceived );
+ return;
+ }
+ // If there are errors just leave and stop watching:
+ DRMLOG2(_L("CGPSWatcher::RunL: server terminated, waiting '%d' microseconds"), KGpsDefaultWaitTime);
+ After( TTimeIntervalMicroSeconds32(KGpsDefaultWaitTime) );
+ return;
+ }
Subscribe();
TPositionModuleStatusEventBase::TModuleEvent occurredEvents = iStatusEvent.OccurredEvents();
DRMLOG2(_L("CGPSWatcher::RunL: occurredEvents = 0x%X"), occurredEvents);
+
// If time updater is not running, check module statuses
if(!iTimeUpdater)
CheckModules();
--- a/omadrm/drmhelper/BMARM/DRMHELPERDMGRWRAPPERU.DEF Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
--- a/omadrm/drmhelper/BMARM/DRMHELPERU.DEF Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-EXPORTS
- "_._27CDRMHelperRightsConstraints" @ 1 NONAME R3UNUSED ; CDRMHelperRightsConstraints::~CDRMHelperRightsConstraints(void)
- CanSetAutomated__10CDRMHelperRC7TDesC16Ri @ 2 NONAME R3UNUSED ; CDRMHelper::CanSetAutomated(TDesC16 const &, int &)
- CheckRightsAmountL__10CDRMHelperRC6TDesC8ii @ 3 NONAME ; CDRMHelper::CheckRightsAmountL(TDesC8 const &, int, int)
- CheckRightsAmountL__10CDRMHelperRC7TDesC16ii @ 4 NONAME ; CDRMHelper::CheckRightsAmountL(TDesC16 const &, int, int)
- CheckRightsPercentL__10CDRMHelperRC7TDesC16i @ 5 NONAME R3UNUSED ; CDRMHelper::CheckRightsPercentL(TDesC16 const &, int)
- ShowAutomatedNote__10CDRMHelperRC6TDesC8 @ 6 NONAME R3UNUSED ; CDRMHelper::ShowAutomatedNote(TDesC8 const &)
- ShowAutomatedNote__10CDRMHelperRC7TDesC16 @ 7 NONAME R3UNUSED ; CDRMHelper::ShowAutomatedNote(TDesC16 const &)
- SupportedDataType__10CDRMHelperiR9TDataType @ 8 NONAME R3UNUSED ; CDRMHelper::SupportedDataType(int, TDataType &)
- UnRegisterDataType__10CDRMHelperi @ 9 NONAME R3UNUSED ; CDRMHelper::UnRegisterDataType(int)
- "_._10CDRMHelper" @ 10 NONAME R3UNUSED ; CDRMHelper::~CDRMHelper(void)
- CanSetAutomated__10CDRMHelperRC6TDesC8Ri @ 11 NONAME R3UNUSED ; CDRMHelper::CanSetAutomated(TDesC8 const &, int &)
- DataTypesCount__10CDRMHelperRi @ 12 NONAME R3UNUSED ; CDRMHelper::DataTypesCount(int &)
- FullRights__27CDRMHelperRightsConstraints @ 13 NONAME R3UNUSED ; CDRMHelperRightsConstraints::FullRights(void)
- GetContentURIList__10CDRMHelperRPt13RPointerArray1Z6HBufC8 @ 14 NONAME R3UNUSED ; CDRMHelper::GetContentURIList(RPointerArray<HBufC8> *&)
- GetCountersL__27CDRMHelperRightsConstraintsRUlT1 @ 15 NONAME R3UNUSED ; CDRMHelperRightsConstraints::GetCountersL(unsigned long &, unsigned long &)
- GetEndTimeL__27CDRMHelperRightsConstraintsR5TTime @ 16 NONAME R3UNUSED ; CDRMHelperRightsConstraints::GetEndTimeL(TTime &)
- GetIntervalL__27CDRMHelperRightsConstraintsR20TTimeIntervalSeconds @ 17 NONAME R3UNUSED ; CDRMHelperRightsConstraints::GetIntervalL(TTimeIntervalSeconds &)
- GetIntervalStartL__27CDRMHelperRightsConstraintsR5TTime @ 18 NONAME R3UNUSED ; CDRMHelperRightsConstraints::GetIntervalStartL(TTime &)
- GetRightsDetailsL__10CDRMHelperRC7TDesC16UlRiT3RP21CDRMRightsConstraintsN35 @ 19 NONAME ; CDRMHelper::GetRightsDetailsL(TDesC16 const &, unsigned long, int &, int &, CDRMRightsConstraints *&, CDRMRightsConstraints *&, CDRMRightsConstraints *&, CDRMRightsConstraints *&)
- GetRightsDetailsL__10CDRMHelperRC7TDesC16UlRiT3RP27CDRMHelperRightsConstraintsN35 @ 20 NONAME ; CDRMHelper::GetRightsDetailsL(TDesC16 const &, unsigned long, int &, int &, CDRMHelperRightsConstraints *&, CDRMHelperRightsConstraints *&, CDRMHelperRightsConstraints *&, CDRMHelperRightsConstraints *&)
- GetStartTimeL__27CDRMHelperRightsConstraintsR5TTime @ 21 NONAME R3UNUSED ; CDRMHelperRightsConstraints::GetStartTimeL(TTime &)
- HandleErrorL__10CDRMHelperiRC6TDesC8 @ 22 NONAME R3UNUSED ; CDRMHelper::HandleErrorL(int, TDesC8 const &)
- HandleErrorL__10CDRMHelperiRC7TDesC16 @ 23 NONAME R3UNUSED ; CDRMHelper::HandleErrorL(int, TDesC16 const &)
- IndicateIdle__10CDRMHelper @ 24 NONAME R3UNUSED ; CDRMHelper::IndicateIdle(void)
- IsPreview__27CDRMHelperRightsConstraints @ 25 NONAME R3UNUSED ; CDRMHelperRightsConstraints::IsPreview(void)
- LaunchDetailsViewEmbeddedL__10CDRMHelperPC6HBufC8 @ 26 NONAME R3UNUSED ; CDRMHelper::LaunchDetailsViewEmbeddedL(HBufC8 const *)
- LaunchDetailsViewEmbeddedL__10CDRMHelperRC6TDesC8 @ 27 NONAME R3UNUSED ; CDRMHelper::LaunchDetailsViewEmbeddedL(TDesC8 const &)
- LaunchDetailsViewEmbeddedL__10CDRMHelperRC7TDesC16 @ 28 NONAME R3UNUSED ; CDRMHelper::LaunchDetailsViewEmbeddedL(TDesC16 const &)
- NewLC__10CDRMHelper @ 29 NONAME R3UNUSED ; CDRMHelper::NewLC(void)
- NewLC__10CDRMHelperR7CCoeEnv @ 30 NONAME R3UNUSED ; CDRMHelper::NewLC(CCoeEnv &)
- NewL__10CDRMHelper @ 31 NONAME R3UNUSED ; CDRMHelper::NewL(void)
- NewL__10CDRMHelperR7CCoeEnv @ 32 NONAME R3UNUSED ; CDRMHelper::NewL(CCoeEnv &)
- RegisterDataType__10CDRMHelperRC9TDataType @ 33 NONAME R3UNUSED ; CDRMHelper::RegisterDataType(TDataType const &)
- RemoveAutomatedPassive__10CDRMHelperRC6TDesC8 @ 34 NONAME R3UNUSED ; CDRMHelper::RemoveAutomatedPassive(TDesC8 const &)
- RemoveAutomatedPassive__10CDRMHelperRC7TDesC16 @ 35 NONAME R3UNUSED ; CDRMHelper::RemoveAutomatedPassive(TDesC16 const &)
- RemoveAutomated__10CDRMHelperRC6TDesC8 @ 36 NONAME R3UNUSED ; CDRMHelper::RemoveAutomated(TDesC8 const &)
- RemoveAutomated__10CDRMHelperRC7TDesC16 @ 37 NONAME R3UNUSED ; CDRMHelper::RemoveAutomated(TDesC16 const &)
- SetAutomatedPassive__10CDRMHelperRC6TDesC8 @ 38 NONAME R3UNUSED ; CDRMHelper::SetAutomatedPassive(TDesC8 const &)
- SetAutomatedPassive__10CDRMHelperRC7TDesC16 @ 39 NONAME R3UNUSED ; CDRMHelper::SetAutomatedPassive(TDesC16 const &)
- SetAutomatedSilent__10CDRMHelperRC6TDesC8i @ 40 NONAME R3UNUSED ; CDRMHelper::SetAutomatedSilent(TDesC8 const &, int)
- SetAutomatedSilent__10CDRMHelperRC7TDesC16i @ 41 NONAME R3UNUSED ; CDRMHelper::SetAutomatedSilent(TDesC16 const &, int)
- SetAutomated__10CDRMHelperRC6TDesC8 @ 42 NONAME R3UNUSED ; CDRMHelper::SetAutomated(TDesC8 const &)
- SetAutomated__10CDRMHelperRC7TDesC16 @ 43 NONAME R3UNUSED ; CDRMHelper::SetAutomated(TDesC16 const &)
- SetCountLimitL__10CDRMHelperUi @ 44 NONAME R3UNUSED ; CDRMHelper::SetCountLimitL(unsigned int)
- SetPercentageLimitL__10CDRMHelperUi @ 45 NONAME R3UNUSED ; CDRMHelper::SetPercentageLimitL(unsigned int)
- SetTimeLimitL__10CDRMHelperUi @ 46 NONAME R3UNUSED ; CDRMHelper::SetTimeLimitL(unsigned int)
-
--- a/omadrm/drmhelper/BWINSCW/drmhelperdmgrwrapperU.DEF Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- ?GateFunctionDMgr@@YAPAXXZ @ 1 NONAME ; void * GateFunctionDMgr(void)
-
--- a/omadrm/drmhelper/EABI/drmhelperdmgrwrapperU.DEF Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-EXPORTS
- _Z16GateFunctionDMgrv @ 1 NONAME
- _ZTI21CDRMHelperDMgrWrapper @ 2 NONAME ; #<TI>#
- _ZTV21CDRMHelperDMgrWrapper @ 3 NONAME ; #<VT>#
-
--- a/omadrm/drmhelper/group/bld.inf Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/drmhelper/group/bld.inf Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003 - 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003 - 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -22,7 +22,6 @@
PRJ_MMPFILES
-drmhelperdmgrwrapper.mmp
DRMHelper.mmp
// End of File
--- a/omadrm/drmhelper/group/drmhelperdmgrwrapper.mmp Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2006 - 2007 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Project definition file for drmhelperdmgrwrapper
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET drmhelperdmgrwrapper.dll
-TARGETTYPE dll
-UID 0x1000008D 0x102823D9
-
-CAPABILITY CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-SOURCE ../src/DRMHelperDMgrWrapper.cpp
-
-START RESOURCE drmhelperdmgrwrapper.rss
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-USERINCLUDE ../inc
-USERINCLUDE ../../drmengine/roap/inc
-USERINCLUDE ../../../inc // ADo level inc dir
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-LIBRARY centralrepository.lib // Browser default AP
-LIBRARY cmmanager.lib
-LIBRARY DownloadMgr.lib
-LIBRARY RoapHandler.lib
-LIBRARY efsrv.lib
-LIBRARY avkon.lib
-LIBRARY cone.lib
-LIBRARY commonengine.lib
-LIBRARY aknnotify.lib
-LIBRARY eikctl.lib
-LIBRARY eikcdlg.lib
-
-#ifdef RD_MULTIPLE_DRIVE
-LIBRARY platformenv.lib
-#endif
-
-DEBUGLIBRARY flogger.lib
-
-START WINS
-END
-
-START MARM
-END
-
-#if defined(ARMCC)
-deffile ../EABI/
-#elif defined( WINSCW )
-deffile ../BWINSCW/
-#elif defined( WINS )
-deffile ../bwins/
-#else
-deffile ../bmarm/
-#endif
-
-SMPSAFE
--- a/omadrm/drmhelper/group/drmhelperdmgrwrapper.rss Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Resource file for drmhelperdmgrwrapper
-*
-*/
-
-
-// RESOURCE IDENTIFIER
-NAME DRMD
-
-// INCLUDES
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include <avkon.loc>
-#include <avkon.mbg>
-#ifdef __DRM
-#include <drmcommon.loc>
-#endif
-
-// CONSTANTS
-
-// MACROS
-
-// RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF16 { buf="DRMD"; }
-
-// -----------------------------------------------------------------------------
-//
-// r_silent_progress_note
-// String displayed while getting silent rights
-// expired.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_silent_progress_note
- {
- flags = EAknProgressNoteFlags;
- buttons = R_AVKON_SOFTKEYS_CANCEL;
- items =
- {
- DLG_LINE
- {
- type = EAknCtNote;
- id = EGeneralQuery;
- control= AVKON_NOTE
- {
- layout = EProgressLayout;
- singular_label = qtn_drm_progress_opening;
- imagefile = AVKON_BITMAP_FILE;
- imageid = EMbmAvkonQgn_note_progress;
- imagemask = EMbmAvkonQgn_note_progress_mask;
- };
- }
- };
- }
-
-//End of File
-
--- a/omadrm/drmhelper/inc/DRMHelperDMgrWrapper.h Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-/*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#ifndef CDRMHELPERDMGRWRAPPER_H
-#define CDRMHELPERDMGRWRAPPER_H
-
-#include <downloadmgrclient.h>
-#include <AknProgressDialog.h>
-#include <eikprogi.h>
-
-/**
-* Environment gate function
-*
-* @since S60 3.1
-* @return pointer to DMgr handler
-*/
-IMPORT_C TAny* GateFunctionDMgr();
-
-class MDRMHelperDMgrWrapper
- {
-
-public:
- virtual void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl ) = 0;
-
- virtual void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl,
- CCoeEnv& aCoeEnv ) = 0;
-
- virtual HBufC8* GetErrorUrlL() = 0;
-
- };
-
-/**
-* Class for downloading ROAP triggers
-*
-* @lib DRMHelperDMgrWrapper
-* @since S60 v3.1
-*/
-class CDRMHelperDMgrWrapper : CBase,
- public MHttpDownloadMgrObserver,
- public MDRMHelperDMgrWrapper,
- public MProgressDialogCallback
- {
-
-public:
-
- static CDRMHelperDMgrWrapper* NewL();
-
- static CDRMHelperDMgrWrapper* NewLC();
-
- virtual ~CDRMHelperDMgrWrapper();
-
- /**
- * Download a ROAP trigger from URL and handle it
- *
- * @since S60 3.1
- * @param aUrl URL of ROAP trigger
- */
- void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl );
-
- void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl, CCoeEnv& aCoeEnv );
-
- HBufC8* GetErrorUrlL();
-
-
-// from base class MHttpDownloadMgrObserver
-
- /**
- * From MHttpDownloadMgrObserver.
- * Handle download manager events
- *
- * @since S60 3.1
- * @param aDownload the download
- * @param aEvent the event
- */
- void HandleDMgrEventL( RHttpDownload& aDownload, THttpDownloadEvent aEvent );
-
-public: // Call back methods of MAknProgressDialogCallback
-
- /**
- * ProgressDialog call back method.
- * Get's called when a dialog is dismissed.
- *
- * @since S60 3.2
- * @param aButtonId ID of the button pressed
- */
- void DialogDismissedL( TInt aButtonId );
-
-protected:
-
-private:
-
- /**
- * C++ default constructor.
- */
- CDRMHelperDMgrWrapper();
-
- void ConstructL();
-
- /**
- * Set the browser default access point to be used
- *
- * @since S60 3.0
- */
- void SetDefaultAccessPointL();
-
- void DoDownloadAndHandleRoapTriggerL( const HBufC8* aUrl );
-
- void ShowProgressNoteL( );
-
- void RemoveProgressNoteL( );
-
- void HandlePostResponseUrlL();
-
-
-private: // data
-
- /**
- * Download manager session
- */
- RHttpDownloadMgr iDlMgr;
-
- /**
- * Used to make downloads synchronous
- */
- CActiveSchedulerWait iWait;
-
- /**
- * to store information on download
- */
- TBool iDownloadSuccess;
- TBool iConnectionError;
-
- TBool iDialogDismissed;
-
- /**
- * Progess note dialog and progress info
- */
- CAknProgressDialog* iProgressNoteDialog; // owned
- CEikProgressInfo* iProgressInfo; // not owned
- TInt iCurrentProgressValue; // owned
- TInt iProgressIncrement; // owned
-
- /**
- * Control environment
- */
- CCoeEnv* iCoeEnv;
-
- /**
- * Is CoeEnv given
- */
- TBool iUseCoeEnv;
-
- /**
- * Error url for ROAP temporary error
- */
- HBufC8* iErrorUrl;
-
- /**
- * Post response url for ROAP prUrl
- */
- HBufC8* iPostResponseUrl;
-
- };
-
-#endif // CDRMHELPERDMGRWRAPPER_H
--- a/omadrm/drmhelper/inc/DRMHelperDMgrWrapperLogger.h Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Logger utility.
-*
-*/
-
-
-#ifndef DRMUILOGGER_H
-#define DRMUILOGGER_H
-
-
-// INCLUDES
-
-#include <e32std.h>
-#include <e32def.h>
-#include <eikenv.h>
-#include <flogger.h>
-
-
-#ifdef _DEBUG
-#define __TEST_DRM_LOG__
-#endif // _DEBUG
-
-
-#ifdef __TEST_DRM_LOG__
-
-// CONSTANTS
-
-// DRMUI logging directory.
-_LIT( KDRMUILogDir, "DRMUI" );
-// DRMUI log file name.
-_LIT( KDRMUILogFile, "DMgrWrapper.log" );
-// Format string: enter function.
-_LIT( KDRMUILogEnterFn, "-> %S" );
-// Format string: leave function.
-_LIT( KDRMUILogLeaveFn, "<- %S" );
-// Format string: time.
-_LIT( KDRMUILogTimeFormatString, "%H:%T:%S:%*C2" );
-// Format string: timestamp.
-_LIT( KDRMUILogTimeStampFormatString, "%S %S" );
-//Banner message
-_LIT( KDRMUILogBanner, "DRMUI 3.2");
-// Message of exit from app
-_LIT( KDRMUILogExit, "DRMUI: Application exit");
-
-// DEFINES
-
-// Create the log
-#define CLOG_CREATE { FCreate(); }
-
-// Close the log
-#define CLOG_CLOSE \
- { \
- RFileLogger::Write \
- ( \
- KDRMUILogDir, \
- KDRMUILogFile, \
- EFileLoggingModeAppend, \
- KDRMUILogExit \
- ); \
- }
-
-// Write log: enter function.
-#define CLOG_ENTERFN( a ) \
- { \
- _LIT( temp, a ); \
- RFileLogger::WriteFormat \
- ( \
- KDRMUILogDir, \
- KDRMUILogFile, \
- EFileLoggingModeAppend, \
- KDRMUILogEnterFn, \
- &temp \
- ); \
- }
-
-// Write log: leave function.
-#define CLOG_LEAVEFN( a ) \
- { \
- _LIT( temp, a ); \
- RFileLogger::WriteFormat \
- ( \
- KDRMUILogDir, \
- KDRMUILogFile, \
- EFileLoggingModeAppend, \
- KDRMUILogLeaveFn, \
- &temp \
- ); \
- }
-
-// Write log: string 'a'.
-#define CLOG_WRITE( a ) \
- { \
- _LIT( temp, a ); \
- RFileLogger::Write \
- ( \
- KDRMUILogDir, \
- KDRMUILogFile, \
- EFileLoggingModeAppend, \
- temp \
- ); \
- }
-
-// Write log: formatted.
-#define CLOG_WRITE_FORMAT( a, b ) \
- { \
- _LIT( temp, a ); \
- RFileLogger::WriteFormat \
- ( \
- KDRMUILogDir, \
- KDRMUILogFile, \
- EFileLoggingModeAppend, \
- temp, \
- b \
- ); \
- }
-
-// Write log: timestamp.
-#define CLOG_WRITE_TIMESTAMP( a ) \
- { \
- _LIT( temp, a ); \
- TTime time; \
- time.HomeTime(); \
- TBuf<32> timeBuf; \
- TRAPD( err, time.FormatL( timeBuf, KDRMUILogTimeFormatString ) ); \
- if ( !err ) \
- { \
- RFileLogger::WriteFormat \
- ( \
- KDRMUILogDir, \
- KDRMUILogFile, \
- EFileLoggingModeAppend, \
- KDRMUILogTimeStampFormatString, \
- &temp, \
- &timeBuf \
- ); \
- } \
- }
-
-// Write formatted
-#define CLOG_WRITEF FPrint
-
-
-inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
- {
- VA_LIST list;
- VA_START( list, aFmt );
- RFileLogger::WriteFormat( KDRMUILogDir, KDRMUILogFile,
- EFileLoggingModeAppend, aFmt, list );
- }
-
-
-inline void FPrint( const TDesC& aDes )
- {
- RFileLogger::WriteFormat( KDRMUILogDir, KDRMUILogFile,
- EFileLoggingModeAppend, aDes );
- }
-
-
-inline void FCreate()
- {
- TFileName path( _L( "c:\\logs\\" ) );
- path.Append( KDRMUILogDir );
- path.Append( _L( "\\" ) );
- RFs& fs = CEikonEnv::Static()->FsSession();
- fs.MkDirAll( path );
- RFileLogger::WriteFormat( KDRMUILogDir, KDRMUILogFile,
- EFileLoggingModeOverwrite, KDRMUILogBanner );
- }
-
-
-#else // not defined __TEST_DRM_LOG__
-
-inline void FPrint( const TRefByValue<const TDesC> /*aFmt*/, ... ) {};
-
-
-// DEFINES
-
-// Empty definition (disable log).
-#define CLOG_CREATE
-
-// Empty definition (disable log).
-#define CLOG_CLOSE
-
-// Empty definition (disable log).
-#define CLOG_ENTERFN( a )
-
-// Empty definition (disable log).
-#define CLOG_LEAVEFN( a )
-
-// Empty definition (disable log).
-#define CLOG_WRITE( a )
-
-// Empty definition (disable log).
-#define CLOG_WRITE_FORMAT( a, b )
-
-// Empty definition (disable log).
-#define CLOG_WRITE_TIMESTAMP( a )
-
-// Empty definition (disable log).
-#define CCDLGLOGGER_WRITEF 1 ? ((void)0) : FPrint
-
-#endif // __TEST_DRM_LOG__
-
-#endif // DRMUILOGGER_H
--- a/omadrm/drmhelper/inc/DRMHelperDownloadManager.h Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/drmhelper/inc/DRMHelperDownloadManager.h Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -22,7 +22,7 @@
#include <e32base.h>
#include <ConeResLoader.h>
-class CDRMHelperDMgrWrapper;
+class CDrmUtilityDmgrWrapper;
/**
* This class encapsulates Download manager functionality.
@@ -33,7 +33,7 @@
NONSHARABLE_CLASS(CDrmHelperDownloadManager) : public CBase
{
public:
-
+
static CDrmHelperDownloadManager* NewL();
virtual ~CDrmHelperDownloadManager();
@@ -46,12 +46,12 @@
void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl, CCoeEnv& aCoeEnv );
void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl );
-
+
HBufC8* GetErrorUrlL();
protected:
-
+
private:
CDrmHelperDownloadManager();
@@ -60,10 +60,10 @@
private:
/**
- * Download manager handler
- */
+ * Download manager handler
+ */
RLibrary iDMgrDll;
- CDRMHelperDMgrWrapper* iDMgrHandler;
+ CDrmUtilityDmgrWrapper* iDMgrHandler;
};
-#endif // CDRMHELPERDOWNLOADMANAGER_H
+#endif // CDRMHELPERDOWNLOADMANAGER_H
--- a/omadrm/drmhelper/src/DRMHelperDMgrWrapper.cpp Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,723 +0,0 @@
-/*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Dynamically loadable wrapper for Download manager
-*
-*/
-
-#include <centralrepository.h>
-#include <cdblen.h>
-
-#include <cmconnectionmethod.h>
-#include <cmdestination.h>
-#include <cmconnectionmethoddef.h>
-#include <cmmanager.h>
-
-#ifdef __SERIES60_NATIVE_BROWSER
-#include <browseruisdkcrkeys.h>
-#endif
-
-#ifdef RD_MULTIPLE_DRIVE
-#include <driveinfo.h>
-#endif
-
-#include <StringLoader.h>
-#include <data_caging_path_literals.hrh>
-
-#include <ConeResLoader.h>
-#include <apparc.h>
-
-#include <drmhelperdmgrwrapper.rsg>
-
-#include "RoapEng.h"
-#include "RoapSyncWrapper.h"
-#include "RoapDef.h"
-#include "DRMHelperDMgrWrapper.h"
-#include "DRMHelperDMgrWrapperLogger.h"
-
-// DEBUG macros
-#ifdef _DEBUG
-#define DRMDEBUGLIT( a, b ) \
-_LIT( a , b )
-#define DRMDEBUG( a ) \
-RDebug::Print( a )
-#define DRMDEBUG2( a, b ) \
-RDebug::Print( a, b )
-#else
-#define DRMDEBUGLIT( a, b )
-#define DRMDEBUG( a )
-#define DRMDEBUG2( a, b )
-#endif
-
-// CONSTANTS
-#ifndef __SERIES60_NATIVE_BROWSER
-const TUid KCRUidBrowser = {0x10008D39};
-const TUint32 KBrowserDefaultAccessPoint = 0x0000000E;
-const TUint32 KBrowserAccessPointSelectionMode = 0x0000001E;
-#endif
-
-// CONSTANTS
-#ifndef RD_MULTIPLE_DRIVE
-_LIT( KDriveZ, "z:" );
-_LIT( KHelperTriggerFilePath, "d:\\" );
-#endif
-
-_LIT( KCDRMHelperDMgrWrapperResFileName,"DRMHelperDMgrWrapper.rsc" );
-const TInt KProgressInfoFinalValue( 200 );
-const TInt KProgressInfoIncrementSmall( 5 );
-const TInt KProgressInfoIncrementMedium( 10 );
-const TInt KProgressInfoIncrementLarge( 30 );
-
-// ======== LOCAL FUNCTIONS ========
-LOCAL_C void DeleteHttpDowload( TAny* aDownload )
- {
- reinterpret_cast< RHttpDownload* >( aDownload )->Delete();
- }
-
-// ---------------------------------------------------------------------------
-// IapIdOfDefaultSnapL
-// for trapping purposes only
-// ---------------------------------------------------------------------------
-//
-LOCAL_C TUint32 IapIdOfDefaultSnapL(
- RCmManager& aCmManager,
- const TUint32 aDefaultSnap )
- {
- RCmDestination dest( aCmManager.DestinationL( aDefaultSnap ) );
- CleanupClosePushL( dest );
- TUint32 iapIdOfDest( 0 );
-
- if ( dest.ConnectionMethodCount() <= 0 )
- {
- User::Leave( KErrNotFound );
- }
-
- RCmConnectionMethod cMeth( dest.ConnectionMethodL( 0 ) );
- CleanupClosePushL( cMeth );
-
- iapIdOfDest = cMeth.GetIntAttributeL( CMManager::ECmIapId );
- CleanupStack::PopAndDestroy( &cMeth );
- CleanupStack::PopAndDestroy( &dest );
- return iapIdOfDest;
- }
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::CDRMHelperDMgrWrapper
-// ---------------------------------------------------------------------------
-//
-CDRMHelperDMgrWrapper::CDRMHelperDMgrWrapper() :
- iUseCoeEnv( EFalse )
- {
- }
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::ConstructL
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::ConstructL()
- {
- CLOG_WRITE( "DMgrWrapper::ConstructL" );
- const TInt KDrmHelperDMgrWrapperUid = 0x102823D9;
- iDlMgr.ConnectL( TUid::Uid(KDrmHelperDMgrWrapperUid), *this, EFalse );
- iProgressInfo = NULL;
- iProgressNoteDialog = NULL;
- iDialogDismissed = ETrue;
- }
-
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::NewL
-// ---------------------------------------------------------------------------
-//
-CDRMHelperDMgrWrapper* CDRMHelperDMgrWrapper::NewL()
- {
- CLOG_WRITE( "DMgrWrapper::NewL" );
- CDRMHelperDMgrWrapper* self( CDRMHelperDMgrWrapper::NewLC() );
- CleanupStack::Pop( self );
- return self;
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::NewLC
-// ---------------------------------------------------------------------------
-//
-CDRMHelperDMgrWrapper* CDRMHelperDMgrWrapper::NewLC()
- {
- CLOG_WRITE( "DMgrWrapper::NewLC" );
- CDRMHelperDMgrWrapper* self( new( ELeave ) CDRMHelperDMgrWrapper() );
- CleanupStack::PushL( self );
- self->ConstructL();
- return self;
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::~CDRMHelperDMgrWrapper
-// ---------------------------------------------------------------------------
-//
-CDRMHelperDMgrWrapper::~CDRMHelperDMgrWrapper()
- {
- CLOG_WRITE( "DMgrWrapper destructor" );
- if ( iProgressNoteDialog )
- {
- // deletes the dialog
- TRAPD( err, iProgressNoteDialog->ProcessFinishedL() );
- if ( err )
- {
- delete iProgressNoteDialog;
- }
- iProgressNoteDialog = NULL;
- }
- delete iErrorUrl;
- delete iPostResponseUrl;
-
-#ifdef _DEBUG
-
- if ( iDlMgr.Handle() )
- {
- iDlMgr.Close();
- }
-
-#else
-
- iDlMgr.Close();
-
-#endif
-
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::DownloadAndHandleRoapTriggerL
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::DownloadAndHandleRoapTriggerL( const HBufC8* aUrl )
- {
- CLOG_WRITE( "DMgrWrapper::DownloadAndHandleRoapTriggerL" );
- iUseCoeEnv = EFalse;
- DoDownloadAndHandleRoapTriggerL( aUrl );
- HandlePostResponseUrlL();
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::DownloadAndHandleRoapTriggerL
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::DownloadAndHandleRoapTriggerL(
- const HBufC8* aUrl, CCoeEnv& aCoeEnv )
- {
- CLOG_WRITE( "DMgrWrapper::DownloadAndHandleRoapTriggerL" );
- iCoeEnv = &aCoeEnv;
- iUseCoeEnv = ETrue;
- DoDownloadAndHandleRoapTriggerL( aUrl );
- HandlePostResponseUrlL();
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::HandlePostResponseUrlL
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::HandlePostResponseUrlL()
- {
- if ( iPostResponseUrl )
- {
- DoDownloadAndHandleRoapTriggerL( iPostResponseUrl );
- // prevent infinite post response fetches.
- delete iPostResponseUrl;
- iPostResponseUrl = NULL;
-
- // Ensure progress note gets deleted.
- // It remains open if prUrl initialted ROAP operation has PrUrl
- // (unsupported chained metering report)
- RemoveProgressNoteL();
- }
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::DoDownloadAndHandleRoapTriggerL
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::DoDownloadAndHandleRoapTriggerL(
- const HBufC8* aUrl )
- {
- RFs fs;
- RFile roapTrigger;
- HBufC8* triggerBuf( NULL );
- TBool result( EFalse );
- TFileName triggerFileName;
-
- CLOG_WRITE( "DMgrWrapper::DoDownloadAndHandleRoapTriggerL" );
- User::LeaveIfError( fs.Connect() );
- CleanupClosePushL( fs );
- User::LeaveIfError( fs.ShareProtected() );
-
-
-#ifndef RD_MULTIPLE_DRIVE
-
- User::LeaveIfError( roapTrigger.Temp(
- fs, KHelperTriggerFilePath, triggerFileName, EFileWrite ) );
-
-#else //RD_MULTIPLE_DRIVE
-
- _LIT( KDrive, "%c:\\");
- TInt driveNumber( -1 );
- TChar driveLetter;
- DriveInfo::GetDefaultDrive( DriveInfo::EDefaultRam, driveNumber );
- fs.DriveToChar( driveNumber, driveLetter );
-
- TFileName helperTriggerFilePath;
-
- helperTriggerFilePath.Format( KDrive, (TUint)driveLetter );
-
- User::LeaveIfError( roapTrigger.Temp(
- fs, helperTriggerFilePath, triggerFileName, EFileWrite ) );
-
-#endif
-
- TPtrC8 KNullPtr8( NULL, 0 );
- RHttpDownload* downloadPtr( iDlMgr.FindDownload( *aUrl, KNullPtr8 ) );
- if ( downloadPtr )
- {
- // Stale download found.
- // Remove it, and re-create a new download.
- downloadPtr->Delete();
- downloadPtr = NULL;
- }
-
- // create and start download
- RHttpDownload& download = iDlMgr.CreateDownloadL( *aUrl, result );
- // Put download for proper cleanup.
- TCleanupItem item( DeleteHttpDowload, &download );
- CleanupStack::PushL( item );
-
- CleanupClosePushL( roapTrigger );
-
- if ( !iPostResponseUrl )
- {
- // No post response retieval. Note must be created.
- ShowProgressNoteL();
- }
-
- if ( result )
- {
- const TInt KReadBufSize( 512 );
- TInt triggerFileSize( 0 );
-
- CLOG_WRITE(
- "DMgrWrapper::DoDownloadAndHandleRoapTriggerL: download created" );
- iDownloadSuccess = EFalse;
- iConnectionError = EFalse;
-
- SetDefaultAccessPointL();
-
- User::LeaveIfError( download.SetFileHandleAttribute( roapTrigger ) );
- User::LeaveIfError(
- download.SetBoolAttribute( EDlAttrNoContentTypeCheck, ETrue ) );
- User::LeaveIfError( download.Start() );
-
- // wait until download is finished
- iWait.Start();
-
- // Check success of download
- CLOG_WRITE(
- "DMgrWrapper::DoDownloadAndHandleRoapTriggerL: download finished" );
-
- CleanupStack::Pop( &roapTrigger );
- roapTrigger.Close();
- if ( !iDownloadSuccess )
- {
- RemoveProgressNoteL();
- if ( iConnectionError )
- {
- User::Leave( KErrCouldNotConnect );
- }
- else
- {
- User::Leave( KErrGeneral );
- }
- }
- User::LeaveIfError( roapTrigger.Open( fs,
- triggerFileName,
- EFileShareReadersOrWriters ) );
- CleanupClosePushL( roapTrigger );
-
- // Get filehandle of ROAP trigger
- // Read file to buffer
- User::LeaveIfError( roapTrigger.Size( triggerFileSize ) );
- triggerBuf = HBufC8::NewLC( triggerFileSize );
-
- RBuf8 readBuf;
- readBuf.CleanupClosePushL();
- readBuf.CreateL( KReadBufSize );
-
- User::LeaveIfError( roapTrigger.Read( readBuf, KReadBufSize ) );
- triggerBuf->Des().Copy( readBuf );
- while ( readBuf.Length() == KReadBufSize )
- {
- User::LeaveIfError( roapTrigger.Read( readBuf, KReadBufSize ) );
- triggerBuf->Des().Append( readBuf );
- }
-
- CleanupStack::PopAndDestroy( &readBuf );
-
- if ( iUseCoeEnv && iProgressInfo )
- {
- iProgressInfo->IncrementAndDraw( KProgressInfoIncrementMedium );
- }
-
- // And let ROAP handle it...
- CRoapSyncWrapper* roapWrapper( CRoapSyncWrapper::NewL() );
- CleanupStack::PushL( roapWrapper );
- TRAPD( err, roapWrapper->HandleTriggerL( *triggerBuf ) );
- if ( err )
- {
- TInt errorType( 0 );
- TRAPD( err2, iErrorUrl =
- roapWrapper->GetErrorUrlL( err, errorType ) );
- if ( err2 )
- {
- RemoveProgressNoteL();
- delete iErrorUrl;
- iErrorUrl = NULL;
- User::Leave( err2 );
- }
- else if ( errorType != KErrRoapTemporary )
- {
- RemoveProgressNoteL();
- delete iErrorUrl;
- iErrorUrl = NULL;
- User::Leave( err );
- }
- else
- {
- RemoveProgressNoteL();
- User::Leave( err );
- }
- }
- if ( iPostResponseUrl )
- {
- delete iPostResponseUrl;
- iPostResponseUrl = NULL;
- }
- iPostResponseUrl = roapWrapper->GetPostResponseUrlL();
- CleanupStack::PopAndDestroy( 2, triggerBuf );
-
- if ( iUseCoeEnv && iProgressInfo && !iPostResponseUrl )
- {
- // No PrUrl found. Progess is complete.
- iProgressInfo->SetAndDraw( KProgressInfoFinalValue );
- }
- }
-
- // Trick to keep note open long enough during prUrl retrieval
- if ( !iPostResponseUrl )
- {
- RemoveProgressNoteL();
- }
- else
- {
- if ( iUseCoeEnv && iProgressInfo )
- {
- iProgressInfo->IncrementAndDraw( KProgressInfoIncrementMedium );
- }
- }
-
- CleanupStack::PopAndDestroy( &roapTrigger );
- CleanupStack::PopAndDestroy( &download );
-
- fs.Delete(triggerFileName);
- CleanupStack::PopAndDestroy(&fs);
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::SetDefaultAccessPointL
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::SetDefaultAccessPointL()
- {
- const TInt KDestinationSelectionMode( 2 );
- CRepository* repository( NULL );
- TInt ap( 0 );
- TInt alwaysAsk( 0 );
- TUint32 iapd32( 0 );
- TInt defaultSnap( 0 );
- TInt err( KErrNone );
-
- CLOG_WRITE( "DMgrWrapper::SetDefaultAccessPointL" );
- repository = CRepository::NewL( KCRUidBrowser );
- CleanupStack::PushL( repository );
- repository->Get( KBrowserDefaultAccessPoint, ap );
- repository->Get( KBrowserAccessPointSelectionMode, alwaysAsk );
- repository->Get( KBrowserNGDefaultSnapId, defaultSnap );
-
- if ( ap <= KErrNotFound && defaultSnap <= KErrNotFound )
- {
- alwaysAsk = ETrue;
- }
- else
- {
- RCmManager cmManager;
- cmManager.OpenLC();
- if ( !alwaysAsk )
- {
- TRAP( err, iapd32 = cmManager.GetConnectionMethodInfoIntL(
- ap, CMManager::ECmIapId ) );
- }
- else if ( alwaysAsk == KDestinationSelectionMode )
- {
- TRAP( err, iapd32 =
- IapIdOfDefaultSnapL( cmManager, defaultSnap ) );
- }
- CleanupStack::PopAndDestroy( &cmManager );
- }
- if ( !err && ( !alwaysAsk || alwaysAsk == KDestinationSelectionMode ) )
- {
- err = iDlMgr.SetIntAttribute( EDlMgrIap, iapd32 );
- }
- CleanupStack::PopAndDestroy( repository );
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::GetErrorUrlL
-// ---------------------------------------------------------------------------
-//
-HBufC8* CDRMHelperDMgrWrapper::GetErrorUrlL()
- {
- if( iErrorUrl )
- {
- return iErrorUrl->AllocL();
- }
- return NULL;
- }
-
-
-// ---------------------------------------------------------------------------
-// From class MHttpDownloadMgrObserver
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::HandleDMgrEventL(
- RHttpDownload& aDownload,
- THttpDownloadEvent aEvent )
- {
- _LIT8( KDRMHelperMimeTypeROAPTrigger,
- "application/vnd.oma.drm.roap-trigger+xml" );
-
- CLOG_WRITE( "DMgrWrapper::HandleDMgrEventL" );
- CLOG_WRITE_FORMAT( "iDownLoadState = %d", aEvent.iDownloadState );
- CLOG_WRITE_FORMAT( "iProgressState = %d", aEvent.iProgressState );
-
- if ( aEvent.iProgressState == EHttpContentTypeReceived )
- {
- // check received mimetype
- RBuf8 contentType;
- contentType.CleanupClosePushL();
- contentType.CreateL( KMaxContentTypeLength );
- User::LeaveIfError(
- aDownload.GetStringAttribute( EDlAttrContentType, contentType ) );
- if ( !contentType.FindF( KDRMHelperMimeTypeROAPTrigger ) )
- {
- // ROAP trigger found, continue download
- User::LeaveIfError( aDownload.Start() );
- }
- else
- {
- // wrong MIME type, so stop download
- iDownloadSuccess = EFalse;
- User::LeaveIfError( aDownload.Delete() );
- }
- CleanupStack::PopAndDestroy( &contentType );
- }
-
- if ( aEvent.iDownloadState == EHttpDlCreated )
- {
- CLOG_WRITE( "DMgrWrapper::HandleDMgrEventL: EHttpDlCreated" );
- if ( iUseCoeEnv )
- {
- iProgressInfo->IncrementAndDraw( KProgressInfoIncrementMedium );
- }
- }
- else if ( aEvent.iProgressState == EHttpProgDisconnected )
- {
- CLOG_WRITE( "DMgrWrapper::HandleDMgrEventL: EHttpProgDisconnected" );
- // store failure
- iDownloadSuccess = EFalse;
- iConnectionError = ETrue;
- // finished
- iWait.AsyncStop();
- }
- else if ( aEvent.iDownloadState == EHttpDlInprogress )
- {
- CLOG_WRITE( "DMgrWrapper::HandleDMgrEventL: EHttpDlInprogress" );
- if ( iUseCoeEnv )
- {
- iProgressInfo->IncrementAndDraw( KProgressInfoIncrementSmall );
- }
- }
- else if ( aEvent.iDownloadState == EHttpDlCompleted )
- {
- // store success
- CLOG_WRITE( "DMgrWrapper::HandleDMgrEventL: EHttpDlCompleted" );
- iDownloadSuccess = ETrue;
- if ( iUseCoeEnv )
- {
- iProgressInfo->IncrementAndDraw( KProgressInfoIncrementLarge );
- }
- // finished
- iWait.AsyncStop();
- }
- else if ( aEvent.iDownloadState == EHttpDlFailed )
- {
- TInt32 err( KErrNone );
-
- CLOG_WRITE( "DMgrWrapper::HandleDMgrEventL: EHttpDlFailed" );
- // store failure
- iDownloadSuccess = EFalse;
- User::LeaveIfError( aDownload.GetIntAttribute( EDlAttrErrorId, err ) );
- CLOG_WRITE_FORMAT( "EDlAttrErrorId = %d", err );
-
- if ( err == EConnectionFailed ||
- err == ETransactionFailed)
- {
- CLOG_WRITE( "DMgrWrapper::HandleDMgrEventL: EConnectionFailed" );
- iConnectionError = ETrue;
- }
-
- // finished
- iWait.AsyncStop();
- }
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::ShowProgressNoteL
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::ShowProgressNoteL( )
- {
- TFileName resFileName;
-
- CLOG_WRITE( "DMgrWrapper::ShowProgressNoteL" );
- if ( iUseCoeEnv )
- {
- // Initialize the progress note dialog, it's values,
- // and execute it
-
-#ifndef RD_MULTIPLE_DRIVE
-
- resFileName.Copy( KDriveZ );
-
-#else //RD_MULTIPLE_DRIVE
-
- _LIT( KDrive, "%c:");
- TInt driveNumber( -1 );
- TChar driveLetter;
- DriveInfo::GetDefaultDrive( DriveInfo::EDefaultRom, driveNumber );
-
- iCoeEnv->FsSession().DriveToChar( driveNumber, driveLetter );
-
- resFileName.Format( KDrive, (TUint)driveLetter );
-
-#endif
-
- resFileName.Append( KDC_RESOURCE_FILES_DIR );
- resFileName.Append( KCDRMHelperDMgrWrapperResFileName );
- RConeResourceLoader loader( *iCoeEnv );
- loader.OpenL( resFileName );
-
- iProgressNoteDialog = new (ELeave) CAknProgressDialog(
- reinterpret_cast< CEikDialog** >( &iProgressNoteDialog ) );
- iProgressNoteDialog->PrepareLC( R_SILENT_PROGRESS_NOTE );
- iProgressNoteDialog->SetCallback( this );
- iProgressInfo = iProgressNoteDialog->GetProgressInfoL();
- iProgressInfo->SetFinalValue( KProgressInfoFinalValue );
- iDialogDismissed = EFalse;
- iProgressNoteDialog->RunLD();
-
- loader.Close();
- }
-
- }
-
-
-// ---------------------------------------------------------------------------
-// CDRMHelperDMgrWrapper::RemoveProgressNoteL
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::RemoveProgressNoteL( )
- {
-
- if ( iUseCoeEnv )
- {
- if (iProgressNoteDialog && !iDialogDismissed)
- {
- // deletes the dialog
- TRAPD(err, iProgressNoteDialog->ProcessFinishedL());
- if (err != KErrNone)
- {
- delete iProgressNoteDialog;
- }
- iProgressNoteDialog = NULL;
- }
- }
-
- }
-
-
-// ---------------------------------------------------------------------------
-// From class MAknProgressDialogCallback
-// ---------------------------------------------------------------------------
-//
-void CDRMHelperDMgrWrapper::DialogDismissedL( TInt /*aButtonId*/ )
- {
- iDialogDismissed = ETrue;
-
- // Already freed, just set to NULL
- iProgressNoteDialog = NULL;
- iProgressInfo = NULL;
-
- if( iWait.IsStarted() )
- {
- iWait.AsyncStop();
- }
-
- }
-
-
-// ======== GLOBAL FUNCTIONS ========
-
-//------------------------------------------------------------------------------
-// GateFunctionDRM
-// DRM gate function
-//------------------------------------------------------------------------------
-EXPORT_C TAny* GateFunctionDMgr()
- {
- CDRMHelperDMgrWrapper* launcher = NULL;
- TRAPD( err, launcher = CDRMHelperDMgrWrapper::NewL() );
- if( err != KErrNone )
- {
- return NULL;
- }
-
- return launcher;
- }
-
--- a/omadrm/drmhelper/src/DRMHelperDownloadManager.cpp Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/drmhelper/src/DRMHelperDownloadManager.cpp Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -18,10 +18,10 @@
// INCLUDE FILES
#include "DRMHelperDownloadManager.h"
-#include "DRMHelperDMgrWrapper.h"
+#include "DrmUtilityDmgrWrapper.h"
// CONSTANTS
-_LIT( KDRMHelperDMgrHandlerName, "\\system\\libs\\drmhelperdmgrwrapper.dll" );
+_LIT( KDrmUtilityDmgrHandlerName, "DrmUtilityDmgrWrapper.dll" );
typedef TAny* (*NewDMgrL)();
@@ -35,14 +35,14 @@
void CDrmHelperDownloadManager::ConstructL()
{
- User::LeaveIfError( iDMgrDll.Load( KDRMHelperDMgrHandlerName ) );
+ User::LeaveIfError( iDMgrDll.Load( KDrmUtilityDmgrHandlerName ) );
NewDMgrL createDMgr = (NewDMgrL) iDMgrDll.Lookup( KFirstFunction );
if ( !createDMgr )
{
User::Leave( KErrGeneral );
}
// Create the class, leaves in case of failure
- iDMgrHandler = (CDRMHelperDMgrWrapper*) (*createDMgr)();
+ iDMgrHandler = reinterpret_cast<CDrmUtilityDmgrWrapper*>( (*createDMgr)() );
}
CDrmHelperDownloadManager* CDrmHelperDownloadManager::NewL()
--- a/omadrm/group/bld.inf Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/group/bld.inf Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -31,7 +31,7 @@
../conf/drmutility_20022D51.crml MW_LAYER_CRML(drmutility_20022D51.crml)
../drmengine/group/CryptoPrep.flm /epoc32/tools/makefile_templates/s60/CryptoPrep.flm
../drmengine/group/CryptoPrep.xml /epoc32/tools/makefile_templates/s60/CryptoPrep.xml
-../drmengine/server/data/101F51F2.exc /epoc32/data/Z/private/102073ea/excludes/101F51F2.exc
+../drmengine/server/data/101F51F2.exc /epoc32/data/Z/private/102073ea/excludes/101F51F2.exc
//Loc files
// Ro Handler (only used if OMA DRM 1.0 Full is enabled)
@@ -156,7 +156,6 @@
// DRMHelper
../drmhelper/group/Drmhelper.mmp
-../drmhelper/group/drmhelperdmgrwrapper.mmp
#ifdef SBSV2
PRJ_EXTENSIONS
--- a/omadrm/rom/DRMHelper.iby Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/rom/DRMHelper.iby Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -19,7 +19,6 @@
#ifndef __DRMHELPER_IBY__
#define __DRMHELPER_IBY__
-file=ABI_DIR\BUILD_DIR\DRMHelperDMgrWrapper.dll SHARED_LIB_DIR\DRMHelperDMgrWrapper.dll
file=ABI_DIR\BUILD_DIR\DRMHelper.dll SHARED_LIB_DIR\DRMHelper.dll
#endif
--- a/omadrm/rom/DRMHelperResources.iby Mon Mar 15 12:41:43 2010 +0200
+++ b/omadrm/rom/DRMHelperResources.iby Wed Mar 31 22:01:10 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -19,7 +19,6 @@
#ifndef __DRMHELPER_RESOURCES_IBY__
#define __DRMHELPER_RESOURCES_IBY__
-data=DATAZ_\RESOURCE_FILES_DIR\drmhelper.rsc RESOURCE_FILES_DIR\drmhelper.rsc
-data=DATAZ_\RESOURCE_FILES_DIR\drmhelperdmgrwrapper.rsc RESOURCE_FILES_DIR\drmhelperdmgrwrapper.rsc
+data=DATAZ_\RESOURCE_FILES_DIR\drmhelper.rsc RESOURCE_FILES_DIR\drmhelper.rsc
-#endif
\ No newline at end of file
+#endif
--- a/package_definition.xml Mon Mar 15 12:41:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="drm" name="DRM" levels="plugin framework server generic specific">
- <collection id="commondrm" name="Common DRM" level="generic">
- <component id="drmencryptor" filter="s60" name="DRM Encryptor">
- <!-- this should have its own bld.inf or be removed as a component -->
- </component>
- <component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
- <!-- this should have its own bld.inf or be removed as a component -->
- </component>
- <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
- <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
- </component>
- <component id="drmutility" filter="s60" name="DRM Utility">
- <unit bldFile="commondrm/drmutility/group"/>
- </component>
- <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
- <unit bldFile="commondrm/drmserviceapiwrapper/group"/>
- </component>
- <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
- <unit bldFile="commondrm/drmrightsstoringlocation/group"/>
- </component>
- <component id="commondrm_build" filter="s60" name="Common DRM Build">
- <!-- should be split into the above files, or them collapsed into a single component -->
- <unit bldFile="commondrm/group"/>
- </component>
- </collection>
- <collection id="omadrm" name="OMA DRM" level="server">
- <component id="drmroapwbxmlparser" filter="s60" name="DRM ROAP WBXML Parser">
- <!-- <unit bldFile="omadrm/drmroapwbxmlparser/group"/> -->
- </component>
- <component id="drmplugins" filter="s60" name="DRM Plugins" class="plugin">
- <!-- should have a single bld.inf -->
- <!-- <unit bldFile="omadrm/drmplugins/drmfilter/group"/> -->
- <!-- <unit bldFile="omadrm/drmplugins/drmrecognizer/group"/> -->
- <!-- <unit bldFile="omadrm/drmplugins/drmrohandler/group"/> -->
- <!-- <unit bldFile="omadrm/drmplugins/drmromtm/group"/> -->
- </component>
- <component id="drmengine" filter="s60" name="DRM Engine">
- <!-- this should have its own bld.inf or be removed as a component -->
- </component>
- <component id="drmhelper" filter="s60" name="DRM Helper">
- <!-- <unit bldFile="omadrm/drmhelper/group"/> -->
- <!-- should drmhelperserver be #included in the above? -->
- <!-- <unit bldFile="omadrm/drmhelper/drmhelperserver/group"/> -->
- </component>
- <component id="drmlicensemanager" filter="s60" name="DRM License Manager">
- <!-- <unit bldFile="omadrm/drmlicensemanager/group"/> -->
- </component>
- <component id="omadrm_build" filter="s60" name="OMA DRM Build">
- <!-- should be split into the above files, or them collapsed into a single component -->
- <unit bldFile="omadrm/group"/>
- </component>
- </collection>
- <collection id="wmdrm" name="Windows Media DRM" level="framework">
- <component id="wmdrmengine" filter="s60" name="WM DRM Engine">
- <!-- should have a single bld.inf -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmagent/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/client/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
- </component>
- <component id="camese" filter="s60" name="Camese">
- <!-- should have a single bld.inf -->
- <!-- <unit bldFile="wmdrm/camese/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/cameseutility/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/httpfiltercamese/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdla/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdlaapp/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdladefaulthttpplugin/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdladefaultuiplugin/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdlautils/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdlawrapper/group"/> -->
- </component>
- <component id="wmdrm_build" filter="s60" name="WM DRM Build">
- <!-- should be split into the above files, or them collapsed into a single component -->
- <unit bldFile="wmdrm/group"/>
- </component>
- </collection>
- <collection id="drm_info" name="DRM Info" level="specific">
- <component id="drm_pub" filter="s60" name="DRM Public Interfaces" class="api">
- <unit bldFile="drm_pub/group"/>
- <!-- do the following need to be #included ? -->
- <!-- <unit bldFile="drm_pub/drm_helper_api/tsrc/group"/> -->
- <!-- <unit bldFile="drm_pub/drm_license_checker_api/tsrc/group"/> -->
- <!-- <unit bldFile="drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
- </component>
- <component id="drm_plat" filter="s60" name="DRM Platform Interfaces" class="api">
- <unit bldFile="drm_plat/group"/>
- <!-- do the following need to be #included ? -->
- <!-- <unit bldFile="drm_plat/drm_common_api/tsrc/group"/> -->
- <!-- <unit bldFile="drm_plat/drm_rights_api/tsrc/group"/> -->
- <!-- <unit bldFile="drm_plat/roap_api/tsrc/group"/> -->
- </component>
- <component id="drm_build" filter="s60" name="DRM Build">
- <!-- is this needed ? -->
- <unit bldFile="group"/>
- </component>
- </collection>
- </package>
-</SystemDefinition>