diff -r d45095c2f4f3 -r bee149131e4b mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp Tue Feb 02 00:27:58 2010 +0200 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp Fri Feb 19 23:18:32 2010 +0200 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: * */ @@ -54,7 +54,7 @@ iHandles( KMTPRequestCheckerHandleGranularity ), iObjectArray( KMTPRequestCheckerHandleGranularity ) { - + // Do nothing } // ----------------------------------------------------------------------------- @@ -64,7 +64,7 @@ // void CRequestChecker::ConstructL() { - + // Do nothing } // ----------------------------------------------------------------------------- @@ -84,8 +84,8 @@ // ----------------------------------------------------------------------------- // TMTPResponseCode CRequestChecker::VerifyRequestL( const TMTPTypeRequest& aRequest, - TInt aCount, - const TMTPRequestElementInfo* aElementInfo ) + TInt aCount, + const TMTPRequestElementInfo* aElementInfo ) { TMTPResponseCode result = EMTPRespCodeOK; iHandles.Close(); @@ -96,9 +96,11 @@ for ( TInt i = 0; i < aCount && EMTPRespCodeOK == result; i++ ) { TUint32 parameter = aRequest.Uint32( aElementInfo[i].iElementIndex ); - PRINT3( _L( "MM MTP <> CRequestChecker parameter %d/%d = %d" ), - i + 1, aCount, parameter ); - + PRINT3( _L( "MM MTP <> CRequestChecker parameter %d/%d = %d" ), + i + 1, + aCount, + parameter ); + if ( !IsSpecialValue( parameter, aElementInfo[i] ) ) { switch ( aElementInfo[i].iElementType ) @@ -198,7 +200,7 @@ ret = EMTPRespCodeSessionNotOpen; } } - + return ret; } @@ -224,7 +226,7 @@ { ret = EMTPRespCodeInvalidParameter; } - + return ret; } @@ -252,7 +254,7 @@ const TDesC& suid( object->DesC( CMTPObjectMetaData::ESuid ) ); TEntry entry; TInt err = iFramework.Fs().Entry( suid, entry ); - + if ( object->Uint( CMTPObjectMetaData::EFormatCode ) == EMTPFormatCodeAssociation ) // && ( object->Uint( CMTPObjectMetaData::EFormatSubCode ) == EMTPAssociationTypeGenericFolder ) ) { @@ -262,7 +264,7 @@ else { User::LeaveIfError( err ); - + if ( iFramework.ObjectMgr().ObjectOwnerId( aHandle ) != iFramework.DataProviderId() ) { PRINT( _L(" ewrwe ret = EMTPRespCodeInvalidObjectHandle;")); @@ -306,7 +308,7 @@ ret = EMTPRespCodeInvalidObjectHandle; } PRINT1( _L( "MM MTP <= CRequestChecker::VerifyObjectHandleL ret = 0x%x" ), ret ); - + return ret; } @@ -357,7 +359,7 @@ } } } - + return ret; } @@ -395,7 +397,7 @@ } PRINT1( _L( "MM MTP => CRequestChecker::VerifyFormatCode ret = 0x%x" ), ret ); - + return ret; } @@ -413,16 +415,16 @@ case 1: result = ( aParameter == aElementInfo.iValue1 ); break; - + case 2: result = ( aParameter == aElementInfo.iValue1 || aParameter == aElementInfo.iValue2 ); break; - + default: break; } - + return result; }