--- a/commondrm/drmrightsmanagerui/data/DRMRightsManager.rss Tue May 25 12:59:35 2010 +0300
+++ b/commondrm/drmrightsmanagerui/data/DRMRightsManager.rss Wed Jun 09 09:59:43 2010 +0300
@@ -74,7 +74,7 @@
caption_and_icon =
CAPTION_AND_ICON_INFO
{
- caption = qtn_drm_mgr;
+ caption = " ";
#ifdef __SCALABLE_ICONS
number_of_icons = 1;
--- a/commondrm/drmrightsmanagerui/inc/DRMRightsMgrAppUi.h Tue May 25 12:59:35 2010 +0300
+++ b/commondrm/drmrightsmanagerui/inc/DRMRightsMgrAppUi.h Wed Jun 09 09:59:43 2010 +0300
@@ -25,9 +25,9 @@
#include <AknProgressDialog.h>
#include <apparc.h>
#include <DRMRightsClient.h>
-#include <drmconstraint.h>
+#include <DrmConstraint.h>
-#include "drmclockclient.h"
+#include "DRMClockClient.h"
#include "DrmViewItems.h"
#include "DRMRightsManager.hrh"
--- a/commondrm/drmutility/inc/DrmUiHandlingImpl.h Tue May 25 12:59:35 2010 +0300
+++ b/commondrm/drmutility/inc/DrmUiHandlingImpl.h Wed Jun 09 09:59:43 2010 +0300
@@ -817,7 +817,7 @@
* CallSilentAvailble after right
* @return Etrue, if silent RO rerieval led to usable content
*/
- TBool CDrmUiHandlingImpl::GetSilentAndCallL(
+ TBool GetSilentAndCallL(
MDrmHandleErrorObserver* aObserver,
TInt aOperationId,
const ContentAccess::TIntent aIntent,
@@ -830,7 +830,7 @@
* checks status if launched embedded.
* CallRightsAvailable, if launched embedded or righsUrl not present
*/
- void CDrmUiHandlingImpl::GetRightsAndCallL(
+ void GetRightsAndCallL(
MDrmHandleErrorObserver* aObserver,
TInt aOperationId,
const ContentAccess::TIntent aIntent,
--- a/drm_plat/dcf_repository_api/inc/DcfRep.h Tue May 25 12:59:35 2010 +0300
+++ b/drm_plat/dcf_repository_api/inc/DcfRep.h Wed Jun 09 09:59:43 2010 +0300
@@ -23,8 +23,8 @@
// INCLUDES
#include <e32base.h>
#include <f32file.h>
-#include <D32DBMS.H>
-#include "dcfrepcli.h"
+#include <d32dbms.h>
+#include "DcfRepCli.h"
// CONSTANTS
// MACROS
// DATA TYPES
--- a/drm_plat/drm_common_api/inc/DRMCommon.h Tue May 25 12:59:35 2010 +0300
+++ b/drm_plat/drm_common_api/inc/DRMCommon.h Wed Jun 09 09:59:43 2010 +0300
@@ -21,7 +21,7 @@
#define DRMCOMMON_H
#include <e32base.h>
-#include <DrmRights.h>
+#include <DRMRights.h>
#include <caf/caf.h>
const TUint KDrmMaxContentInfoSize = 512;
--- a/drm_plat/drm_rights_api/inc/DcfCommon.h Tue May 25 12:59:35 2010 +0300
+++ b/drm_plat/drm_rights_api/inc/DcfCommon.h Wed Jun 09 09:59:43 2010 +0300
@@ -23,8 +23,8 @@
// INCLUDES
#include <apmstd.h>
#include <f32file.h>
-#include <oma2agent.h>
-#include <drmtypes.h>
+#include <Oma2Agent.h>
+#include <DRMTypes.h>
using namespace ContentAccess;
// CONSTANTS
--- a/drm_plat/drm_service_api/inc/drmserviceapi.h Tue May 25 12:59:35 2010 +0300
+++ b/drm_plat/drm_service_api/inc/drmserviceapi.h Wed Jun 09 09:59:43 2010 +0300
@@ -21,7 +21,7 @@
#define C_CDRMSERVICEAPI_H
#include <e32base.h>
-#include "drmtypes.h"
+#include "DRMTypes.h"
// Forward declarations
class RDRMClockClient;
--- a/drm_plat/wmdrm_ota_access_api/inc/wmdrmotaaccess.h Tue May 25 12:59:35 2010 +0300
+++ b/drm_plat/wmdrm_ota_access_api/inc/wmdrmotaaccess.h Wed Jun 09 09:59:43 2010 +0300
@@ -28,7 +28,9 @@
* Functionality
*
* @code
-* // Way to use CWmDrmOtaAccess
+* Only one asynchronous operation can be happening at a time.
+* If another call for async operation is received, this will result in
+* KErrInUse leave code.
*
* CWmDrmOtaAccess* access( CWmDrmOtaAccess::NewL() );
* delete access;
@@ -104,6 +106,17 @@
*/
IMPORT_C void HandleLicenseResponseL( const TDesC8& aResponse,
TRequestStatus& aStatus );
+
+
+ /**
+ * CancelAllAsync
+ *
+ * Cancel all async methods
+ *
+ * @return None
+ */
+ IMPORT_C void CancelAllAsync();
+
private:
/** Default constructor */
@@ -116,3 +129,4 @@
};
#endif // _WMDRM_OTA_ACCESS_API_H_
+
--- a/drm_plat/wmdrm_ota_access_api/inc/wmdrmotaaccessecominterface.h Tue May 25 12:59:35 2010 +0300
+++ b/drm_plat/wmdrm_ota_access_api/inc/wmdrmotaaccessecominterface.h Wed Jun 09 09:59:43 2010 +0300
@@ -22,9 +22,9 @@
#include <e32base.h>
// Class declaration
-// CWmDrmAccessEcomInterface
-// ecom plugin interface for WM DRM access implementation
-// @see CWmDrmAccess
+// CWmDrmOtaAccessEcomInterface
+// ecom plugin interface for WM DRM ota access implementation
+// @see CWmDrmOtaAccess
NONSHARABLE_CLASS( CWmDrmOtaAccessEcomInterface ) : public CBase
{
public:
@@ -94,6 +94,16 @@
*/
virtual void HandleLicenseResponseL( const TDesC8& aResponse,
TRequestStatus& aStatus ) = 0;
+
+ /**
+ * CancelAllAsync
+ *
+ * Cancel all async methods
+ *
+ * @return None
+ */
+ virtual void CancelAllAsync() = 0;
+
private:
// internal variable used on freeing ecom related resources
@@ -101,4 +111,6 @@
};
#include "wmdrmotaaccessecominterface.inl"
+
#endif _WMDRMOTAACCESSECOMINTERFACE_H_
+
--- a/omadrm/drmengine/agentv2/src/Oma2AgentManager.cpp Tue May 25 12:59:35 2010 +0300
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentManager.cpp Wed Jun 09 09:59:43 2010 +0300
@@ -981,27 +981,7 @@
//
void COma2AgentManager::DisplayManagementInfoL()
{
- TUid KRightsManagerUid = TUid::Uid(0x101F85C7);
- RWsSession wsSession;
- RApaLsSession appArcSession;
- TThreadId id;
-
- User::LeaveIfError(wsSession.Connect());
- CleanupClosePushL(wsSession);
- TApaTaskList tasklist(wsSession);
- TApaTask task = tasklist.FindApp(KRightsManagerUid);
- if (task.Exists())
- {
- task.SendMessage(TUid::Uid(KUidApaMessageSwitchOpenFileValue),
- KNullDesC8);
- }
- else
- {
- User::LeaveIfError(appArcSession.Connect());
- appArcSession.StartDocument(_L("0"), KRightsManagerUid, id);
- appArcSession.Close();
- }
- CleanupStack::PopAndDestroy();
- }
+ User::Leave(KErrCANotSupported);
+ }
// End of File
--- a/omadrm/drmengine/group/CryptoPrep.flm Tue May 25 12:59:35 2010 +0300
+++ b/omadrm/drmengine/group/CryptoPrep.flm Wed Jun 09 09:59:43 2010 +0300
@@ -13,9 +13,6 @@
# Description: DRM Crypto Library build configuration
#
-TMPROOT:=$(subst \,/,$(EPOCROOT))
-EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
-
CREATABLEPATH:=$(EXTENSION_ROOT)/../drmengine/drmcrypto/build
CLEANTARGETS:=$(CREATABLEPATH)/cmlacrypto.cpp $(CREATABLEPATH)/omacrypto.cpp
--- a/omadrm/drmengine/ro/inc/DRMProtectedRoParser.h Tue May 25 12:59:35 2010 +0300
+++ b/omadrm/drmengine/ro/inc/DRMProtectedRoParser.h Wed Jun 09 09:59:43 2010 +0300
@@ -278,9 +278,8 @@
* @since Series 60 3.0
* @param aProtectedRo protected RO element
* @return protected RO element, if namespace was not added NULL
- */
- HBufC8* CDrmProtectedRoParser::AddRoapNamespaceL(
- TDesC8& aProtectedRo ) const;
+ */
+ HBufC8* AddRoapNamespaceL( TDesC8& aProtectedRo ) const;
private:
--- a/wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowsercontainer.cpp Tue May 25 12:59:35 2010 +0300
+++ b/wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowsercontainer.cpp Wed Jun 09 09:59:43 2010 +0300
@@ -107,6 +107,10 @@
//
CWmDrmDlaBrowserContainer::~CWmDrmDlaBrowserContainer()
{
+ if(iBrCtlInterface != NULL)
+ {
+ TRAP_IGNORE( iBrCtlInterface->HandleCommandL( (TInt)TBrCtlDefs::ECommandCancelFetch + (TInt)TBrCtlDefs::ECommandIdBase ));
+ }
delete iBrCtlInterface;
}
--- a/wmdrm/camese/wmdrmdladefaulthttpplugin/src/wmdrmdladefaulthttpmanager.cpp Tue May 25 12:59:35 2010 +0300
+++ b/wmdrm/camese/wmdrmdladefaulthttpplugin/src/wmdrmdladefaulthttpmanager.cpp Wed Jun 09 09:59:43 2010 +0300
@@ -162,6 +162,8 @@
HandleDownloadComplete( KErrCancel );
}
}
+ // Close the HTTP session in use
+ iHttpSession.Close();
CleanupConnection();
DeleteUsernamePassword();
@@ -565,6 +567,9 @@
GetConnectionInfoL( info );
iIapNumber = info.iIapId;
+ // Close old session:
+ iHttpSession.Close();
+
// Open session
iHttpSession.OpenL();
RStringPool pool = iHttpSession.StringPool();
@@ -730,7 +735,6 @@
iHdrFields.Reset();
iHttpTransaction.Close();
- iHttpSession.Close();
if ( !iKeepAlive )
{
--- a/wmdrm/wmdrmengine/wmdrmotaaccess/bwins/wmdrmotaaccessu.def Tue May 25 12:59:35 2010 +0300
+++ b/wmdrm/wmdrmengine/wmdrmotaaccess/bwins/wmdrmotaaccessu.def Wed Jun 09 09:59:43 2010 +0300
@@ -6,4 +6,5 @@
?GetLicenseChallengeL@CWmDrmOtaAccess@@QAEXABVTDesC8@@AAPAVHBufC8@@AAVTRequestStatus@@@Z @ 5 NONAME ; void CWmDrmOtaAccess::GetLicenseChallengeL(class TDesC8 const &, class HBufC8 * &, class TRequestStatus &)
?HandleLicenseResponseL@CWmDrmOtaAccess@@QAEXABVTDesC8@@AAVTRequestStatus@@@Z @ 6 NONAME ; void CWmDrmOtaAccess::HandleLicenseResponseL(class TDesC8 const &, class TRequestStatus &)
?GetLicenseChallengeL@CWmDrmOtaAccess@@QAEXABVTDesC8@@AAPAVHBufC8@@@Z @ 7 NONAME ; void CWmDrmOtaAccess::GetLicenseChallengeL(class TDesC8 const &, class HBufC8 * &)
+ ?CancelAllAsync@CWmDrmOtaAccess@@QAEXXZ @ 8 NONAME ; void CWmDrmOtaAccess::CancelAllAsync(void)
--- a/wmdrm/wmdrmengine/wmdrmotaaccess/eabi/wmdrmotaaccessu.def Tue May 25 12:59:35 2010 +0300
+++ b/wmdrm/wmdrmengine/wmdrmotaaccess/eabi/wmdrmotaaccessu.def Wed Jun 09 09:59:43 2010 +0300
@@ -8,4 +8,5 @@
_ZN15CWmDrmOtaAccess20GetLicenseChallengeLERK6TDesC8RP6HBufC8R14TRequestStatus @ 7 NONAME
_ZN15CWmDrmOtaAccess22HandleLicenseResponseLERK6TDesC8 @ 8 NONAME
_ZN15CWmDrmOtaAccess22HandleLicenseResponseLERK6TDesC8R14TRequestStatus @ 9 NONAME
+ _ZN15CWmDrmOtaAccess14CancelAllAsyncEv @ 10 NONAME
--- a/wmdrm/wmdrmengine/wmdrmotaaccess/src/wmdrmotaaccess.cpp Tue May 25 12:59:35 2010 +0300
+++ b/wmdrm/wmdrmengine/wmdrmotaaccess/src/wmdrmotaaccess.cpp Wed Jun 09 09:59:43 2010 +0300
@@ -121,6 +121,7 @@
iWmDrmOtaAccessEcomInterface->HandleLicenseResponseL( aResponse );
}
+
// ---------------------------------------------------------------------------
// CWmDrmOtaAccess::HandleLicenseResponseL
// ---------------------------------------------------------------------------
@@ -137,7 +138,19 @@
aStatus );
}
-
+// ---------------------------------------------------------------------------
+// CWmDrmOtaAccess::CancelAllAsync
+// ---------------------------------------------------------------------------
+EXPORT_C void CWmDrmOtaAccess::CancelAllAsync()
+ {
+ // Ecom interface not available
+ if( !iWmDrmOtaAccessEcomInterface )
+ {
+ return;
+ }
+
+ iWmDrmOtaAccessEcomInterface->CancelAllAsync();
+ }
// End of file
--- a/wmdrm/wmdrmengine/wmdrmserver/server/inc/clock.h Tue May 25 12:59:35 2010 +0300
+++ b/wmdrm/wmdrmengine/wmdrmserver/server/inc/clock.h Wed Jun 09 09:59:43 2010 +0300
@@ -35,7 +35,7 @@
public:
static const TInt KClockInterval = 15 * 60 * 1000000;
- static CClock* CClock::NewL( CWmDrmServer* aServer );
+ static CClock* NewL( CWmDrmServer* aServer );
~CClock();
CClock( CWmDrmServer* aServer );