FCL/sf/mw/remoteconn: comparison mtpdataproviders/mtpimagedp/src/cmtpimagedpsendobjectinfo.cpp

equal deleted inserted replaced

-:6e82ae192c3a
+:3ae5cb0b4c02
 @internalTechnology
 */
 #include <f32file.h>
 #include <bautils.h>
+#include <e32const.h>
 #include <mtp/mmtpdataproviderframework.h>
 #include <mtp/cmtpobjectmetadata.h>
 #include <mtp/cmtptypefile.h>
 if (iStorageId == KMTPStorageDefault)
 {
 iStorageId = iFramework.StorageMgr().DefaultStorageId();
 }
+if(IsTooLarge(iObjectSize))
+{
+*ret = EMTPRespCodeObjectTooLarge;
+}
 }
 __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckObjectPropListParamsL - Exit"));
 return (*ret == EMTPRespCodeOK) ? ETrue : EFalse;
 }
 }
 if (result)
 {
 iObjectSize = iObjectInfo->Uint32L(CMTPTypeObjectInfo::EObjectCompressedSize);
+if(IsTooLarge(iObjectSize))
+{
+SendResponseL(EMTPRespCodeObjectTooLarge);
+result = EFalse;
+}
 }
 if (result)
 {
 iProtectionStatus = iObjectInfo->Uint16L(CMTPTypeObjectInfo::EProtectionStatus);
 */
 TBool CMTPImageDpSendObjectInfo::DoHandleSendObjectCompleteL(TAny* /*aPtr*/)
 {
 __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleSendObjectCompleteL - Entry"));
 TBool result(ETrue);
+delete iFileReceived;
+iFileReceived = NULL;
 #ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
 TInt64 objectsize = 0;
 #else
 TInt objectsize = 0;
 #endif
-iFileReceived->File().Size(objectsize);
+TEntry entry;
+User::LeaveIfError(iFramework.Fs().Entry(iFullPath, entry));
+objectsize = entry.FileSize();
 if (objectsize != iObjectSize)
 {
 __FLOG_VA((_L8("object sizes differ %lu != %lu"), objectsize, iObjectSize));
 iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection);
 Rollback();
 else if (result && !iCancelled)
 	    {
 if (iProtectionStatus ==  EMTPProtectionNoProtection ||
 iProtectionStatus == EMTPProtectionReadOnly)
 {
-TUint attValue = 0;
+entry.iAtt &= ~(KEntryAttNormal | KEntryAttReadOnly);
-User::LeaveIfError(iFileReceived->File().Att(attValue));
-attValue &= ~(KEntryAttNormal | KEntryAttReadOnly);
 if (iProtectionStatus == EMTPProtectionNoProtection)
 {
-attValue |= KEntryAttNormal;
+entry.iAtt |= KEntryAttNormal;
 }
 else
 {
-attValue |= KEntryAttReadOnly;
+entry.iAtt |= KEntryAttReadOnly;
 }
-User::LeaveIfError(iFileReceived->File().SetAtt(attValue, ~attValue));
+User::LeaveIfError(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt));
 }
 TTime modifiedTime;
 //update datemodified property.
 if(iDateMod != NULL && iDateMod->Length())
 {
 iObjectPropertyMgr.ConvertMTPTimeStr2TTimeL(*iDateMod, modifiedTime);
-User::LeaveIfError(iFileReceived->File().SetModified(modifiedTime));
 }
 else if(iDateCreated != NULL && iDateCreated->Length())
 {
 iObjectPropertyMgr.ConvertMTPTimeStr2TTimeL(*iDateCreated, modifiedTime);
-User::LeaveIfError(iFileReceived->File().SetModified(modifiedTime));
 }
+User::LeaveIfError(iFramework.Fs().SetModified(iFullPath, modifiedTime));
-	     iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection);
+iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection);
 //The MTP spec states that it is not mandatory for SendObjectInfo/SendObjectPropList
 //to be followed by a SendObject.  An object is reserved in the ObjectStore on
 //receiving a SendObjectInfo/SendObjectPropList request, but we only commit it
 //on receiving the corresponding SendObject request.  With Associations however
 //we commit the object straight away as the SendObject phase is often absent
 //with folder creation.
 CleanUndoList();
 SendResponseL(EMTPRespCodeOK);
 	    }
-delete iFileReceived;
-iFileReceived = NULL;
 iSuccessful = result;
 __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleSendObjectCompleteL - Exit"));
 return result;
 }
 /**
 * remove all cached properties if rollback occured.
 */
 TRAP_IGNORE(
 iFramework.ObjectMgr().RemoveObjectL(iReceivedObject->Uint(CMTPObjectMetaData::EHandle));
-iObjectPropertyMgr.ClearCacheL();
+iObjectPropertyMgr.ClearCache(iReceivedObject->Uint(CMTPObjectMetaData::EHandle));
 );
 }
 void CMTPImageDpSendObjectInfo::ReturnResponseL()
 {
 break;
 }
 return resp;
 }
+/**
+Check if the object is too large
+@return ETrue if yes, otherwise EFalse
+*/
+TBool CMTPImageDpSendObjectInfo::IsTooLarge(TUint64 aObjectSize) const
+{
+__FLOG(_L8("IsTooLarge - Entry"));
+TBool ret(aObjectSize > KMaxTInt64);
+if(!ret)
+{
+TBuf<255> fsname;
+TUint32 storageId = iStorageId;
+if (storageId == KMTPStorageDefault)
+{
+storageId = iFramework.StorageMgr().DefaultStorageId();
+}
+TInt drive( iFramework.StorageMgr().DriveNumber(storageId) );
+if(drive != KErrNotFound)
+{
+iFramework.Fs().FileSystemSubType(drive, fsname);
+const TUint64 KMaxFatFileSize = 0xFFFFFFFF; //Maximal file size supported by all FAT filesystems (4GB-1)
+_LIT(KFsFAT16, "FAT16");
+_LIT(KFsFAT32, "FAT32");
+if((fsname.CompareF(KFsFAT16) == 0 || fsname.CompareF(KFsFAT32) == 0) && aObjectSize > KMaxFatFileSize)
+{
+ret = ETrue;
+}
+}
+}
+__FLOG_VA((_L8("Result = %d"), ret));
+__FLOG(_L8("IsTooLarge - Exit"));
+return ret;
+}

changeset 29	3ae5cb0b4c02
parent 18	1b39655331a3
child 31	a26669f87b46