FCL/sf/mw/appinstall: comparison installationservices/swcomponentregistry/source/server/scrrequestimpl.cpp

equal deleted inserted replaced

-:6e7b00453237
+:d17dc5398051
 	aLhs.Reset();
 	CopyFixedLengthArrayL(aLhs, tmp);
 	CleanupStack::PopAndDestroy(&tmp);
 	}
-void CScrRequestImpl::GetComponentIdsHavingThePropertiesL(RArray<TComponentId>& aComponentIds, RPointerArray<CPropertyEntry> aProperties, TBool aDoIntersect) const
+void CScrRequestImpl::GetOperatorStringL(CComponentFilter::TDbOperator aOperator, HBufC*& aOperatorString) const
-	{
+{
-	// GROUP BY is added at the end to avoid fetching twice components which have the same localizable values for different locales
+_LIT(KEqualOperator, "=");
-	_LIT(KFindComponentsFromProperties, "SELECT ComponentId FROM ComponentProperties WHERE Name=? AND %S GROUP BY ComponentId;");
+_LIT(KLikeOperator, "LIKE");
-	_LIT(KPropertyIntValue,"IntValue=?");
-	_LIT(KPropertyStrValue,"StrValue=?");
+switch(aOperator)
-	_LIT(KPropertyLocalizedValue,"StrValue=? AND Locale=?");
+{
+case CComponentFilter::EEqual:
-	TInt propCount = aProperties.Count();
+aOperatorString = KEqualOperator().AllocL();
+break;
-	HBufC *statementStr(0);
-	RArray<TComponentId> propCompIds;
+case CComponentFilter::ELike:
-	CleanupClosePushL(propCompIds);
+aOperatorString = KLikeOperator().AllocL();
+break;
-	for(TInt i=0; i<propCount; ++i)
-		{
+default:
-		switch(aProperties[i]->PropertyType())
+User::Leave(KErrArgument);
-			{
-			case CPropertyEntry::EIntProperty:
+}
-				statementStr = FormatStatementLC(KFindComponentsFromProperties, KPropertyIntValue().Length(), &KPropertyIntValue());
+}
-				break;
-			case CPropertyEntry::EBinaryProperty:
+void CScrRequestImpl::GetComponentIdsHavingThePropertiesL(RArray<TComponentId>& aComponentIds, RPointerArray<CPropertyEntry>& aProperties,
-				statementStr = FormatStatementLC(KFindComponentsFromProperties, KPropertyStrValue().Length(), &KPropertyStrValue());
+RArray<CComponentFilter::TPropertyOperator>& aPropertyOperatorList, TBool aDoIntersect) const
-				break;
+{
-			case CPropertyEntry::ELocalizedProperty:
+// GROUP BY is added at the end to avoid fetching twice components which have the same localizable values for different locales
-				{
-				CLocalizablePropertyEntry *localizedProp = static_cast<CLocalizablePropertyEntry *>(aProperties[i]);
+_LIT(KFindComponentsFromProperties, "SELECT ComponentId FROM ComponentProperties WHERE NAME %S ? AND %S GROUP BY ComponentId;");
-				if (localizedProp->LocaleL() == KUnspecifiedLocale) // If the locale was not specified, then we match across all locales
-					statementStr = FormatStatementLC(KFindComponentsFromProperties, KPropertyStrValue().Length(), &KPropertyStrValue());
+_LIT(KPropertyIntValue, "IntValue %S ?");
-				else // Otherwise we match for a specific locale
+_LIT(KPropertyStrValue, "StrValue %S ?");
-					statementStr = FormatStatementLC(KFindComponentsFromProperties, KPropertyLocalizedValue().Length(), &KPropertyLocalizedValue());
+_LIT(KPropertyLocalizedValue, "StrValue %S ? AND Locale = ?");
-				}
-				break;
+TInt propCount = aProperties.Count();
-			default:
-				DEBUG_PRINTF(_L8("The property type couldn't be recognized."));
+RArray<TComponentId> propCompIds;
-				User::Leave(KErrAbort);
+CleanupClosePushL(propCompIds);
-			}
+for(TInt i=0; i<propCount; ++i)
-		CStatement *stmt = iDbHandle->PrepareStatementLC(*statementStr);
+{
-		stmt->BindStrL(1, aProperties[i]->PropertyName());
+//Retrieve the operators to be used to form this query.
+CComponentFilter::TPropertyOperator propOperator = aPropertyOperatorList[i];
-		switch(aProperties[i]->PropertyType())
-			{
+	   // Get the name operator.
-			case CPropertyEntry::EIntProperty:
+	    HBufC* nameOperator(0);
-				{
+GetOperatorStringL(aPropertyOperatorList[i].NameOperator(), nameOperator);
-				CIntPropertyEntry *intProp = static_cast<CIntPropertyEntry *>(aProperties[i]);
+CleanupStack::PushL(nameOperator);
-				stmt->BindInt64L(2, intProp->Int64Value());
-				break;
+// Get the value operator.
-				}
+HBufC* valueOperator(0);
-			case CPropertyEntry::EBinaryProperty:
+GetOperatorStringL(aPropertyOperatorList[i].ValueOperator(), valueOperator);
-				{
+CleanupStack::PushL(valueOperator);
-				CBinaryPropertyEntry *binaryProp = static_cast<CBinaryPropertyEntry *>(aProperties[i]);
-				stmt->BindBinaryL(2, binaryProp->BinaryValue());
+// Create the value string based on the property type.
-				break;
+HBufC* valueString(0);
-				}
+switch(aProperties[i]->PropertyType())
-			case CPropertyEntry::ELocalizedProperty:
+{
-				{
+case CPropertyEntry::EIntProperty:
-				CLocalizablePropertyEntry *localizedProp = static_cast<CLocalizablePropertyEntry *>(aProperties[i]);
+{
-				stmt->BindStrL(2, localizedProp->StrValue());
+valueString = FormatStatementLC(KPropertyIntValue, valueOperator->Length(), valueOperator);
-				if (localizedProp->LocaleL() != KUnspecifiedLocale)
+}
-					stmt->BindIntL(3, localizedProp->LocaleL());
-				break;
+break;
-				}
-			default:
+case CPropertyEntry::EBinaryProperty:
-				DEBUG_PRINTF(_L8("The property type couldn't be recognized."));
+{
-				User::Leave(KErrAbort);
+valueString = FormatStatementLC(KPropertyStrValue, valueOperator->Length(), valueOperator);
-			}
+}
-		while(stmt->ProcessNextRowL())
+break;
-			{
+case CPropertyEntry::ELocalizedProperty:
-			User::LeaveIfError(propCompIds.InsertInOrder(stmt->IntColumnL(0)));
+{
-			}
+CLocalizablePropertyEntry *localizedProp = static_cast<CLocalizablePropertyEntry *>(aProperties[i]);
+if (localizedProp->LocaleL() == KUnspecifiedLocale) // If the locale was not specified, then we match across all locales
-		CleanupStack::PopAndDestroy(2, statementStr); // stmt, statementStr
+{
+valueString = FormatStatementLC(KPropertyStrValue, valueOperator->Length(), valueOperator);
-		if (aDoIntersect)
+}
-			{
+else
-			IntersectSortedArraysL(aComponentIds, propCompIds);
+{
-			}
+valueString = FormatStatementLC(KPropertyLocalizedValue, valueOperator->Length(), valueOperator);
-		else
+}
-			{
+}
-			CopyFixedLengthArrayL(aComponentIds, propCompIds);
+break;
-			aDoIntersect = ETrue; // If many properties are present in the filter, we need to intersect the component Ids on further iterations
+default:
-			}
+DEBUG_PRINTF(_L8("The property type couldn't be recognized."));
+User::Leave(KErrAbort);
-		propCompIds.Reset();
+}
-		}
-	CleanupStack::PopAndDestroy(&propCompIds);
+// Prepare full statement using the name operator and the value string.
-	}
+HBufC *statementStr = FormatStatementLC(KFindComponentsFromProperties, nameOperator->Length()+ valueString->Length(),
+nameOperator, valueString);
+// Create Sql statement.
+CStatement *stmt = iDbHandle->PrepareStatementLC(*statementStr);
+stmt->BindStrL(1, aProperties[i]->PropertyName());
+switch(aProperties[i]->PropertyType())
+{
+case CPropertyEntry::EIntProperty:
+{
+CIntPropertyEntry *intProp = static_cast<CIntPropertyEntry *>(aProperties[i]);
+stmt->BindInt64L(2, intProp->Int64Value());
+break;
+}
+case CPropertyEntry::EBinaryProperty:
+{
+CBinaryPropertyEntry *binaryProp = static_cast<CBinaryPropertyEntry *>(aProperties[i]);
+stmt->BindBinaryL(2, binaryProp->BinaryValue());
+break;
+}
+case CPropertyEntry::ELocalizedProperty:
+{
+CLocalizablePropertyEntry *localizedProp = static_cast<CLocalizablePropertyEntry *>(aProperties[i]);
+stmt->BindStrL(2, localizedProp->StrValue());
+if (localizedProp->LocaleL() != KUnspecifiedLocale)
+stmt->BindIntL(3, localizedProp->LocaleL());
+break;
+}
+default:
+DEBUG_PRINTF(_L8("The property type couldn't be recognized."));
+User::Leave(KErrAbort);
+}
+while(stmt->ProcessNextRowL())
+{
+User::LeaveIfError(propCompIds.InsertInOrder(stmt->IntColumnL(0)));
+}
+CleanupStack::PopAndDestroy(5, nameOperator);
+if (aDoIntersect)
+{
+IntersectSortedArraysL(aComponentIds, propCompIds);
+}
+else
+{
+CopyFixedLengthArrayL(aComponentIds, propCompIds);
+aDoIntersect = ETrue; // If many properties are present in the filter, we need to intersect the component Ids on further iterations
+}
+propCompIds.Reset();
+}
+CleanupStack::PopAndDestroy(&propCompIds);
+}
 void ReallocStatementIfNeededL(RBuf& aStatementStr, TInt aAddedLength)
 	{
 	TInt freeSpace = aStatementStr.MaxLength() - aStatementStr.Length();
 	TInt extraSpace = aAddedLength - freeSpace;
 		aFilterSupersetInUse = ETrue;
 		}
 	if(aFilter.iSetFlag & CComponentFilter::EProperty)
 		{
-		GetComponentIdsHavingThePropertiesL(aComponentFilterSuperset, aFilter.iPropertyList, doIntersect);
+		GetComponentIdsHavingThePropertiesL(aComponentFilterSuperset, aFilter.iPropertyList, aFilter.iPropertyOperatorList, doIntersect);
 		// Inside the function, componentIds array is intersected with the components Ids which have the given properties.
 		doIntersect = ETrue;
 		aFilterSupersetInUse = ETrue;
 		}
 	if(aFilter.iSetFlag & (CComponentFilter::EName | CComponentFilter::EVendor))
 		{ // If a name or vendor is specified in the filter, the locale is ignored
 		  // and the provided names are retrieved from the ComponentLocalizables table.
 		CStatement *stmt = CreateStatementObjectForComponentLocalizablesLC(*aFilter.iName, *aFilter.iVendor, aFilter.iSetFlag, aComponentId);
 		TBool res = stmt->ProcessNextRowL();
-		// If the name and the vendor are not found, it means that there is a defect in this class, the filter shouldn't have returned the component in the first place
+		// If the name and the vendor are not found, leave with KErrNotFound.
 		__ASSERT_ALWAYS(res, User::Leave(KErrNotFound));
 		DeleteObjectZ(aEntry.iName);
 		aEntry.iName = stmt->StrColumnL(1).AllocL(); // Ownership is transferred to the entry object
 		DeleteObjectZ(aEntry.iVendor);
 		aEntry.iVendor = stmt->StrColumnL(2).AllocL(); // Ownership is transferred to the entry object
 	__ASSERT_ALWAYS(aStmt && aFilter, PanicClient(aMessage, KScrIllegalCallSequence));
 	TLanguage locale = TLanguage(aMessage.Int0());
 	DeleteObjectZ(aEntry);
-	aEntry = GetNextComponentEntryL(*aStmt, *aFilter, locale, aSubsessionContext);
+	TInt err(0);
+	do {
+TRAP(err, aEntry = GetNextComponentEntryL(*aStmt, *aFilter, locale, aSubsessionContext));
+}while(err == KErrNotFound);
+	if(KErrNone != err)
+	    {
+User::Leave(err);
+	    }
 	TInt sizeSlot = 1;
 	if(!aEntry)
 		{
 		DEBUG_PRINTF(_L8("Reached the end of the view."));
 		WriteIntValueL(aMessage, sizeSlot, 0);
 	TInt maxArraySize = aMessage.Int0();
 	TLanguage locale = TLanguage(aMessage.Int1());
 	aEntryList.ResetAndDestroy();
+	CComponentEntry *entry(0);
+	TInt err(0);
 	for(TInt i=0; i<maxArraySize; ++i)
 		{
-		CComponentEntry *entry = GetNextComponentEntryL(*aStmt, *aFilter, locale, aSubsessionContext);
+do {
+TRAP(err, entry = GetNextComponentEntryL(*aStmt, *aFilter, locale, aSubsessionContext));
+}while(err == KErrNotFound);
+if(KErrNone != err)
+{
+User::Leave(err);
+}
 		if(!entry)
 			{
 			break;
 			}
 		CleanupStack::PushL(entry);
 		aEntryList.AppendL(entry);
 		CleanupStack::Pop(entry); // Ownership is transferred
 		}
 	WriteArraySizeL(aMessage, 2, aEntryList);
 	}
 void CScrRequestImpl::NextComponentSetDataL(const RMessage2& aMessage, RPointerArray<CComponentEntry>& aEntryList) const
 	{
 	DEBUG_PRINTF(_L8("Returning the next component entry set."));
 	WriteArrayDataL(aMessage, 0, aEntryList);
 TBool CompareHBufDescs(const HBufC& aLeft, const HBufC& aRight)
 	{
 	return !aLeft.CompareF(aRight);
 	}
-TBool CScrRequestImpl::IsSoftwareTypeExistingL(TUint32 aSwTypeId, TUint32 aSifPluginUid, TUint32 aInstallerSecureId, TUint32 aExecutionLayerSecureId, const RPointerArray<HBufC>& aMimeTypesArray, const RPointerArray<CLocalizedSoftwareTypeName>& aLocalizedNamesArray)
+TBool CScrRequestImpl::IsSoftwareTypeExistingL(TUint32 aSwTypeId, TUint32 aSifPluginUid, RArray<TCustomAccessInfo>& aSidArray, const RPointerArray<HBufC>& aMimeTypesArray, const RPointerArray<CLocalizedSoftwareTypeName>& aLocalizedNamesArray, const TDesC& aLauncherExecutable)
 	{
+	//Check if software type id exists
 if(!IsSoftwareTypeExistingL(aSwTypeId))
 {
 DEBUG_PRINTF2(_L8("IsSoftwareTypeExistingL: Software Type Id (%d) doesn't exist in the SCR."), aSwTypeId);
 return EFalse;
 }
+//Check if sif plugin uid for the software type id is the same
 TInt pluginUid(0);
 if(!GetSifPluginUidIInternalL(aSwTypeId, pluginUid))
 {
 DEBUG_PRINTF2(_L8("IsSoftwareTypeExistingL: SIF Plugin Uid doesn't exist in the SCR for TypeId %d."), aSwTypeId);
 return EFalse;
 if(aSifPluginUid != pluginUid)
 {
 DEBUG_PRINTF2(_L8("IsSoftwareTypeExistingL: SIF Plugin Uid doesn't match with the one in the SCR."), pluginUid);
 return EFalse;
 }
-TBool isInstallerSidPresent = EFalse;
+//Check if launcher executable for the software type id is the same
-TBool isExecutionLayerSidPresent = EFalse;
+HBufC *launcherExe;
+_LIT(KSelectLauncherExecutable, "SELECT LauncherExecutable FROM SoftwareTypes WHERE SoftwareTypeId=?;");
+CStatement* stmt = iDbHandle->PrepareStatementLC(KSelectLauncherExecutable);
+stmt->BindIntL(1, aSwTypeId);
+if(stmt->ProcessNextRowL())
+{
+launcherExe = stmt->StrColumnL(0).AllocLC();
+if(launcherExe->Compare(aLauncherExecutable) != 0)
+{
+DEBUG_PRINTF(_L8("IsSoftwareTypeExistingL: Launcher Executable doesn't match with the one in the SCR."));
+CleanupStack::PopAndDestroy(2, stmt);
+return EFalse;
+}
+CleanupStack::PopAndDestroy(2, stmt);
+}
+else
+{
+DEBUG_PRINTF2(_L8("IsSoftwareTypeExistingL: Launcher Executable doesn't exist in the SCR for TypeId %d."), aSwTypeId);
+CleanupStack::PopAndDestroy(stmt);
+return EFalse;
+}
+//Check if associated installer sid's for the software type id is the same
 RArray<TSecureId> installerSids;
 CleanupClosePushL(installerSids);
 if(GetSidsForSoftwareTypeIdL(aSwTypeId, installerSids))
 {
-TInt count = installerSids.Count();
+for(TInt i=0; i<aSidArray.Count(); ++i)
-for (TInt i = 0; i < count; i++)
 {
-if (aInstallerSecureId == installerSids[i])
+if(KErrNotFound == installerSids.Find(aSidArray[i].SecureId()))
-isInstallerSidPresent = ETrue;
+{
-if (aExecutionLayerSecureId == installerSids[i])
+DEBUG_PRINTF(_L8("IsSoftwareTypeExistingL: One of the Sid doesn't match with the one in the SCR."));
-isExecutionLayerSidPresent = ETrue;
+CleanupStack::PopAndDestroy(&installerSids);
+return EFalse;
-			if(isInstallerSidPresent && isExecutionLayerSidPresent)
+}
-				break;
 }
 }
 CleanupStack::PopAndDestroy(&installerSids);
-	if(!isInstallerSidPresent || !isExecutionLayerSidPresent)
+	//Check if localized software type name for the software type id is the same
-		{
-		DEBUG_PRINTF(_L8("IsSoftwareTypeExistingL: One of the UIDs is different from the one in the database."));
-		return EFalse;
-		}
 	_LIT(KSelectSwTypeNames, "SELECT Locale,Name FROM SoftwareTypeNames WHERE SoftwareTypeId=? AND Locale!=?;");
 	CStatement* stmtNames = iDbHandle->PrepareStatementLC(KSelectSwTypeNames);
 	stmtNames->BindIntL(1, aSwTypeId);
 	stmtNames->BindIntL(2, KNonLocalized);
 	TInt numOfFoundNames (0);
 		{
 		DEBUG_PRINTF3(_L("IsSoftwareTypeExistingL: the number of provided software type names (%d) is different than the number of existing software type names (%d) in the SCR."), numOfFoundNames, aLocalizedNamesArray.Count());
 		return EFalse;
 		}
+	//Check if mime type for the software type id is the same
 	_LIT(KSelectMimeTypes, "SELECT MimeType FROM MimeTypes WHERE SoftwareTypeId=?;");
 	CStatement* stmtMimes = iDbHandle->PrepareStatementLC(KSelectMimeTypes);
 	stmtMimes->BindIntL(1, aSwTypeId);
 	TInt numOfFoundMimes (0);
 	while(stmtMimes->ProcessNextRowL())
 	// with the corresponding installer which had been re-installed.
 	// Another advantage of this approach is that it is not mandatory to query SoftwareTypes table in order to get
 	// the software type id of an installer. If the uniqe software type name of the installer is known, its hash
 	// is simply calculated to obtain its software type id.
-	// Slot-0 contains Unique Software Type Name
+	CSoftwareTypeRegInfo *regInfo = ReadObjectFromMessageLC<CSoftwareTypeRegInfo>(aMessage, 0);
-	HBufC *uniqueSwTypeName = ReadDescLC(aMessage, 0);
-	TUint32 swTypeId = HashCaseSensitiveL(*uniqueSwTypeName);
+	HBufC* uniqueSwTypeName = HBufC::NewLC(regInfo->UniqueSoftwareTypeName().Length());
+	uniqueSwTypeName->Des().Copy(regInfo->UniqueSoftwareTypeName());
-	// Slot-1 contains the concatenated values of SifPluginUid, InstallerSecureId and ExecutionLayerSecureId in turn.
-	HBufC8 *uidString = ReadDesc8LC(aMessage, 1);
+	TUint32 swTypeId = HashCaseSensitiveL(regInfo->UniqueSoftwareTypeName());
 	TUint32 sifPluginUid (0);
-	TUint32 installerSecureId (0);
+	sifPluginUid = regInfo->SifPluginUid().iUid;
-	TUint32 executionLayerSecureId (0);
-	ParseUidHexStringL(*uidString, sifPluginUid, installerSecureId, executionLayerSecureId);
+	RArray<TCustomAccessInfo> sidArray;
-	CleanupStack::PopAndDestroy(uidString);
+	sidArray = regInfo->CustomAccessList();
-	// Slot-2 contains the list of MIME types
+	RPointerArray<HBufC> mimeTypesArray = regInfo->MimeTypes();
-	RIpcReadStream mimeTypesReader;
-	CleanupClosePushL(mimeTypesReader);
+	RPointerArray<CLocalizedSoftwareTypeName> localizedNamesArray = regInfo->LocalizedSoftwareTypeNames();
-	mimeTypesReader.Open(aMessage, 2);
+	HBufC* launcherExecutable = HBufC::NewLC(regInfo->LauncherExecutable().Length());
-	RPointerArray<HBufC> mimeTypesArray;
+	launcherExecutable->Des().Copy(regInfo->LauncherExecutable());
-	CleanupResetAndDestroyPushL(mimeTypesArray);
-	InternalizePointersArrayL(mimeTypesArray, mimeTypesReader);
+	if (IsSoftwareTypeExistingL(swTypeId, sifPluginUid, sidArray, mimeTypesArray, localizedNamesArray, *launcherExecutable))
-	// Slot-3 contains Localized Software Type Names
-	RIpcReadStream localizedNamesReader;
-	CleanupClosePushL(localizedNamesReader);
-	localizedNamesReader.Open(aMessage, 3);
-	RPointerArray<CLocalizedSoftwareTypeName> localizedNamesArray;
-	CleanupResetAndDestroyPushL(localizedNamesArray);
-	InternalizePointersArrayL(localizedNamesArray, localizedNamesReader);
-	if (IsSoftwareTypeExistingL(swTypeId, sifPluginUid, installerSecureId, executionLayerSecureId, mimeTypesArray, localizedNamesArray))
 		{ // If the software type exists, do nothing and return;
-		CleanupStack::PopAndDestroy(5, uniqueSwTypeName); // uniqueSwTypeName, mimeTypesReader, mimeTypesArray, localizedNamesReader, localizedNamesArray
+		CleanupStack::PopAndDestroy(3, regInfo); // uniqueSwTypeName, launcherExecutable, regInfo
 		return;
 		}
 	// First, insert the main record to SoftwareTypes table
-	// TODO: Have to insert the Launcher Executable name here
+	_LIT(KInsertSwType, "INSERT INTO SoftwareTypes(SoftwareTypeId,SifPluginUid,LauncherExecutable) VALUES(?,?,?);");
-	_LIT(KInsertSwType, "INSERT INTO SoftwareTypes(SoftwareTypeId,SifPluginUid) VALUES(?,?);");
+	TInt numberOfValuesSwType = 3;
-	TInt numberOfValuesSwType = 2;
+	ExecuteStatementL(KInsertSwType(), numberOfValuesSwType, EValueInteger, swTypeId, EValueInteger, sifPluginUid, EValueString, launcherExecutable);
-	ExecuteStatementL(KInsertSwType(), numberOfValuesSwType, EValueInteger, swTypeId, EValueInteger, sifPluginUid);
 	_LIT(KInsertCustomAccess, "INSERT INTO CustomAccessList(SoftwareTypeId,SecureId,AccessMode) VALUES(?,?,?);");
 	TInt numberOfValuesCustomAccess = 3;
-	// TODO: This should be modified to insert more than 2 Sids
+	for(TInt i=0; i<sidArray.Count(); ++i)
-	ExecuteStatementL(KInsertCustomAccess(), numberOfValuesCustomAccess, EValueInteger, swTypeId, EValueInteger, installerSecureId, EValueInteger, (TInt)ETransactionalSid);
+		{
-	ExecuteStatementL(KInsertCustomAccess(), numberOfValuesCustomAccess, EValueInteger, swTypeId, EValueInteger, executionLayerSecureId, EValueInteger, (TInt)ETransactionalSid);
+		TUint32 sid = sidArray[i].SecureId();
+		TAccessMode accessMode = sidArray[i].AccessMode();
+		ExecuteStatementL(KInsertCustomAccess(), numberOfValuesCustomAccess, EValueInteger, swTypeId, EValueInteger, sid, EValueInteger, accessMode);
+		}
 	// Then, insert MIME types of this software type into MimeTypes table
 	_LIT(KInsertMimeType, "INSERT INTO MimeTypes(SoftwareTypeId,MimeType) VALUES(?,?);");
 	TInt numberOfValuesMimeType = 2;
 	TInt countMimeTypes = mimeTypesArray.Count();
 	for(TInt i=0; i<countMimeTypes; ++i)
 		{
 		TLanguage locale = localizedNamesArray[i]->Locale();
 		const TDesC& name = localizedNamesArray[i]->NameL();
 		ExecuteStatementL(KInsertSwTypeName(), numberOfValuesSwTypeName, EValueInteger, swTypeId, EValueInteger, locale, EValueString, &name);
 		}
-	CleanupStack::PopAndDestroy(5, uniqueSwTypeName); // uniqueSwTypeName, mimeTypesReader, mimeTypesArray, localizedNamesReader, localizedNamesArray
+	CleanupStack::PopAndDestroy(3, regInfo); // uniqueSwTypeName, launcherExecutable, regInfo
 	}
 void CScrRequestImpl::DeleteSoftwareTypeL(const RMessage2& aMessage)
 	{
 	HBufC *uniqueSwTypeName = ReadDescLC(aMessage, 0);
 	}
 void CScrRequestImpl::GetIsComponentPresentL(const RMessage2& aMessage) const
 	{
 	TComponentId componentId = GetComponentIdFromMsgL(aMessage);
-	DEBUG_PRINTF2(_L8("Checking if the component(%d) is available."), componentId);
+	TBool result = IsComponentPresentL(componentId);
-	_LIT(KSelectCompPresent, "SELECT CompPresence FROM Components WHERE ComponentId=?;");
-	CStatement *stmt = iDbHandle->PrepareStatementLC(KSelectCompPresent);
-	stmt->BindIntL(1, componentId);
-	if(!stmt->ProcessNextRowL())
-		{
-		DEBUG_PRINTF2(_L8("Component (%d) couldn't be found in the SCR database."), componentId);
-		User::Leave(KErrNotFound);
-		}
-	TBool result = (stmt->IntColumnL(0) == 1);
-	CleanupStack::PopAndDestroy(stmt);
-	// The default value for CompPresence is ETrue. So when we find that the SCR DB contains the
-	// default property value we check if the drives registered by the component are present.
-	if (result && !CheckForMediaPresenceL(componentId))
-		{
-		result = EFalse;
-		}
 	TPckg<TBool> isCompPresent(result);
 	aMessage.WriteL(1, isCompPresent);
 	}
+TBool CScrRequestImpl::IsComponentPresentL(TComponentId componentId) const
+{
+DEBUG_PRINTF2(_L8("Checking if the component(%d) is available."), componentId);
+_LIT(KSelectCompPresent, "SELECT CompPresence FROM Components WHERE ComponentId=?;");
+CStatement *stmt = iDbHandle->PrepareStatementLC(KSelectCompPresent);
+stmt->BindIntL(1, componentId);
+if(!stmt->ProcessNextRowL())
+{
+DEBUG_PRINTF2(_L8("Component (%d) couldn't be found in the SCR database."), componentId);
+User::Leave(KErrNotFound);
+}
+TBool result = (stmt->IntColumnL(0) == 1);
+CleanupStack::PopAndDestroy(stmt);
+// The default value for CompPresence is ETrue. So when we find that the SCR DB contains the
+// default property value we check if the drives registered by the component are present.
+if (result && !CheckForMediaPresenceL(componentId))
+{
+result = EFalse;
+}
+return result;
+}
 void CScrRequestImpl::SetIsComponentPresentL(const RMessage2& aMessage)
 	{
 	DEBUG_PRINTF(_L8("Setting the component as present."));
 	_LIT(KColumnNameCompPresence, "CompPresence");
 }
 void CScrRequestImpl::NextAppInfoSizeL(const RMessage2& aMessage, TAppRegInfo*& aAppInfo, CAppInfoViewSubsessionContext* aSubsessionContext)
 {
-if(aSubsessionContext->iAppInfoIndex < aSubsessionContext->iApps.Count())
+while(1)
 {
-TInt count1 = User::CountAllocCells();
+if(aSubsessionContext->iAppInfoIndex < aSubsessionContext->iApps.Count())
-aAppInfo = new(ELeave) TAppRegInfo;
-TInt count2 = User::CountAllocCells();
-aAppInfo->iUid = (aSubsessionContext->iApps[aSubsessionContext->iAppInfoIndex]).iAppUid;
-_LIT(KSelectAppFilename, "SELECT AppFile FROM AppRegistrationInfo WHERE AppUid=?;");
-CStatement *stmt = iDbHandle->PrepareStatementLC(KSelectAppFilename);
-stmt->BindIntL(1, aAppInfo->iUid.iUid);
-stmt->ProcessNextRowL();
-aAppInfo->iFullName = stmt->StrColumnL(0);
-CleanupStack::PopAndDestroy(stmt);
-if((aSubsessionContext->iApps[aSubsessionContext->iAppInfoIndex]).iLocale != KUnspecifiedLocale)
 {
-GetCaptionAndShortCaptionInfoForLocaleL(aAppInfo->iUid, aSubsessionContext->iApps[aSubsessionContext->iAppInfoIndex].iLocale, aAppInfo->iShortCaption, aAppInfo->iCaption);
+TBool isPresent = EFalse;
+aAppInfo = new(ELeave) TAppRegInfo;
+aAppInfo->iUid = (aSubsessionContext->iApps[aSubsessionContext->iAppInfoIndex]).iAppUid;
+_LIT(KSelectAppFilename, "SELECT AppFile FROM AppRegistrationInfo WHERE AppUid=?;");
+CStatement *stmt = iDbHandle->PrepareStatementLC(KSelectAppFilename);
+stmt->BindIntL(1, aAppInfo->iUid.iUid);
+if(stmt->ProcessNextRowL())
+{
+isPresent = ETrue;
+aAppInfo->iFullName = stmt->StrColumnL(0);
+}
+CleanupStack::PopAndDestroy(stmt);
+if(isPresent)
+{
+if((aSubsessionContext->iApps[aSubsessionContext->iAppInfoIndex]).iLocale != KUnspecifiedLocale)
+{
+GetCaptionAndShortCaptionInfoForLocaleL(aAppInfo->iUid, aSubsessionContext->iApps[aSubsessionContext->iAppInfoIndex].iLocale, aAppInfo->iShortCaption, aAppInfo->iCaption);
+}
+aSubsessionContext->iAppInfoIndex++;
+WriteObjectSizeL(aMessage, 1, aAppInfo);
+break;
+}
+else
+{
+DeleteObjectZ(aAppInfo);
+aSubsessionContext->iAppInfoIndex++;
+}
 }
-aSubsessionContext->iAppInfoIndex++;
+else
-}
+{
-else
+break;
-{
+}
-DEBUG_PRINTF(_L8("Reached the end of the view."));
+}
-}
-WriteObjectSizeL(aMessage, 1, aAppInfo);
 }
 void CScrRequestImpl::NextAppInfoDataL(const RMessage2& aMessage, TAppRegInfo*& aAppInfo)
 {
 DEBUG_PRINTF(_L8("Returning the AppInfo data."));
 }
 void CScrRequestImpl::AddOpaqueDataL(TUid aAppUid, Usif::COpaqueData* aOpaqueDataEntry, TUid aServiceUid)
 {
 	DEBUG_PRINTF(_L8("Adding the Opaque Data details into SCR"));
-const TInt KMaxOpaqueDataLength = 1024;
+const TInt KMaxOpaqueDataLength = 4096;
 /* AppUid cannot be NULL since this function is invoked from AddApplicationEntryL */
 __ASSERT_DEBUG(aAppUid != TUid::Null(), User::Leave(KErrArgument));
 _LIT(KOpaqueDataEntry, "INSERT INTO AppProperties(AppUid, Name, Locale, ServiceUid, StrValue, IsStr8Bit) VALUES(?,?,?,?,?,1)");
 _LIT(KAllAppIds," SELECT AppUid from AppRegistrationInfo");
 stmt = iDbHandle->PrepareStatementLC(KAllAppIds);
 aSubsessionContext->iAppUids.Close();
 while(stmt->ProcessNextRowL())
 {
-aSubsessionContext->iAppUids.AppendL(TUid::Uid(stmt->IntColumnL(0)));
+TUid appUid = TUid::Uid(stmt->IntColumnL(0));
+TComponentId componentId(0);
+if(GetComponentIdForAppInternalL(appUid, componentId))
+	    	{
+	    	if(!componentId || IsComponentPresentL(componentId))
+	{
+	aSubsessionContext->iAppUids.AppendL(appUid);
+	}
+	    	}
 }
 CleanupStack::PopAndDestroy(stmt);
 }
 void CScrRequestImpl::OpenApplicationRegistrationForAppUidsViewL(const RMessage2& aMessage, CAppRegistrySubsessionContext*  aSubsessionContext)
 aSubsessionContext->iAppUids.Close();
 for (TInt i =0; i<size ;i++)
 {
 TUid appUid = TUid::Uid(inStream.ReadInt32L());
-if(CheckIfAppUidExistsL(appUid)) //Append only if AppUid is present in DB.
+		TComponentId componentId(0);
-{
+if(GetComponentIdForAppInternalL(appUid, componentId)) // Check for application presence and fetch the corresponding ComponentId
-aSubsessionContext->iAppUids.AppendL(appUid);
+	    	{
-}
+	    	if(!componentId || IsComponentPresentL(componentId)) // Check if the component is present
+	{
+	aSubsessionContext->iAppUids.AppendL(appUid);
+	}
+	    	}
 }
 CleanupStack::PopAndDestroy(2,bufToHoldAppUids); //bufToHoldAppUids, inStream
 }
 CleanupStack::Pop(1);
 }
 else
 {
-DEBUG_PRINTF2(_L8("AppUid %d Not Found in th SCR"),aAppUid);
+DEBUG_PRINTF2(_L8("AppUid %d Not Found in the SCR"),aAppUid);
 CleanupStack::PopAndDestroy(stmt);
 return EFalse;
 }
 CleanupStack::PopAndDestroy(stmt);
 return ETrue;
 GetOpaqueDataArrayL(aAppUid, TUid::Null(), aApplicationRegistration.iOpaqueDataArray, aLanguage);
 }
 void CScrRequestImpl::NextApplicationRegistrationInfoSizeL(const RMessage2& aMessage, CApplicationRegistrationData*& aApplicationRegistration, CAppRegistrySubsessionContext*  aSubsessionContext)
 {
-DeleteObjectZ(aApplicationRegistration);
+while(1)
-aApplicationRegistration = CApplicationRegistrationData::NewL();
+{
-if((aSubsessionContext->iAppRegIndex < aSubsessionContext->iAppUids.Count()))
+TBool dataFound = EFalse;
-{
+DeleteObjectZ(aApplicationRegistration);
-TUid appUid = aSubsessionContext->iAppUids[aSubsessionContext->iAppRegIndex];
+aApplicationRegistration = CApplicationRegistrationData::NewL();
+if((aSubsessionContext->iAppRegIndex < aSubsessionContext->iAppUids.Count()))
-//Populate the Application Registration Info
-if(GetApplicationRegistrationInfoL(*aApplicationRegistration,appUid))
 {
-//Populate File ownership info
+TUid appUid = aSubsessionContext->iAppUids[aSubsessionContext->iAppRegIndex];
-GetFileOwnershipInfoL(*aApplicationRegistration,appUid);
+//Populate the Application Registration Info
-//Populate service info
+if(GetApplicationRegistrationInfoL(*aApplicationRegistration,appUid))
-GetServiceInfoL(*aApplicationRegistration, appUid, aSubsessionContext->iLanguage);
+{
+//Populate File ownership info
-//Populate localizable appinfo including caption and icon info
+GetFileOwnershipInfoL(*aApplicationRegistration,appUid);
-//and view data and its caption and icon info.
-GetLocalizableAppInfoL(*aApplicationRegistration,appUid, aSubsessionContext->iLanguage);
+//Populate service info
+GetServiceInfoL(*aApplicationRegistration, appUid, aSubsessionContext->iLanguage);
-			GetAppRegOpaqueDataL(*aApplicationRegistration,appUid, aSubsessionContext->iLanguage);
+//Populate localizable appinfo including caption and icon info
-GetAppPropertiesInfoL(*aApplicationRegistration,appUid, aSubsessionContext->iLanguage);
+//and view data and its caption and icon info.
+GetLocalizableAppInfoL(*aApplicationRegistration,appUid, aSubsessionContext->iLanguage);
+GetAppRegOpaqueDataL(*aApplicationRegistration,appUid, aSubsessionContext->iLanguage);
+GetAppPropertiesInfoL(*aApplicationRegistration,appUid, aSubsessionContext->iLanguage);
+dataFound = ETrue;
+}
+else
+{
+DeleteObjectZ(aApplicationRegistration);
+}
+//Incrementing the index
+aSubsessionContext->iAppRegIndex++;
+if(dataFound)
+{
+WriteObjectSizeL(aMessage, 1, aApplicationRegistration);
+break;
+}
 }
 else
 {
+DEBUG_PRINTF(_L8("Reached the end of the view."));
+WriteIntValueL(aMessage, 1, 0);
 DeleteObjectZ(aApplicationRegistration);
+break;
 }
-//Incrementing the index
-aSubsessionContext->iAppRegIndex++;
-WriteObjectSizeL(aMessage, 1, aApplicationRegistration);
-}
-else
-{
-DEBUG_PRINTF(_L8("Reached the end of the view."));
-WriteIntValueL(aMessage, 1, 0);
-DeleteObjectZ(aApplicationRegistration);
 }
 }
 void CScrRequestImpl::NextApplicationRegistrationInfoDataL(const RMessage2& aMessage, CApplicationRegistrationData*& aApplicationRegistration)
 {

changeset 42	d17dc5398051
parent 33	8110bf1194d1
child 64	48c14c385b0e