diff -r 675a964f4eb5 -r 35751d3474b7 cryptomgmtlibs/securityutils/test/trecog/trecogserver.cpp
--- a/cryptomgmtlibs/securityutils/test/trecog/trecogserver.cpp	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptomgmtlibs/securityutils/test/trecog/trecogserver.cpp	Thu Sep 10 14:01:51 2009 +0300
@@ -1,121 +1,119 @@
-/*
-* Copyright (c) 2005-2009 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-
-/**
- @file
- @internalComponent - Internal Symbian test code 
-*/
-
-
-#include "trecogserver.h"
-#include "trecogstep.h"
-
-CRecogServer* CRecogServer::NewL()
-/**
-   @return - Instance of the test server
-   Same code for Secure and non-secure variants
-   Called inside the MainL() function to create and start the
-   CTestServer derived server.
- */
-	{
-	CRecogServer * server = new (ELeave) CRecogServer();
-	CleanupStack::PushL(server);
-	// CServer base class call
-	TParsePtrC serverName(RProcess().FileName());	
-	server->StartL(serverName.Name());
-	CleanupStack::Pop(server);
-	return server;
-	}
-
-// __EDIT_ME__ - Use your own server class name
-CTestStep* CRecogServer::CreateTestStep(const TDesC& aStepName)
-/**
-   @return - A CTestStep derived instance
-   Secure and non-secure variants
-   Implementation of CTestServer pure virtual
- */
-	{
-	CTestStep* testStep = NULL;
-	// User::After(TTimeIntervalMicroSeconds32(5000000));
-	// This server creates just one step but create as many as you want
-	// They are created "just in time" when the worker thread is created 
-	
-
-	if(aStepName == KRecogStep)
-		{
-		testStep = new CRecogStep();
-		}
-	
-	return testStep;
-	}
-
-// EKA2 much simpler
-// Just an E32Main and a MainL()
-LOCAL_C void MainL()
-/**
-   Much simpler, uses the new Rendezvous() call to sync with the client
- */
-	{
-	// Leave the hooks in for platform security
-#if (defined __DATA_CAGING__)
-	RProcess().DataCaging(RProcess::EDataCagingOn);
-	RProcess().SecureApi(RProcess::ESecureApiOn);
-#endif
-	CActiveScheduler* sched=NULL;
-	sched=new(ELeave) CActiveScheduler;
-	CActiveScheduler::Install(sched);
-	CRecogServer* server = NULL;
-	// Create the CTestServer derived server
-	TRAPD(err,server = CRecogServer::NewL());;
-	
-	if(!err)
-		{
-		// Sync with the client and enter the active scheduler
-		RProcess::Rendezvous(KErrNone);
-		sched->Start();
-		}
-	delete server;
-	delete sched;
-	}
-
-// Only a DLL on emulator for typhoon and earlier
-GLDEF_C TInt E32Main()
-/**
-   @return - Standard Epoc error code on exit
- */
-	{
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if(cleanup == NULL)
-		{
-		return KErrNoMemory;
-		}
-	TRAPD(err,MainL());
-	// This if statement is here just to shut up RVCT, which would otherwise warn
-	// that err was set but never used
-	if (err)
-	    {
-	    err = KErrNone;
-	    }
-	delete cleanup;
-	return KErrNone;
-    }
-
-// Create a thread in the calling process
-// Emulator typhoon and earlier
+/*
+* Copyright (c) 2005-2009 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".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code 
+*/
+
+
+#include "trecogserver.h"
+#include "trecogstep.h"
+
+CRecogServer* CRecogServer::NewL()
+/**
+   @return - Instance of the test server
+   Same code for Secure and non-secure variants
+   Called inside the MainL() function to create and start the
+   CTestServer derived server.
+ */
+	{
+	CRecogServer * server = new (ELeave) CRecogServer();
+	CleanupStack::PushL(server);
+	// CServer base class call
+	TParsePtrC serverName(RProcess().FileName());	
+	server->StartL(serverName.Name());
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// __EDIT_ME__ - Use your own server class name
+CTestStep* CRecogServer::CreateTestStep(const TDesC& aStepName)
+/**
+   @return - A CTestStep derived instance
+   Secure and non-secure variants
+   Implementation of CTestServer pure virtual
+ */
+	{
+	CTestStep* testStep = NULL;
+	// User::After(TTimeIntervalMicroSeconds32(5000000));
+	// This server creates just one step but create as many as you want
+	// They are created "just in time" when the worker thread is created 
+	
+
+	if(aStepName == KRecogStep)
+		{
+		testStep = new CRecogStep();
+		}
+	
+	return testStep;
+	}
+
+// EKA2 much simpler
+// Just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+   Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	CRecogServer* server = NULL;
+	// Create the CTestServer derived server
+	TRAPD(err,server = CRecogServer::NewL());;
+	
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+// Only a DLL on emulator for typhoon and earlier
+GLDEF_C TInt E32Main()
+/**
+   @return - Standard Epoc error code on exit
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAPD(err,MainL());
+	// This if statement is here just to shut up RVCT, which would otherwise warn
+	// that err was set but never used
+	if (err)
+	    {
+	    err = KErrNone;
+	    }
+	delete cleanup;
+	return KErrNone;
+    }
+
+// Create a thread in the calling process
+// Emulator typhoon and earlier