MCL/sf/mw/web: comparison webengine/widgetregistry/Server/src/WidgetRegistry.cpp

equal deleted inserted replaced

-:220a17280356
+:1f3c3f2f5b0a
 "a:\\private\\10282822\\" );
 _LIT( KWidgetEntryStoreBinaryFile,
 "a:\\private\\10282f06\\WidgetEntryStore.dat" );
 _LIT( KWidgetEntryStoreXmlFile,
 "a:\\private\\10282f06\\WidgetEntryStore.xml" );
+_LIT( KCWRTWidgetEntryStoreXmlFile,
+"c:\\private\\10282f06\\CWRTWidgetEntryStore.xml" );
 _LIT( KWidgetEntryStoreXmlTempFile,
 "a:\\private\\10282f06\\WidgetEntryStoreTemp.xml" );
 _LIT( KWidgetDirFile, "widget_lproj.xml" );
 _LIT( KWidgetAccessPolicy, "WidgetAccessPolicy.xml" );
 _LIT( KWidgetPolicyIdFile, "WidgetPolicyId.dat" );
 CWidgetRegistry::CWidgetRegistry( RFs& aFs ):
 iFs( aFs ),
 iWidgetInstallPath( KWidgetInstallPath ),
 iRegistryBinaryFileName( KWidgetEntryStoreBinaryFile ),
 iRegistryXmlFileName( KWidgetEntryStoreXmlFile ),
+iRegistryCWRTXmlFileName( KCWRTWidgetEntryStoreXmlFile ),
 iRegistryXmlTempFileName( KWidgetEntryStoreXmlTempFile ),
 iPolicyId( 0 )
 {
 }
 CleanupStack::PopAndDestroy( secMgr );
 }
 }
 }
 #else
-	iPolicyId = KErrNotSupported;
+iPolicyId = KErrNotSupported;
 #endif
 return iPolicyId;
 }
 // ============================================================================
 // But once widgets are installed, they are assigned a unique
 // UID.  For UID allocation purposes, it is important that
 // UIDs already known to app arch be reserved.
 for ( TInt i = 0; i < appArchList.Count(); i++ )
 {
-if ( KErrNone != iUsedUids.Append( (appArchList)[i] ) )
+// Do not maintain the list of used CWRT widget UIDs
-{
+if ( !TUidAllocator::IsCWRTWidget((appArchList)[i]) )
-// no recovery possible
+{
-doConsistency = EFalse;
+if ( KErrNone != iUsedUids.Append( (appArchList)[i] ) )
-break;
+{
+// no recovery possible
+doConsistency = EFalse;
+break;
+}
 }
 }
 }
 LOG2( " iUsedUids %d and doConsistency %d",
 (TInt)(iUsedUids.Count()), (TInt)doConsistency );
 if ( KErrNone != error )
 {
 // on error use english
 iLprojName = _L("en");
 }
+// Internalize the CWRT widgets, without consistency checking
+// No multi-drive support for CWRT
+TDriveUnit driveUnit(EDriveC);
+CDir* installedListForDrive = NULL;
+RArray<TInt> installedListForDriveFlags;
+TRAP_IGNORE(  // consistency checking doesn't apply to CWRT
+InternalizeXmlL( iRegistryCWRTXmlFileName,
+driveUnit,
+EFalse,
+appArchList,
+appArchListFlags,
+installedListForDrive,
+installedListForDriveFlags,
+dirtyFlag ) );
+delete installedListForDrive;
+installedListForDriveFlags.Close();
 // List all drives in the system
 TDriveList driveList;
 User::LeaveIfError( iFs.DriveList(driveList) );
 dirtyFlag );
 }
 delete installedListForDrive;
 installedListForDriveFlags.Close();
 } // for
+// appArchList will not contain CWRT widgets, so
+// consistency checking will not apply to them
 if ( doConsistency )
 {
 AppArchListConsistency( appArchList, appArchListFlags );
 }
 CleanupStack::PopAndDestroy( 2, &appArchList );//appArchListFlags, appArchList
 aDirtyFlag = dirtyFlag;
 // Reset and Destroy entries in iOldEntries array
 iOldEntries.ResetAndDestroy();
 // in order to have a list of all entries for a particular drive,
 // create a hash map from the entries with the key as drive name
 // and value as an array of entry indices for that drive
 RPtrHashMap< TInt, CArrayFixFlat<TInt> > driveEntryHashMap;
 CleanupClosePushL( driveEntryHashMap );
+CArrayFixFlat<TInt>* cwrtWidgetArray = new (ELeave) CArrayFixFlat<TInt>(1);
+CleanupStack::PushL( cwrtWidgetArray );
 for (TInt i = 0 ;i < iEntries.Count(); i++)
 {
 CWidgetEntry* entry = iEntries[i];
+// Bypass if the widget is a CWRT widget, they're externalized
+// independently
+if (TUidAllocator::IsCWRTWidget(TUid::Uid((*entry)[EUid]))) {
+cwrtWidgetArray->AppendL(i);
+continue;
+}
 const TDesC& driveName = (*entry)[EDriveName];
 TDriveUnit driveUnit( driveName );
 CArrayFixFlat<TInt>* array =
 driveEntryHashMap.Find( driveUnit );
 if( !array )
 {
 BaflUtils::DeleteFile( iFs, iRegistryXmlTempFileName );
 }
 }
 }
+TDriveUnit driveUnit( EDriveC );
+iRegistryXmlTempFileName[0] = driveUnit.Name()[0];
+iFs.CreatePrivatePath( driveUnit );
+// a transactional file update to protect against
+// disk full, etc: overwrite temp then rename temp to original
+TRAPD( error,
+ExternalizeXmlL( iRegistryXmlTempFileName, cwrtWidgetArray ) );
+if ( KErrNone == error )
+{
+// last steps in transactional update
+BaflUtils::DeleteFile( iFs, iRegistryCWRTXmlFileName );
+BaflUtils::RenameFile( iFs,
+iRegistryXmlTempFileName,
+iRegistryCWRTXmlFileName );
+}
+else  // handle leave by deleting temp file
+{
+BaflUtils::DeleteFile( iFs, iRegistryXmlTempFileName );
+}
 for ( TInt i = 0; i < driveEntryHashMap.Count(); i++ )
 {
 CleanupStack::Pop();
 }
+CleanupStack::PopAndDestroy( cwrtWidgetArray );
 CleanupStack::Pop( &driveEntryHashMap );
 driveEntryHashMap.ResetAndDestroy();
 driveEntryHashMap.Close();
 }
 do
 {
 error = iAppArch.GetNextApp( info );
 if ( KErrNone == error )
 {
-if ( TUidAllocator::IsWidget( info.iUid ) )
+if ( TUidAllocator::IsWidget( info.iUid ) &&
+!TUidAllocator::IsCWRTWidget( info.iUid ) )
 {
 LOG2( " widget uid 0x%x (%d)",
 (TUint)(info.iUid.iUid), info.iUid.iUid );
 error = aUids.Append( info.iUid );
 if ( KErrNone !=  error )
 } while ( RApaLsSession::ENoMoreAppsInList != error );
 if ( RApaLsSession::ENoMoreAppsInList != error )
 {
 aUids.Reset();
 }
-	else
+else
-		{
+{
-		error = KErrNone;
+error = KErrNone;
-		}
+}
 LOG_CODE( if ( aUids.Count() ) )
 LOG1( "AppArchWidgetUids done widget count %d",
 aUids.Count() );
 LOG_CODE( else )
 LOG( "AppArchWidgetUids done error NULL list" );
 TRAP_IGNORE( iInstaller->DeregisterWidgetL( aAppArchList[i] ) );
 }
 }
 LOG( "AppArchListConsistency done" );
 }
 // End of File

branch	RCL_3
changeset 35	1f3c3f2f5b0a
parent 34	220a17280356
child 47	e1bea15f9a39