# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1276064891 -10800 # Node ID 18e505e3f3708563cc7ce43b499d6ce00b9174ca # Parent efe289f793e7b6ed75402e09cd262248a532ab51 Revision: 201021 Kit: 2010123 diff -r efe289f793e7 -r 18e505e3f370 filemanager/App/src/CFileManagerAppUi.cpp --- a/filemanager/App/src/CFileManagerAppUi.cpp Tue May 25 12:28:34 2010 +0300 +++ b/filemanager/App/src/CFileManagerAppUi.cpp Wed Jun 09 09:28:11 2010 +0300 @@ -1227,6 +1227,7 @@ CleanupStack::Pop( view ); } ActivateLocalViewL( aViewId, aCustomMessageId, aCustomMessage ); + iActiveView = aViewId; } // ------------------------------------------------------------------------------ diff -r efe289f793e7 -r 18e505e3f370 filemanager/Engine/data/FileManagerEngine.rss --- a/filemanager/Engine/data/FileManagerEngine.rss Tue May 25 12:28:34 2010 +0300 +++ b/filemanager/Engine/data/FileManagerEngine.rss Wed Jun 09 09:28:11 2010 +0300 @@ -435,7 +435,7 @@ 0x101f84eb, // FileManager 0x10005907, // Notepad (EBUCatUserFiles) 0x1028246F, // Java Backup process - 0x10282475, // Java Registry process + 0x200211DC, // Java Captain process 0x102033E6 // MIDP2 Runtime process }; }, @@ -520,7 +520,7 @@ 0x101f84eb, // FileManager 0x10005907, // Notepad 0x1028246F, // Java Backup process - 0x10282475, // Java Registry process + 0x200211DC, // Java Captain process 0x102033E6 // MIDP2 Runtime process }; exclude_uids= diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/data/mseng.rss --- a/filesystemuis/memscaneng/data/mseng.rss Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/data/mseng.rss Wed Jun 09 09:28:11 2010 +0300 @@ -108,7 +108,7 @@ EXTRADATAFILE { datagroup=EGroupContacts; - filepath="?:\\private\\10003a73\\Contacts.cdb"; + filepath="?:\\private\\10003a73\\SQLite__Contacts.cdb"; } }; } @@ -148,7 +148,7 @@ SPECIAL_DATADIR { datagroup=EGroupMidpJava; - path="?:\\private\\102033E6\\MIDlets\\"; + path="?:\\private\\102033E6\\apps\\"; // Note: Midlets outside private dirs are scanned by extensions excludeddatafiles= { @@ -197,7 +197,7 @@ SPECIAL_DATADIR { datagroup=EGroupMidpJava; - path="?:\\private\\102033E6\\MIDlets\\"; + path="?:\\private\\102033E6\\apps\\"; // Note: Midlets outside private dirs are scanned by extensions excludeddatafiles= { diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serverinc/msenginfoarray.h --- a/filesystemuis/memscaneng/serverinc/msenginfoarray.h Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serverinc/msenginfoarray.h Wed Jun 09 09:28:11 2010 +0300 @@ -120,21 +120,21 @@ * @param aUid The file UID type in question * @param aSize Size of the file */ - inline void AddSizeByUidL(TInt aUid, TInt aSize); + inline void AddSizeByUidL(TInt aUid, TInt64 aSize); /** * Add new file size to the result array. * @param aExt Filename extension type in question * @param aSize Size of the file */ - inline void AddSizeByExtL(TInt aExt, TInt aSize); + inline void AddSizeByExtL(TInt aExt, TInt64 aSize); /** * Add scan result af a specific data group. * @param aGroupIndex Data group in question * @param aSize Size of the file */ - inline void AddSizeByGroupL(TInt aGroupIndex, TInt aSize); + inline void AddSizeByGroupL(TInt aGroupIndex, TInt64 aSize); /** * Query if the directory is in the list of directories to be diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serverinc/msenginfoarray.inl --- a/filesystemuis/memscaneng/serverinc/msenginfoarray.inl Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serverinc/msenginfoarray.inl Wed Jun 09 09:28:11 2010 +0300 @@ -67,19 +67,19 @@ return iCurrentScannedDrive; } -inline void CMsengInfoArray::AddSizeByUidL(TInt aUid, TInt aSize) +inline void CMsengInfoArray::AddSizeByUidL(TInt aUid, TInt64 aSize) { // The array must have been initialized to contain zeros! (*iUidResultArray)[aUid] += aSize; } -inline void CMsengInfoArray::AddSizeByExtL(TInt aExt, TInt aSize) +inline void CMsengInfoArray::AddSizeByExtL(TInt aExt, TInt64 aSize) { // The array must have been initialized to contain zeros! (*iExtResultArray)[aExt] += aSize; } -inline void CMsengInfoArray::AddSizeByGroupL(TInt aGroupIndex, TInt aSize) +inline void CMsengInfoArray::AddSizeByGroupL(TInt aGroupIndex, TInt64 aSize) { // The array must have been initialized to contain zeros! (*iGroupResultArray)[aGroupIndex] += aSize; diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serverinc/msengscannerbase.h --- a/filesystemuis/memscaneng/serverinc/msengscannerbase.h Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serverinc/msengscannerbase.h Wed Jun 09 09:28:11 2010 +0300 @@ -82,14 +82,14 @@ * @param aUid The UID type. * @param aSize The size of the file with this UID. */ - inline void AddSizeByUidL(TUidTypes aUid, TInt aSize); + inline void AddSizeByUidL(TUidTypes aUid, TInt64 aSize); /** * Add new value in bytes to the amount of data found with this UID. * @param aUid The UID type. * @param aSize The size of the file with this UID. */ - inline void AddSizeByExtL(TExtTypes aExt, TInt aSize); + inline void AddSizeByExtL(TExtTypes aExt, TInt64 aSize); /** * Query if the directory is in the list of directories to be diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serverinc/msengscannerbase.inl --- a/filesystemuis/memscaneng/serverinc/msengscannerbase.inl Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serverinc/msengscannerbase.inl Wed Jun 09 09:28:11 2010 +0300 @@ -17,12 +17,12 @@ */ -inline void CMsengScannerBase::AddSizeByUidL(TUidTypes aUid, TInt aSize) +inline void CMsengScannerBase::AddSizeByUidL(TUidTypes aUid, TInt64 aSize) { iInfoArray.AddSizeByUidL(aUid, aSize); } -inline void CMsengScannerBase::AddSizeByExtL(TExtTypes aExt, TInt aSize) +inline void CMsengScannerBase::AddSizeByExtL(TExtTypes aExt, TInt64 aSize) { iInfoArray.AddSizeByExtL(aExt, aSize); } diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serversrc/mseng.cpp --- a/filesystemuis/memscaneng/serversrc/mseng.cpp Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serversrc/mseng.cpp Wed Jun 09 09:28:11 2010 +0300 @@ -92,7 +92,7 @@ User::LeaveIfError( iFsSession.Entry( fileName, entry ) ); // if file does not exist, leaves with KErrNotFound - iResFile = CResourceFile::NewL( iFsSession, fileName, 0, entry.iSize ); + iResFile = CResourceFile::NewL( iFsSession, fileName, 0, entry.FileSize() ); iResFile->ConfirmSignatureL(); diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serversrc/msengfileextscanner.cpp --- a/filesystemuis/memscaneng/serversrc/msengfileextscanner.cpp Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serversrc/msengfileextscanner.cpp Wed Jun 09 09:28:11 2010 +0300 @@ -166,7 +166,7 @@ if( addSize ) { // Add size of object - InfoArray().AddSizeByExtL(iCurrentExtensionIndex, aEntry.iSize); + InfoArray().AddSizeByExtL(iCurrentExtensionIndex, aEntry.FileSize() ); #ifdef __SHOW_RDEBUG_PRINT_ const TInt pathlength = aFullFileNameAndPath.Length(); @@ -174,12 +174,12 @@ if ( pathlength < KMaxFileName ) { RDebug::Print(_L("File: %S, extension number: %d, size: %d"), - &aFullFileNameAndPath, iCurrentExtensionIndex, aEntry.iSize); + &aFullFileNameAndPath, iCurrentExtensionIndex, aEntry.FileSize()); } else { RDebug::Print(_L("File: see next line, extension number: %d, size: %d"), - iCurrentExtensionIndex, aEntry.iSize ); + iCurrentExtensionIndex, aEntry.FileSize() ); RDebug::Print(_L("Can not print %d characters long file name"), pathlength ); } #endif // __SHOW_RDEBUG_PRINT_ @@ -198,7 +198,7 @@ // Make sure other than native applications are not calculated if( iCurrentExtensionIndex == EExtSis || iCurrentExtensionIndex == EExtSisx ) { - InfoArray().AddSizeByExtL(iCurrentExtensionIndex, aEntry.iSize); + InfoArray().AddSizeByExtL(iCurrentExtensionIndex, aEntry.FileSize() ); } } diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serversrc/msengfindallscanner.cpp --- a/filesystemuis/memscaneng/serversrc/msengfindallscanner.cpp Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serversrc/msengfindallscanner.cpp Wed Jun 09 09:28:11 2010 +0300 @@ -147,7 +147,7 @@ if(InfoArray().DataDirGroups().Count()) { TInt group = InfoArray().DataDirGroups().At(i); - InfoArray().AddSizeByGroupL(group, aEntry.iSize); + InfoArray().AddSizeByGroupL(group, aEntry.FileSize()); TRACES ( diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serversrc/msengregistryscanner.cpp --- a/filesystemuis/memscaneng/serversrc/msengregistryscanner.cpp Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serversrc/msengregistryscanner.cpp Wed Jun 09 09:28:11 2010 +0300 @@ -139,7 +139,7 @@ RPointerArray augmentations; - TInt totalSize(0); + TInt64 totalSize(0); for ( TInt index(0); index < uids.Count(); index++ ) { @@ -150,7 +150,7 @@ //All packages are from installed packages CMsengSisxInfo* appObj = CMsengSisxInfo::NewL( entry, iDrive ); CleanupStack::PushL( appObj ); - TInt baseSize( 0 ); + TInt64 baseSize( 0 ); baseSize = entry.SizeL(); TRACES diff -r efe289f793e7 -r 18e505e3f370 filesystemuis/memscaneng/serversrc/msengscanner.cpp --- a/filesystemuis/memscaneng/serversrc/msengscanner.cpp Tue May 25 12:28:34 2010 +0300 +++ b/filesystemuis/memscaneng/serversrc/msengscanner.cpp Wed Jun 09 09:28:11 2010 +0300 @@ -218,7 +218,7 @@ TInt err = aFsSession.Entry(ptrName, file); if (err == KErrNone) { - TInt size = file.iSize; + TInt64 size = file.FileSize(); iScanArray->AddSizeByGroupL(groupindex, size); }