diff -r edd273b3192a -r 2ee890d2f7e7 mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp Thu May 27 13:19:19 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp Fri Jun 11 14:04:53 2010 +0300 @@ -95,10 +95,13 @@ return EMTPRespCodeInvalidObjectHandle; } - TFileName fileName = objectInfo->DesC( CMTPObjectMetaData::ESuid ); TUint32 formatCode = objectInfo->Uint( CMTPObjectMetaData::EFormatCode ); - PRINT3( _L( "MM MTP <> CGetObjectPropValue::CheckRequestL, handle = 0x%x, filename = %S, formatCode = 0x%x" ), objectHandle, &fileName, formatCode); + PRINT3( _L( "MM MTP <> CGetObjectPropValue::CheckRequestL, handle = 0x%x, filename = %S, formatCode = 0x%x" ), + objectHandle, + &( objectInfo->DesC( CMTPObjectMetaData::ESuid ) ), + formatCode ); + const RArray* properties = iDpConfig.GetSupportedPropertiesL( formatCode ); TInt count = properties->Count(); @@ -130,7 +133,7 @@ { PRINT( _L( "MM MTP => CGetObjectPropValue::ServiceL" ) ); - MmMtpDpUtility::SetPSStatus(EMtpPSStatusActive); + MmMtpDpUtility::SetPSStatus( EMtpPSStatusActive ); //Get the request information TUint32 objectHandle = Request().Uint32( TMTPTypeRequest::ERequestParameter1 ); @@ -142,7 +145,6 @@ iObjectInfo = iRequestChecker->GetObjectInfo( objectHandle ); TPtrC suid( iObjectInfo->DesC( CMTPObjectMetaData::ESuid ) ); PRINT1( _L( "MM MTP <> CGetObjectPropValue::ServiceL object file name is %S" ), &suid ); - TParsePtrC parse( suid ); if ( iMTPTypeString != NULL ) { @@ -177,8 +179,7 @@ case EMTPObjectPropCodeProtectionStatus: { iMTPTypeUint16.Set( 0 ); - iMTPTypeUint16 = MmMtpDpUtility::GetProtectionStatusL( iFramework.Fs(), - iObjectInfo->DesC( CMTPObjectMetaData::ESuid ) ); + iMTPTypeUint16 = MmMtpDpUtility::GetProtectionStatusL( iFramework.Fs(), suid ); SendDataL( iMTPTypeUint16 ); } break; @@ -187,8 +188,7 @@ case EMTPObjectPropCodeObjectSize: { iMTPTypeUint64.Set( 0 ); - iMTPTypeUint64 = MmMtpDpUtility::GetObjectSizeL( iFramework.Fs(), - iObjectInfo->DesC( CMTPObjectMetaData::ESuid ) ); + iMTPTypeUint64 = MmMtpDpUtility::GetObjectSizeL( iFramework.Fs(), suid ); SendDataL( iMTPTypeUint64 ); } break; @@ -196,11 +196,7 @@ // Filename case EMTPObjectPropCodeObjectFileName: { - const TDesC& suid( iObjectInfo->DesC( CMTPObjectMetaData::ESuid ) ); - PRINT1( _L( "MM MTP <> CGetObjectPropValue::ServiceL SUID = %S" ), &suid ); - - TPtrC path( suid.Ptr(), suid.Length() ); - TParsePtrC parse( path ); + TParsePtrC parse( suid ); iMTPTypeString = CMTPTypeString::NewL( parse.NameAndExt() ); SendDataL( *iMTPTypeString ); } @@ -238,9 +234,7 @@ case EMTPObjectPropCodeDateModified: { TBuf timeStr; - MmMtpDpUtility::GetObjectDateModifiedL( iFramework.Fs(), - iObjectInfo->DesC( CMTPObjectMetaData::ESuid ), - timeStr ); + MmMtpDpUtility::GetObjectDateModifiedL( iFramework.Fs(), suid, timeStr ); PRINT1( _L( "MM MTP <> CGetObjectPropValue::ServiceL Date time %S" ), &timeStr ); iMTPTypeString = CMTPTypeString::NewL( timeStr );