equal
deleted
inserted
replaced
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 FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget()); |
128 TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0); |
|
129 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, aTargetDrive, installableFile->GetTarget()); |
129 iFileDescriptions.push_back(f); |
130 iFileDescriptions.push_back(f); |
130 } |
131 } |
131 |
132 |
132 iTrustStatus = new TrustStatus(); |
133 iTrustStatus = new TrustStatus(); |
133 TUint64 x = 0; |
134 TUint64 x = 0; |
399 { |
400 { |
400 iVendorLocalizedName = new std::wstring(aSisController.SISInfo().VendorName(0)); |
401 iVendorLocalizedName = new std::wstring(aSisController.SISInfo().VendorName(0)); |
401 } |
402 } |
402 else |
403 else |
403 { |
404 { |
|
405 std::string x; |
404 std::string error = "can not retrieve localized vendor name"; |
406 std::string error = "can not retrieve localized vendor name"; |
405 std::string x = wstring2string((std::wstring)packageName); |
407 throw InvalidSis(Ucs2ToUtf8((std::wstring)packageName,x), error, INVALID_SIS); |
406 throw InvalidSis(x, error, INVALID_SIS); |
|
407 } |
408 } |
408 |
409 |
409 // Signed by SU cert |
410 // Signed by SU cert |
410 iSignedBySuCert = false; |
411 iSignedBySuCert = false; |
411 |
412 |
721 void SisRegistryObject::AddFiles(const InstallableFiles& aFiles) |
722 void SisRegistryObject::AddFiles(const InstallableFiles& aFiles) |
722 { |
723 { |
723 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
724 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
724 { |
725 { |
725 InstallableFile* installableFile= *curr; |
726 InstallableFile* installableFile= *curr; |
726 TUint32 sid = installableFile->Sid(); |
727 TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0); |
727 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget()); |
728 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget()); |
728 iFileDescriptions.push_back(f); |
729 iFileDescriptions.push_back(f); |
729 |
730 |
730 // If the SID is there already there is no reason to add it again |
731 // If the SID is there already there is no reason to add it again |
731 if (installableFile->IsExe()) |
732 if (installableFile->IsExe()) |
742 { |
743 { |
743 // Check the new files to determine which files we need to remove prior to installing them |
744 // Check the new files to determine which files we need to remove prior to installing them |
744 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
745 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
745 { |
746 { |
746 InstallableFile* installableFile= *curr; |
747 InstallableFile* installableFile= *curr; |
747 TUint32 sid = installableFile->Sid(); |
748 TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0); |
748 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |
749 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |
749 iSelectedDrive, installableFile->GetTarget()); |
750 iSelectedDrive, installableFile->GetTarget()); |
750 |
751 |
751 FileDescriptions::const_iterator end = iFileDescriptions.end(); |
752 FileDescriptions::const_iterator end = iFileDescriptions.end(); |
752 for (FileDescriptions::iterator curr2 = iFileDescriptions.begin(); |
753 for (FileDescriptions::iterator curr2 = iFileDescriptions.begin(); |