--- a/installationservices/swi/test/tuiscriptadaptors/sisregistryaccess_server_session.cpp Tue Aug 31 15:21:33 2010 +0300
+++ b/installationservices/swi/test/tuiscriptadaptors/sisregistryaccess_server_session.cpp Wed Sep 01 12:22:02 2010 +0100
@@ -32,7 +32,6 @@
#include "siscontroller.h"
#include "application.h"
#include "userselections.h"
-#include "sislauncherclient.h"
/////////////////////// Utility functions //////////////////////////////
void StartTimer(TTime& aTimer)
@@ -111,107 +110,81 @@
void CSisRegistryAccessSession::ServiceL(const RMessage2& aMessage)
{
- TSisRegistryAccessMessages f = static_cast<TSisRegistryAccessMessages>(aMessage.Function());
- TTime timer;
- StartTimer(timer);
- TInt err(0);
- if(f == EAddAppRegInfo)
- {
- TUint regFileNameLen = aMessage.GetDesLengthL(0);
- HBufC* regFileName = HBufC::NewLC(regFileNameLen);
- TPtr namePtr = regFileName->Des();
- aMessage.ReadL(0, namePtr);
- TUid appUid = TUid::Uid(aMessage.Int1());
- Swi::RSisRegistrySession sisRegistryWritableSession;
- CleanupClosePushL(sisRegistryWritableSession);
- TRAP(err, sisRegistryWritableSession.Connect());
- TRAP(err, sisRegistryWritableSession.AddAppRegInfoL(*regFileName););
- CleanupStack::PopAndDestroy(2, regFileName);
- }
- else if(f == ERemoveAppRegInfo)
- {
- TUint regFileNameLen = aMessage.GetDesLengthL(0);
- HBufC* regFileName = HBufC::NewLC(regFileNameLen);
- TPtr namePtr = regFileName->Des();
- aMessage.ReadL(0, namePtr);
- TUid appUid = TUid::Uid(aMessage.Int1());
- Swi::RSisRegistrySession sisRegistryWritableSession;
- CleanupClosePushL(sisRegistryWritableSession);
- TRAP(err, sisRegistryWritableSession.Connect());
- TRAP(err, sisRegistryWritableSession.RemoveAppRegInfoL(*regFileName););
- CleanupStack::PopAndDestroy(2, regFileName);
- }
- else
- {
- // create transaction on SCR for mutable operations
- Server().RegistrySession().CreateTransactionL();
- // SWI regsitry needs a transaction to cover updates to logs during package add/update/removal
- Usif::RStsSession stsSession;
- TInt64 transactionID = stsSession.CreateTransactionL();
- CleanupClosePushL(stsSession);
-
- switch (f)
- {
- case EAddEntry:
- case EUpdateEntry:
- {
- TInt len = aMessage.GetDesLengthL(0);
- HBufC8 *controllerData = HBufC8::NewLC(len);
- TPtr8 ptrControllerData(controllerData->Des());
- aMessage.ReadL(0, ptrControllerData);
-
- // create the controller
- Swi::CDesDataProvider *desProvider = Swi::CDesDataProvider::NewLC(ptrControllerData);
- Swi::Sis::CController *controller = Swi::Sis::CController::NewLC(*desProvider, Swi::Sis::EAssumeType);
- // setup the application
- Swi::CApplication *app = Swi::CApplication::NewLC();
- app->SetInstall(*controller);
- // since the attributes chosen by the user don't have impact on the adding/updating entry tests,
- // they are set with the constant values.
- app->UserSelections().SetLanguage(ELangEnglish);
- app->UserSelections().SetDrive(2);
-
- if(EAddEntry == f)
- {
- TRAP(err, Server().RegistrySession().AddEntryL(*app, ptrControllerData, transactionID));
- }
- else
- {
- TRAP(err, Server().RegistrySession().UpdateEntryL(*app, ptrControllerData, transactionID));
- }
- CleanupStack::PopAndDestroy(4, controllerData); // controllerData, desProvider, controller, app
- break;
- }
- case EDeleteEntry:
- {
- // Get Uid and index
- // Augmentation index - argument 0
- TInt packageIndex = aMessage.Int0();
-
- // Uid (ipc argument 1)
- TUid uid;
- TPckg<TUid> packageUid(uid);
- aMessage.ReadL(1, packageUid);
-
- // Invoke SisRegistry server API using SisRegistryClient
- Swi::CSisRegistryPackage* package = Swi::CSisRegistryPackage::NewLC(uid, KNullDesC, KNullDesC); // For the delete API, the name and the vendor of the package are irrelevant
- package->SetIndex(packageIndex);
- TRAP(err, Server().RegistrySession().DeleteEntryL(*package, transactionID));
-
- CleanupStack::PopAndDestroy(package);
- break;
- }
- default:
- {
- PanicClient(aMessage, EPanicIllegalFunction);
- break;
- }
- }
-
- stsSession.CommitL();
- CleanupStack::PopAndDestroy(&stsSession);
- Server().RegistrySession().CommitTransactionL();
- }
+ // create transaction on SCR for mutable operations
+ Server().RegistrySession().CreateTransactionL();
+ // SWI regsitry needs a transaction to cover updates to logs during package add/update/removal
+ Usif::RStsSession stsSession;
+ TInt64 transactionID = stsSession.CreateTransactionL();
+ CleanupClosePushL(stsSession);
+ TInt err(0);
+
+ TTime timer;
+ StartTimer(timer);
+
+ TSisRegistryAccessMessages f = static_cast<TSisRegistryAccessMessages>(aMessage.Function());
+ switch (f)
+ {
+ case EAddEntry:
+ case EUpdateEntry:
+ {
+ TInt len = aMessage.GetDesLengthL(0);
+ HBufC8 *controllerData = HBufC8::NewLC(len);
+ TPtr8 ptrControllerData(controllerData->Des());
+ aMessage.ReadL(0, ptrControllerData);
+
+ // create the controller
+ Swi::CDesDataProvider *desProvider = Swi::CDesDataProvider::NewLC(ptrControllerData);
+ Swi::Sis::CController *controller = Swi::Sis::CController::NewLC(*desProvider, Swi::Sis::EAssumeType);
+ // setup the application
+ Swi::CApplication *app = Swi::CApplication::NewLC();
+ app->SetInstall(*controller);
+ // since the attributes chosen by the user don't have impact on the adding/updating entry tests,
+ // they are set with the constant values.
+ app->UserSelections().SetLanguage(ELangEnglish);
+ app->UserSelections().SetDrive(2);
+
+ if(EAddEntry == f)
+ {
+ TRAP(err, Server().RegistrySession().AddEntryL(*app, ptrControllerData, transactionID));
+ }
+ else
+ {
+ TRAP(err, Server().RegistrySession().UpdateEntryL(*app, ptrControllerData, transactionID));
+ }
+ CleanupStack::PopAndDestroy(4, controllerData); // controllerData, desProvider, controller, app
+ break;
+ }
+ case EDeleteEntry:
+ {
+ // Get Uid and index
+ // Augmentation index - argument 0
+ TInt packageIndex = aMessage.Int0();
+
+ // Uid (ipc argument 1)
+ TUid uid;
+ TPckg<TUid> packageUid(uid);
+ aMessage.ReadL(1, packageUid);
+
+ // Invoke SisRegistry server API using SisRegistryClient
+ Swi::CSisRegistryPackage* package = Swi::CSisRegistryPackage::NewLC(uid, KNullDesC, KNullDesC); // For the delete API, the name and the vendor of the package are irrelevant
+ package->SetIndex(packageIndex);
+ TRAP(err, Server().RegistrySession().DeleteEntryL(*package, transactionID));
+
+ CleanupStack::PopAndDestroy(package);
+ break;
+ }
+ default:
+ {
+ PanicClient(aMessage, EPanicIllegalFunction);
+ break;
+ }
+ }
+
+ stsSession.CommitL();
+ CleanupStack::PopAndDestroy(&stsSession);
+
+ Server().RegistrySession().CommitTransactionL();
+
TPckg<TInt> timePckg(StopTimer(timer));
if(EDeleteEntry == f)
aMessage.WriteL(2, timePckg);