--- a/commondrm/drmutility/src/DrmUiHandlingImpl.cpp Tue Feb 02 00:21:44 2010 +0200
+++ b/commondrm/drmutility/src/DrmUiHandlingImpl.cpp Fri Feb 19 23:05:49 2010 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2006-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"
@@ -3826,7 +3826,7 @@
__ASSERT_DEBUG( !aLaunchParam && aUrl && aFullPath,
User::Panic( KDRMUtilityDebugPanicMessage,
KDRMUtilityDebugPanicCode ) );
- _LIT( KSpace, " " );
+ _LIT( KMarker, "\x00" );
RPointerArray<CDRMPermission> uriList;
TPtr ptr( NULL, 0 );
@@ -3850,10 +3850,10 @@
ptr.AppendNum( localId );
// length of startparam and drm protection scheme are always 1 and
- // 4 spaces are needed
- const TInt KSpacesBetweenParams( 4 );
+ // 5 markers are needed
+ const TInt KMarkersForParams( 5 );
TInt length( 1 + aUrl->Length() + ptr.Length() + aFullPath->Length()
- + KSpacesBetweenParams + 1 );
+ + KMarkersForParams + 1 );
aLaunchParam = HBufC::NewLC( length );
ptr.Set( aLaunchParam->Des() );
@@ -3869,20 +3869,21 @@
{
ptr.AppendNum( EDrmLaunchParamStandAloneUtility );
}
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
ptr.Append( *localIDBuf );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
HBufC* contentUrl( CnvUtfConverter::ConvertToUnicodeFromUtf8L( *aUrl ) );
ptr.Append( *contentUrl );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
// OMA DRM protection scheme
ptr.AppendNum( EDrmSchemeOmaDrm );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
ptr.Append( *aFullPath );
+ ptr.Append( KMarker );
delete contentUrl;
@@ -3902,13 +3903,13 @@
User::Panic( KDRMUtilityDebugPanicMessage,
KDRMUtilityDebugPanicCode ) );
_LIT( KZero, "0" );
- _LIT( KSpace, " " );
+ _LIT( KMarker, "\x00" );
TPtr ptr( NULL, 0 );
// Length of startparam and drm protection scheme and zero local id
- // are always 1 and total of 3 spaces are needed
- TInt length( 1 + aUrl->Length() + 1 + 3 + 1 );
+ // are always 1 and total of 4 markers are needed
+ TInt length( 1 + aUrl->Length() + 1 + 4 + 1 );
aLaunchParam = HBufC::NewLC( length );
ptr.Set( aLaunchParam->Des() );
@@ -3924,14 +3925,15 @@
{
ptr.AppendNum( EDrmLaunchParamStandAloneUtility );
}
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
// Default value 0 for localId in case of WM DRM file
ptr.Append( KZero );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
ptr.Append( *aUrl );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
// WM DRM protection scheme
ptr.AppendNum( EDrmSchemeWmDrm );
+ ptr.Append( KMarker );
CleanupStack::Pop( aLaunchParam );
}