Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converting to generic module.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@68357 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dp%netscape.com 2000-05-05 05:59:42 +00:00
parent ee7b3f74e5
commit 42ce4ccd0f
2 changed files with 18 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
mozilla/xpcom/appshell/eventloop/xp/nsCLoopModule.cpp
View File

@ -21,86 +21,17 @@
*/
#include "nsIGenericFactory.h"
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsCAppLoop.h"
#include "nsCThreadLoop.h"
#include "nsCBreathLoop.h"
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kEventLoopAppCID, NS_EVENTLOOP_APP_CID);
static NS_DEFINE_CID(kEventLoopThreadCID, NS_EVENTLOOP_THREAD_CID);
static NS_DEFINE_CID(kEventLoopBreathCID, NS_EVENTLOOP_BREATH_CID);
//*****************************************************************************
//*** Library Exports
//*****************************************************************************
extern "C" PR_IMPLEMENT(nsresult)
NSGetFactory(nsISupports* aServMgr,
const nsCID &aClass,
const char *aClassName,
const char *aProgID,
nsIFactory **aFactory)
static nsModuleComponentInfo components[] =
{
NS_ENSURE_ARG_POINTER(aFactory);
nsresult rv;
{ "Native App Service", NS_EVENTLOOP_APP_CID, NS_EVENTLOOP_APP_PROGID,
nsCAppLoop::Create
},
{ "Native App Service", NS_EVENTLOOP_THREAD_CID, NS_EVENTLOOP_THREAD_PROGID,
nsCThreadLoop::Create
},
{ "Native App Service", NS_EVENTLOOP_BREATH_CID, NS_EVENTLOOP_BREATH_PROGID,
nsCBreathLoop::Create
}
};
nsIGenericFactory* fact;
if(aClass.Equals(kEventLoopAppCID))
rv = NS_NewGenericFactory(&fact, nsCAppLoop::Create);
else if(aClass.Equals(kEventLoopThreadCID))
rv = NS_NewGenericFactory(&fact, nsCThreadLoop::Create);
else if(aClass.Equals(kEventLoopBreathCID))
rv = NS_NewGenericFactory(&fact, nsCBreathLoop::Create);
else
rv = NS_NOINTERFACE;
if(NS_SUCCEEDED(rv))
*aFactory = fact;
return rv;
}
extern "C" PR_IMPLEMENT(nsresult)
NSRegisterSelf(nsISupports* aServMgr , const char* aPath)
{
nsresult rv;
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = compMgr->RegisterComponent(kEventLoopAppCID,
"Native App Service",
NS_EVENTLOOP_APP_PROGID,
aPath, PR_TRUE, PR_TRUE);
NS_ENSURE_SUCCESS(rv, rv);
rv = compMgr->RegisterComponent(kEventLoopThreadCID,
"Native App Service",
NS_EVENTLOOP_THREAD_PROGID,
aPath, PR_TRUE, PR_TRUE);
NS_ENSURE_SUCCESS(rv, rv);
rv = compMgr->RegisterComponent(kEventLoopBreathCID,
"Native App Service",
NS_EVENTLOOP_BREATH_PROGID,
aPath, PR_TRUE, PR_TRUE);
NS_ENSURE_SUCCESS(rv, rv);
return rv;
}
extern "C" PR_IMPLEMENT(nsresult)
NSUnregisterSelf(nsISupports* aServMgr, const char* aPath)
{
nsresult rv;
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = compMgr->UnregisterComponent(kEventLoopAppCID, aPath);
rv = compMgr->UnregisterComponent(kEventLoopThreadCID, aPath);
rv = compMgr->UnregisterComponent(kEventLoopBreathCID, aPath);
return rv;
}
NS_IMPL_NSGETMODULE("nsNativeAppModule", components)

65
mozilla/xpcom/appshell/nativeApp/nsCNativeAppModule.cpp
View File

@ -21,65 +21,12 @@
*/
#include "nsIGenericFactory.h"
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsCNativeAppImpl.h"
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kNativeAppCID, NS_NATIVE_APP_CID);
//*****************************************************************************
//*** Library Exports
//*****************************************************************************
extern "C" PR_IMPLEMENT(nsresult)
NSGetFactory(nsISupports* aServMgr,
const nsCID &aClass,
const char *aClassName,
const char *aProgID,
nsIFactory **aFactory)
static nsModuleComponentInfo components[] =
{
NS_ENSURE_ARG_POINTER(aFactory);
nsresult rv;
{ "Native App Service", NS_NATIVE_APP_CID, NS_NATIVE_APP_PROGID,
nsCNativeAppImpl::Create
}
};
nsIGenericFactory* fact;
if(aClass.Equals(kNativeAppCID))
rv = NS_NewGenericFactory(&fact, nsCNativeAppImpl::Create);
else
rv = NS_NOINTERFACE;
if(NS_SUCCEEDED(rv))
*aFactory = fact;
return rv;
}
extern "C" PR_IMPLEMENT(nsresult)
NSRegisterSelf(nsISupports* aServMgr , const char* aPath)
{
nsresult rv;
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = compMgr->RegisterComponent(kNativeAppCID,
"Native App Service",
NS_NATIVE_APP_PROGID,
aPath, PR_TRUE, PR_TRUE);
NS_ENSURE_SUCCESS(rv, rv);
return rv;
}
extern "C" PR_IMPLEMENT(nsresult)
NSUnregisterSelf(nsISupports* aServMgr, const char* aPath)
{
nsresult rv;
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = compMgr->UnregisterComponent(kNativeAppCID, aPath);
NS_ENSURE_SUCCESS(rv, rv);
return rv;
}
NS_IMPL_NSGETMODULE("nsCNativeAppModule", components)