122 KDriveC), |
122 KDriveC), |
123 iVendorLocalizedName(new std::wstring(aSis.GetVendorLocalName())),iConfigManager(aConfigManager) |
123 iVendorLocalizedName(new std::wstring(aSis.GetVendorLocalName())),iConfigManager(aConfigManager) |
124 { |
124 { |
125 for( InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
125 for( InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
126 { |
126 { |
127 InstallableFile* installableFile= *curr; |
127 InstallableFile* installableFile= *curr; |
|
128 TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0); |
128 #ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
129 #ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
129 FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget()); |
130 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, aTargetDrive, installableFile->GetTarget()); |
130 #else |
131 #else |
131 FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
132 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, aTargetDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
132 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
133 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
133 iFileDescriptions.push_back(f); |
134 iFileDescriptions.push_back(f); |
134 } |
135 } |
135 |
136 |
136 iTrustStatus = new TrustStatus(); |
137 iTrustStatus = new TrustStatus(); |
731 void SisRegistryObject::AddFiles(const InstallableFiles& aFiles) |
732 void SisRegistryObject::AddFiles(const InstallableFiles& aFiles) |
732 { |
733 { |
733 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
734 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
734 { |
735 { |
735 InstallableFile* installableFile= *curr; |
736 InstallableFile* installableFile= *curr; |
736 TUint32 sid = installableFile->Sid(); |
737 TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0); |
737 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
738 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
738 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
739 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
739 #else |
740 #else |
740 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget()); |
741 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget()); |
741 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
742 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
756 { |
757 { |
757 // Check the new files to determine which files we need to remove prior to installing them |
758 // Check the new files to determine which files we need to remove prior to installing them |
758 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
759 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
759 { |
760 { |
760 InstallableFile* installableFile= *curr; |
761 InstallableFile* installableFile= *curr; |
761 TUint32 sid = installableFile->Sid(); |
762 TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0); |
762 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
763 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
763 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |
764 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |
764 iSelectedDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
765 iSelectedDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
765 #else |
766 #else |
766 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |
767 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |