equal
deleted
inserted
replaced
202 |
202 |
203 failed = failed || !success; |
203 failed = failed || !success; |
204 |
204 |
205 if (failed) |
205 if (failed) |
206 { |
206 { |
207 std::string x; |
207 std::string x = wstring2string(this->GetPackageName()); |
208 throw InvalidSis(Ucs2ToUtf8(this->GetPackageName(),x), |
208 throw InvalidSis(x, error, SIS_NOT_SUPPORTED); |
209 error, SIS_NOT_SUPPORTED); |
209 } |
210 } |
210 |
211 } |
211 } |
212 |
212 |
213 bool SisFile::ProcessInstallOptionsWarning(const CSISInstallBlock& aInstallBlock, std::string& aError) |
213 bool SisFile::ProcessInstallOptionsWarning(const CSISInstallBlock& aInstallBlock, std::string& aError) |
214 { |
214 { |
215 bool success = true; |
215 bool success = true; |
217 int fileCount = aInstallBlock.FileCount(); |
217 int fileCount = aInstallBlock.FileCount(); |
218 for(int i = 0; i < fileCount; ++i) |
218 for(int i = 0; i < fileCount; ++i) |
219 { |
219 { |
220 const CSISFileDescription& fD = aInstallBlock.FileDescription(i); |
220 const CSISFileDescription& fD = aInstallBlock.FileDescription(i); |
221 const CSISFileDescription::TSISFileOperation operation = fD.Operation(); |
221 const CSISFileDescription::TSISFileOperation operation = fD.Operation(); |
222 std::wstring target(fD.Target().GetString()); |
222 std::wstring target(fD.Target().GetString().c_str()); |
223 // |
223 // |
224 switch( operation ) |
224 switch( operation ) |
225 { |
225 { |
226 case CSISFileDescription::EOpInstall: |
226 case CSISFileDescription::EOpInstall: |
227 success = true; |
227 success = true; |
261 case CSISFileDescription::EOpText: |
261 case CSISFileDescription::EOpText: |
262 LWARN(L"File " << target << L" contains \"Display Text\" option that will be ignored." ); |
262 LWARN(L"File " << target << L" contains \"Display Text\" option that will be ignored." ); |
263 success = true; |
263 success = true; |
264 break; |
264 break; |
265 case CSISFileDescription::EOpNull: |
265 case CSISFileDescription::EOpNull: |
|
266 case CSISFileDescription::EOpNone: |
266 success = true; |
267 success = true; |
267 break; |
268 break; |
268 default: |
269 default: |
269 success = false; |
270 success = false; |
270 break; |
271 break; |
274 { |
275 { |
275 aError += "SIS File contains install options : "+operation; |
276 aError += "SIS File contains install options : "+operation; |
276 break; |
277 break; |
277 } |
278 } |
278 } |
279 } |
|
280 return success; |
279 } |
281 } |
280 |
282 |
281 |
283 |
282 std::wstring SisFile::GetVendorName() const |
284 std::wstring SisFile::GetVendorName() const |
283 { |
285 { |