mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug #5633 -- use NS_WITH_SERVICE macro. Also cleaned up goto statements such that if we fail to register or unregister a component, we try to register/unregister the rest of the components before giving up. We still return the last failure error code though.

This commit is contained in:
mscott%netscape.com 1999-06-04 23:56:20 +00:00
Родитель 365b822bb1
Коммит 657ece55cf
1 изменённых файлов: 22 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

52
mailnews/compose/build/nsMsgCompFactory.cpp
Просмотреть файл

@ -218,104 +218,96 @@ extern "C" NS_EXPORT PRBool NSCanUnload(nsISupports* aServMgr)
extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv;
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
nsIComponentManager* compMgr;
rv = servMgr->GetService(kComponentManagerCID,
nsIComponentManager::GetIID(),
(nsISupports**)&compMgr);
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
// register the message compose factory
rv = compMgr->RegisterComponent(kCSmtpServiceCID,
"SMTP Service", nsnull,
path, PR_TRUE, PR_TRUE);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->RegisterComponent(kCMsgCompFieldsCID,
"Compose Fields",
nsnull, path, PR_TRUE, PR_TRUE);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->RegisterComponent(kCMsgSendCID,
"Message Send",
nsnull, path, PR_TRUE, PR_TRUE);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->RegisterComponent(kCMsgComposeCID,
"Message Compose",
nsnull,
path, PR_TRUE, PR_TRUE);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->RegisterComponent(kCComposerCID,
"Message Composer",
"component://netscape/composer/application",
path, PR_TRUE, PR_TRUE);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->RegisterComponent(kCComposerBootstrapCID,
"Netscape Composer Bootstrapper",
"component://netscape/composer",
path,
PR_TRUE, PR_TRUE);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->RegisterComponent(kCComposeAppCoreCID,
"Composer AppCore",
"component://netscape/appcores/composer",
path,
PR_TRUE, PR_TRUE);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
#ifdef NS_DEBUG
printf("composer registering from %s\n",path);
#endif
done:
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;
return finalResult;
}
extern "C" NS_EXPORT nsresult
NSUnregisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv;
nsresult finalResult = NS_OK;
nsresult rv = NS_OK;
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
nsIComponentManager* compMgr;
rv = servMgr->GetService(kComponentManagerCID,
nsIComponentManager::GetIID(),
(nsISupports**)&compMgr);
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kCComposeAppCoreCID, path);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->UnregisterComponent(kCComposerBootstrapCID, path);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->UnregisterComponent(kCComposerCID, path);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->UnregisterComponent(kCMsgComposeCID, path);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv))finalResult = rv;
rv = compMgr->UnregisterComponent(kCMsgSendCID, path);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->UnregisterComponent(kCMsgCompFieldsCID, path);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
rv = compMgr->UnregisterComponent(kCSmtpServiceCID, path);
if (NS_FAILED(rv)) goto done;
if (NS_FAILED(rv)) finalResult = rv;
done:
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;
return finalResult;
}