equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). |
2 * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). |
3 * All rights reserved. |
3 * All rights reserved. |
4 * This component and the accompanying materials are made available |
4 * This component and the accompanying materials are made available |
5 * under the terms of the License "Eclipse Public License v1.0" |
5 * under the terms of the License "Eclipse Public License v1.0" |
6 * which accompanies this distribution, and is available |
6 * which accompanies this distribution, and is available |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
144 { |
144 { |
145 SisRegistryProperty* p = new SisRegistryProperty(props[i]); |
145 SisRegistryProperty* p = new SisRegistryProperty(props[i]); |
146 iProperties.push_back(p); |
146 iProperties.push_back(p); |
147 } |
147 } |
148 |
148 |
149 const const CSISArray<CSISDependency, CSISFieldRoot::ESISDependency>& deps = |
149 const CSISArray<CSISDependency, CSISFieldRoot::ESISDependency>& deps = |
150 aSis.GetDependencies()->DependencyList(); |
150 aSis.GetDependencies()->DependencyList(); |
151 |
151 |
152 for(i = 0; i < deps.size(); ++i) |
152 for(i = 0; i < deps.size(); ++i) |
153 { |
153 { |
154 SisRegistryDependency* p = new SisRegistryDependency(deps[i]); |
154 SisRegistryDependency* p = new SisRegistryDependency(deps[i]); |
399 { |
399 { |
400 iVendorLocalizedName = new std::wstring(aSisController.SISInfo().VendorName(0)); |
400 iVendorLocalizedName = new std::wstring(aSisController.SISInfo().VendorName(0)); |
401 } |
401 } |
402 else |
402 else |
403 { |
403 { |
404 std::string x; |
|
405 std::string error = "can not retrieve localized vendor name"; |
404 std::string error = "can not retrieve localized vendor name"; |
406 throw InvalidSis(Ucs2ToUtf8((std::wstring)packageName,x), error, INVALID_SIS); |
405 std::string x = wstring2string((std::wstring)packageName); |
|
406 throw InvalidSis(x, error, INVALID_SIS); |
407 } |
407 } |
408 |
408 |
409 // Signed by SU cert |
409 // Signed by SU cert |
410 iSignedBySuCert = false; |
410 iSignedBySuCert = false; |
411 |
411 |