FCL/sf/mw/appinstall: comparison installationservices/swi/source/swis/server/installationplanner.cpp

equal deleted inserted replaced

-:d17dc5398051
+:92f864ef0288
 HBufC* targetFileName;
 targetFileName = listOfFilesToBeAdded[i]->Target().Alloc();
 CleanupStack::PushL(targetFileName);
 TParsePtrC filename(*targetFileName);
 TBool isApparcFile = EFalse;
-TBuf<10> extension = TParsePtrC(*targetFileName).Ext();
+HBufC* extension = TParsePtrC(*targetFileName).Ext().AllocLC();
-if(!extension.Compare(KApparcRegistrationFileExtn)) // for resource files *_reg.rsc or *.rsc
+if(!extension->Compare(KApparcRegistrationFileExtn)) // for resource files *_reg.rsc or *.rsc
 {
 isApparcFile = ETrue;
 }
 else
 {
-TInt extnLength = extension.Length();
+TInt extnLength = extension->Length();
 HBufC* extn;
 if(extnLength == 4)                            //for localizable resource files with extn like .r01
 {
-extn = extension.Right(2).AllocLC();
+extn = extension->Right(2).AllocLC();
 }
 else if(extnLength == 5)
 {
-extn = extension.Right(3).AllocLC();       //for localizable resource files with extn like .r101
+extn = extension->Right(3).AllocLC();       //for localizable resource files with extn like .r101
 }
 else
 {
-CleanupStack::PopAndDestroy(targetFileName);
+CleanupStack::PopAndDestroy(2, targetFileName);  //extension
 continue;
 }
 //Check to find if the extension is of valid localizable resource files
 TInt value = 0;
 if(isApparcFile)
 {
 listOfFilesToBeExtracted.AppendL(listOfFilesToBeAdded[i]);
 totalApplicationDataSize += listOfFilesToBeAdded[i]->UncompressedLength();
 }
-CleanupStack::PopAndDestroy(targetFileName);
+CleanupStack::PopAndDestroy(2, targetFileName);  //extension
 }
 //Here we do extraction of rsc files ,before extracting files we check if there is an enough space on the disk(C drive)
 //to extract the files then extract the file to a temporary location and
 //check if it is a registration resource file(using target path) then store it into an array.
 {
 User::Leave(err);
 }
 CleanupStack::PushL(appData);
 TUid appuid = appData->AppUid();
-HBufC* appname = appData->AppFile().AllocLC();
+HBufC* finalAppName = TParsePtrC(appData->AppFile()).NameAndExt().AllocLC();
-TBuf<100> finalAppName = TParsePtrC(*appname).NameAndExt();
 const RPointerArray<Usif::CLocalizableAppInfo> aLocalizableAppInfoList = appData->LocalizableAppInfoList();
 HBufC* groupName = NULL;
 HBufC* iconFileName = NULL;
 TInt fileSize = 0 ;
 {
 groupName = appData->GroupName().AllocLC();
 DEBUG_PRINTF2(_L("Application Group Name %S"), groupName);
 }
 //Since locale does not exists no need to extract, create CNativeApplicationInfo without iconFileName
-applicationInfo = Swi::CNativeComponentInfo::CNativeApplicationInfo::NewLC(appuid, finalAppName, groupName?*groupName:_L(""), _L(""));
+applicationInfo = Swi::CNativeComponentInfo::CNativeApplicationInfo::NewLC(appuid, *finalAppName, groupName?*groupName:_L(""), _L(""));
 }
 else
 {
 Usif::CLocalizableAppInfo* localizedInfo = NULL;
 const Usif::CCaptionAndIconInfo* captionAndIconInfo = NULL;
 {
 if(captionAndIconInfo->IconFileName().Length())
 iconFileName = captionAndIconInfo->IconFileName().AllocLC();
 if(iconFileName != NULL)
 {
-TBuf<100> finalIconFileName;
+HBufC* finalIconFileName = TParsePtrC(*iconFileName).NameAndExt().AllocLC();
-finalIconFileName = TParsePtrC(*iconFileName).NameAndExt();
 _LIT(KIconFileNameFmt, "%c:\\resource\\install\\icon\\0x%08x\\%S");     // Applicaiton Uid
 iconFile.Format(KIconFileNameFmt, TUint(systemDrive), appuid.iUid,
-&finalIconFileName);
+finalIconFileName);
 TInt err = fs.MkDirAll(iconFile);
 if (err!= KErrNone && err != KErrAlreadyExists)
 User::LeaveIfError(err);
 //Find from the list of files to be copied , the file description of the icon file returned by the parser
 for(TInt k = 0; k < listOfFilesToBeAdded.Count() ; k++)
 {
 currentFileDescription = listOfFilesToBeAdded[k];
-if(TParsePtrC(currentFileDescription->Target()).NameAndExt().Compare(finalIconFileName))
+if(TParsePtrC(currentFileDescription->Target()).NameAndExt().Compare(*finalIconFileName))
 {
 break;
 }
 }
 //Check if there is enough space to extract the icon file
 DEBUG_PRINTF2(_L("Icon file to be extraced is %S"), &iconFile);
 User::LeaveIfError(iSisHelper.ExtractFileL(fs, tempIconFile, listOfFilesToBeAdded[i]->Index(), application->AbsoluteDataIndex(), UiHandler()));
 DEBUG_PRINTF(_L8("Finished extracting Icon file successfuly"));
 //After copy the available disk space is reduced
 currentAvailableDriveSpace -= fileSize;
-CleanupStack::PopAndDestroy(2,iconFileName);  //file,iconFileSize
+CleanupStack::PopAndDestroy(3,iconFileName);  //file,finalIconFileName,iconFileSize
 //Create CNativeApplicationInfo with iconFileName
-applicationInfo = Swi::CNativeComponentInfo::CNativeApplicationInfo::NewLC(appuid, finalAppName, groupName?*groupName:_L(""), iconFile);
+applicationInfo = Swi::CNativeComponentInfo::CNativeApplicationInfo::NewLC(appuid, *finalAppName, groupName?*groupName:_L(""), iconFile);
 }
 else
 {
 //Since iconFileName does not exists no need to extract, create CNativeApplicationInfo without iconName
-applicationInfo = Swi::CNativeComponentInfo::CNativeApplicationInfo::NewLC(appuid, finalAppName, groupName?*groupName:_L(""), _L(""));
+applicationInfo = Swi::CNativeComponentInfo::CNativeApplicationInfo::NewLC(appuid, *finalAppName, groupName?*groupName:_L(""), _L(""));
 }
 }
 }
 DEBUG_PRINTF2(_L("Application Uid 0x%08x"), appuid);
-DEBUG_PRINTF2(_L("Application Name %S"), appname);
+DEBUG_PRINTF2(_L("Application Name %S"), finalAppName);
 if(groupName)
 DEBUG_PRINTF2(_L("Application Group Name %S"), groupName);
 if(iconFile.Length())
 DEBUG_PRINTF2(_L("Application Icon File Name %S"), &iconFile);
 const_cast <Sis::CController&>(aController).AddApplicationInfoL(applicationInfo);
 CleanupStack::Pop(applicationInfo);
 if(groupName)
-CleanupStack::PopAndDestroy(3, appData);	//groupName,appName,appData
+CleanupStack::PopAndDestroy(3, appData);	//groupName,finalAppName,appData
 else
-CleanupStack::PopAndDestroy(2, appData);    //appName,appData
+CleanupStack::PopAndDestroy(2, appData);    //finalAppName,appData
 languages.Close();
 }
 CleanupStack::PopAndDestroy(3,&drives);  //fs,driveSpaces,drives
 CleanupStack::Pop(&listOfFilesToBeExtracted);

changeset 52	92f864ef0288
parent 42	d17dc5398051
child 75	2d2d25361590