FCL/sf/mw/appinstall: comparison secureswitools/swisistools/source/interpretsislib/sisregistry.cpp

equal deleted inserted replaced

-:cd189dac02f7
+:5cc91383ab1e
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #endif
 // SisX Library Includes
 #include "sisfiledescription.h"
 #include "sisstring.h"
+#include "utility.h"
 // User Includes
 #include "sisregistry.h"
 #include "errors.h"
 #include "rommanager.h"
 #include "sisregistrypackage.h"
 #include "sisregistryobject.h"
 #include "configmanager.h"
 // Constants
+#ifndef __TOOLS2_LINUX__
 const std::wstring SisRegistry::KPathToRegistry(L"\\sys\\install\\sisregistry/");
 const std::wstring SisRegistry::KPathToRomStubs(L"\\system\\install\\");
 const std::wstring SisRegistry::KPathToRegistryVersionMarker(L"\\system\\data\\");
+#else
+const std::wstring SisRegistry::KPathToRegistry(L"/sys/install/sisregistry/");
+const std::wstring SisRegistry::KPathToRomStubs(L"/system/install/");
+const std::wstring SisRegistry::KPathToRegistryVersionMarker(L"/system/data/");
+#endif
 const std::wstring KRegistryEntry(L"00000000.reg");
 const std::wstring KControllerEntry(L"00000000_0000.ctl");
 const std::wstring KBackupLst(L"backup.lst");
 const int SisRegistry::KSisRegistryMajorVersion = 5;
 const std::wstring SisRegistry::KRegistryV40(L"sisregistry_4.0.txt");
 const std::wstring SisRegistry::KRegistryV51(L"sisregistry_5.1.txt");
 const std::wstring SisRegistry::KRegistryV52(L"sisregistry_5.2.txt");
 const std::wstring SisRegistry::KRegistryV53(L"sisregistry_5.3.txt");
 const std::wstring SisRegistry::KRegistryV54(L"sisregistry_5.4.txt");
+#ifndef __TOOLS2_LINUX__
 const std::wstring SisRegistry::KRomStubDir(L"z:\\system\\install\\");
 const std::wstring SisRegistry::KRomRegistryVersionMarker(L"z:\\system\\data\\");
+#else
+const std::wstring SisRegistry::KRomStubDir(L"z:/system/install/");
+const std::wstring SisRegistry::KRomRegistryVersionMarker(L"z:/system/data/");
+#endif
 const std::string SisRegistry::KRegistryV40string("4.0");
 const std::string SisRegistry::KRegistryV50string("5.0");
 const std::string SisRegistry::KRegistryV51string("5.1");
 const std::string SisRegistry::KRegistryV52string("5.2");
 const std::string SisRegistry::KRegistryV53string("5.3");
 	{
 	EntryMap::iterator it = iEntries.find(aUid);
 	while(it != iEntries.end())
 	    {
-		if (aUid == it->first &&
+		if (aUid == it->first && !wcscmp(aPackageName.c_str(), it->second->GetPackageName().c_str()) && aVendorName == it->second->GetVendorName() )
-			aPackageName == it->second->GetPackageName() &&
-			aVendorName == it->second->GetVendorName())
 			{
 			LINFO(L"Removing package \"" << it->second->GetPackageName()
 					<< L"\" prior to re-installation");
 			// Remove .reg file
 bool SisRegistry::IsFileWideCard(const std::wstring& aFileName)
 	{
 	return (aFileName.find(L'?') != std::wstring::npos ||
 			aFileName.find(L'*') != std::wstring::npos ||
+			#ifndef __TOOLS2_LINUX__
 			aFileName[aFileName.length() - 1] == L'\\');
+			#else
+			aFileName[aFileName.length() - 1] == L'/');
+			#endif
 	}
 void SisRegistry::GenerateStubRegistry()
 	{
 		{
 		if (c->find(L".reg",0) == std::wstring::npos)
 			continue;
 		std::fstream input;
+		#ifndef __TOOLS2_LINUX__
 		std::wstring filename(aPath + L"\\" + *c);
+		#else
+		std::wstring filename(aPath + L"/" + *c);
+		#endif
 		OpenFile(filename.c_str(), input, std::fstream::in | std::fstream::binary);
 		if (!input.good())
 			continue;
 		SisRegistryObject* obj = new SisRegistryObject(iConfigManager);
 		if (!obj)
 			{
-			throw std::runtime_error("Cannot create SisRegistryObject for " + Ucs2ToUtf8(filename));
+			throw std::runtime_error("Cannot create SisRegistryObject for " + wstring2string(filename));
 			}
 		Deserialiser des(input);
 		des >> *obj;
 		iEntries.insert(EntryMap::value_type(obj->GetUid(), obj));
 				// No SisRegistry file found!!
 				std::wstring msg = StringUtils::MakePathFromSID ( iParamList.SystemDrivePath()+L"\\", pkgUid );
 				msg.append(L" does not have any SisRegistry file");
-				throw std::runtime_error( Ucs2ToUtf8(msg) );
+				throw std::runtime_error( wstring2string(msg) );
 				}
 			aObj.SetIndex( index );
 			if ( !CheckSisRegistryDirPresent(iParamList.SystemDrivePath(), pkgUid) )
 				// c:\sys\install\sisregistry\<UID>\ directory not exist
 				std::wstring msg = StringUtils::MakePathFromSID ( iParamList.SystemDrivePath()+L"\\", pkgUid );
 				msg.append(L" directory NOT found");
-				throw std::runtime_error( Ucs2ToUtf8(msg) );
+				throw std::runtime_error( wstring2string(msg) );
 				}
 			}
 		}
 	#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 				{
 				std::wstring msg = StringUtils::MakePathFromSID ( iParamList.SystemDrivePath()+L"\\", pkgUid );
 				msg.append(L" directory NOT found");
-				throw std::runtime_error( Ucs2ToUtf8(msg) );
+				throw std::runtime_error( wstring2string(msg) );
 				}
 			}
 		}
 	#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 			// No SIS controller file found!!
 			std::wstring msg = StringUtils::MakePathFromSID ( iParamList.SystemDrivePath()+L"\\", pkgUid );
 			msg.append(L" does not have any Sis Controller file");
-			throw std::runtime_error( Ucs2ToUtf8(msg) );
+			throw std::runtime_error( wstring2string(msg) );
 			}
 		}
 	// Finally, externalise the new controller file
 	std::fstream ctlFile;
 		}
 	}
 void SisRegistry::UpdateInstallationInformation(XmlDetails::TScrPreProvisionDetail aScrPreProvisionDetail)
 	{
-	CXmlGenerator xmlgenerator;
+	CXmlGenerator xmlGenerator;
 	char* tmpFileName = tmpnam(NULL);
 	std::wstring filename(string2wstring(tmpFileName));
-	xmlgenerator.WritePreProvisionDetails(filename , aScrPreProvisionDetail);
+	int isRomApplication = 0;
+	xmlGenerator.WritePreProvisionDetails(filename , aScrPreProvisionDetail, isRomApplication);
+	#ifdef __LINUX__
+	std::string executable = "scrtool";
+	#else
 	std::string executable = "scrtool.exe";
+	#endif
 	std::string command;
 	command = executable + " -d " + GetDbPath() + " -p " + tmpFileName;
 	int error = system(command.c_str());
+	int err = remove(tmpFileName);
+	if(err != 0)
+		LERROR(L"Temporary file removal failed.");
 	if(error != 0)
 		{
 		std::string err = "Scrtool failed to upload the database registry entry.";
 		LERROR(L"Scrtool failed to upload the database registry entry.");
 		throw InterpretSisError(err, DATABASE_UPDATE_FAILED);
 		}
-	error = remove(tmpFileName);
-	if(error != 0)
-		{
-		LERROR(L"Temporary file removal failed.");
-		}
 	}
 std::string SisRegistry::GetDbPath()
 	{
 	if	(
 		(iParamList.RomLogFileNames().size() != 0 && iParamList.RomDrivePath().size() == 0 ) ||
 		iParamList.IsFlagSet(CParameterList::EFlagsDisableZDriveChecksSet)
 		)
 		{
+		#ifndef __TOOLS2_LINUX__
 		return wstring2string(iParamList.SystemDrivePath()) + "\\sys\\install\\scr\\scr.db";
-		}
+		#else
+		return wstring2string(iParamList.SystemDrivePath()) + "/sys/install/scr/scr.db";
+		#endif
+		}
+	#ifndef __TOOLS2_LINUX__
 	return wstring2string(iParamList.RomDrivePath()) + "\\sys\\install\\scr\\provisioned\\scr.db";
+	#else
+	    return wstring2string(iParamList.RomDrivePath()) + "/sys/install/scr/provisioned/scr.db";
+	#endif
 	}
 std::string SisRegistry::GetEpocRoot()
 	{
 	int algorithmId = aHashContainer.GetHashId();
 	// The property is a concatenation of the algorithm id and the hash data
 	const std::string hashData = aHashContainer.GetData();
 	std::string encodedHashData = Util::Base64Encode(hashData);
-	std::wstring wideHashData = Utils::string2wstring(encodedHashData);
+	std::wstring wideHashData = string2wstring(encodedHashData);
 	AddComponentProperty( aComponent, DbConstants::CompControllerHashData, wideHashData, aCount, true);
 	}
 		}
 	// file hash data
 	if(!aFileDescription->GetHash().GetData().empty())
 		{
 		std::string binHashData = Util::Base64Encode(aFileDescription->GetHash().GetData());
-		std::wstring hashData = Utils::string2wstring(binHashData);
+		std::wstring hashData = string2wstring(binHashData);
 		AddFileProperty( aComponentFile, DbConstants::FileHashData, hashData, true);
 		}
 	}
 void SisRegistry::AddTrustStatus	(	XmlDetails::TScrPreProvisionDetail::TComponent& aComponent,

branch	RCL_3
changeset 62	5cc91383ab1e
parent 19	7ca52d38f8c3
child 65	7333d7932ef7