FCL/sf/mw/securitysrv: comparison wim/WimServer/src/WimServer.cpp

equal deleted inserted replaced

-:d5423fbb4f29
+:3b17fc5c9564
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include    <e32property.h>     // RProperty
 #include    <PSVariables.h>     // Property values
 #ifdef WIMSERVER_SHUTDOWN
 const TInt KServerShutdownDelay = 0x200000;
 #endif
 // Initialize static variables. These variables are static because static
 // callback functions in CWimCallBack.
 CWimServer* CWimServer::iWimServer = NULL;
 TInt CWimServer::iWimStatus = KErrNone;
 static void StartServerL()
 {
 _WIMTRACE(_L("WIM | WIMServer | StartServer | Enter"));
 User::LeaveIfError( User::RenameThread( KWIMServerName ) );
 _WIMTRACE(_L("WIM | WIMServer | StartServer | Create AS"));
 CActiveScheduler* s = new(ELeave) CActiveScheduler;
 CleanupStack::PushL( s );
 CActiveScheduler::Install( s );
 _WIMTRACE(_L("WIM | WIMServer | StartServer | Create server"));
 CWimServer::NewL();
 _WIMTRACE(_L("WIM | WIMServer | StartServer | Notify client"));
 // Notify Client that server has starter
 RProcess::Rendezvous( KErrNone );
 _WIMTRACE(_L("WIM | WIMServer | StartServer | Start ActiveScheduler"));
 CActiveScheduler::Start();
 CleanupStack::PopAndDestroy( s );
 }
 // -----------------------------------------------------------------------------
 //
 GLDEF_C TInt E32Main()
 {
 __UHEAP_MARK;
 _WIMTRACE(_L("WIM | WIMServer | E32Main | Begin"));
 CTrapCleanup* cleanup=CTrapCleanup::New();
 TInt r=KErrNoMemory;
 if ( cleanup )
 {
 TRAP( r, StartServerL() );
 delete cleanup;
 }
 _WIMTRACE(_L("WIM | WIMServer | E32Main Memory leak checking line"));
 __UHEAP_MARKEND;
 _WIMTRACE(_L("WIM | WIMServer | E32Main Memory checking passed"));
 return r;
 }
 iWimServer = this;
 InitializeCallbackFunctions();  // Initialize WIMI callback functions
 iWimSessionRegistry = CWimSessionRegistry::NewL();
 iWimTrustSettingsStore = CWimTrustSettingsStore::NewL();
 iWimTimer = CWimTimer::NewL( this );
 #ifdef WIMSERVER_SHUTDOWN
 iShutdown.ConstructL();
 iShutdown.Start();
 #endif
 _WIMTRACE(_L("WIM | WIMServer | CWimServer::ConstructL | End"));
 }
 // -----------------------------------------------------------------------------
 // CWimServer::NewL
 if ( iWimInitialized )
 {
 WIMI_CloseDownReq();
 _WIMTRACE(_L("WIM | WIMServer | CWimServer::~CWimServer | WIMI_CloseDownReq"));
 }
-//iWimTrustSettingsStore->CloseD();
 delete iWimTrustSettingsStore;
 delete iWimSessionRegistry;
 delete iWimTimer;
 CWimCallBack::DeletegApdu();
 _WIMTRACE(_L("WIM | WIMServer | CWimServer::~CWimServer | delete iWimSessionRegistry"));
 // -----------------------------------------------------------------------------
 // CWimServer::SetWimInitialized
 // Set iWimInitialized flag
 // -----------------------------------------------------------------------------
 //
-void CWimServer::SetWimInitialized( TBool aInitialized, TInt aStatus )
+void CWimServer::SetWimInitialized( TBool aInitialized, TInt aWimStatus )
 {
 _WIMTRACE2(_L("WIM|WIMServer|CWimServer::SetWimInitialized|Value=%d"), aInitialized);
 iWimInitialized = aInitialized;
 if ( !aInitialized )
 {
-iWimStatus = aStatus;
+iWimStatus = aWimStatus;
 }
 }
 // -----------------------------------------------------------------------------
 // CWimServer::NewSessionL
 // -----------------------------------------------------------------------------
 //
 void CWimServer::PanicServer( TWimServerPanic aPanic )
 {
 _WIMTRACE(_L("WIM | WIMServer | CWimServer::PanicServer | Begin"));
-// Set server state to EWimServerNotRunning
-TInt retVal = RProperty::Set( KUidSystemCategory,
+// Set server state to EWimServerNotRunning.
-KWimServerUid.iUid,
+(void)RProperty::Set( KUidSystemCategory, KWimServerUid.iUid, EWimServerNotRunning );
-EWimServerNotRunning );
-retVal = retVal; // To prevent warning
 User::Panic( KWIMServerName, aPanic );
 }
 // -----------------------------------------------------------------------------
 if( callStatus != WIMI_Ok )
 {
 	return callStatus;
 }
 free_WIMI_RefList_t( clicertRefList );
 if ( clicertCount > 0 )
 {
 	usage = WIMI_CU_Client;
 }
 else
 {
 	TUint8 cacertCount = 0;
 WIMI_RefList_t cacertRefList = NULL;
 callStatus = WIMI_GetCertificateListByKeyHash( ( TUint8* ) keyIdBuf.Ptr(),
 WIMI_CU_CA,
 &cacertCount,
 &cacertRefList );
 if ( callStatus != WIMI_Ok )
 else
 {
 	aMsg.Complete( KErrBadHandle );
 }
 }
 aUsage = static_cast< TUint8 >( usage );
 _WIMTRACE2(_L("CWimServer::ResolveExportPublicReqL | End, heap=%d"),
 User::CountAllocCells());
 iRefreshNotificationReceived = aValue;
 }
 // -----------------------------------------------------------------------------
 // CWimServer::TimerExpired()
-// Interface derived from
+// Interface derived from MWimTimerListener
 // -----------------------------------------------------------------------------
 //
 void CWimServer::TimerExpired()
 {
 _WIMTRACE(_L("WIM | WIMServer | CWimServer::TimerExpired | Begin"));
 WIMI_Ref_pt pWimRefTemp = NULL;
 pWimRefTemp = WIMI_GetWIMRef( 0 );
 if ( pWimRefTemp )  // Close the WIM
 {
 WIMI_CloseWIM( pWimRefTemp );
 free_WIMI_Ref_t( pWimRefTemp );
 }
-//SetWimInitialized( EFalse );
 }
 // -----------------------------------------------------------------------------
 // CWimServer::WimTimer()
 // Return the pointer of Timer
 // -----------------------------------------------------------------------------
 //
 CWimTimer* CWimServer::WimTimer()
 {
 _WIMTRACE(_L("WIM | WIMServer | CWimServer::WimTimer | Begin"));
 return iWimTimer;
 }
 // -----------------------------------------------------------------------------
 // CWimServer::CancelWimInitialize()
 // Cancel Wim Initialize
 // -----------------------------------------------------------------------------
 //
 void CWimServer::CancelWimInitialize( const RMessage2& aMessage )
 {
 	 if ( !iWimInitialized )
 		 {
 		 CWimCallBack::CancelWimInitialize();
 		 }
 	aMessage.Complete( KErrNone );
 }
 #ifdef WIMSERVER_SHUTDOWN

branch	RCL_3
changeset 5	3b17fc5c9564
parent 0	164170e6151a
child 42	82671cd8994b