fune/xpcom/components/nsComponentManagerUtils.cpp
Andrew McCreight c8c5c819df Bug 1514936, part 1 - Remove the outer argument to nsIFactory::createInstance. r=xpcom-reviewers,preferences-reviewers,nika,Gijs
This patch won't actually build, because a few bits of code are used
for both nsIFactory::createInstance and static components, and static
components are not fixed until the next patch.

The first place is nsLoadGroupConstructor, which uses an nsIFactory
macro to create a static component constructor. (This could be worked
around by expanding the macro to the state before this patch.)

The other issue is that nsAppShellConstructor is used in an nsIFactory
on OSX, but as a static component on all other platforms. This could
be worked around by wrapping nsAppShellConstructor in an adaptor that
passes in the extra null argument to nsAppShellConstructor.

Differential Revision: https://phabricator.services.mozilla.com/D146456
2022-05-17 20:24:19 +00:00

259 lines
7.4 KiB
C++

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef nsXPCOM_h__
# include "nsXPCOM.h"
#endif
#ifndef nsCOMPtr_h__
# include "nsCOMPtr.h"
#endif
#include "nsComponentManagerUtils.h"
#include "nsServiceManagerUtils.h"
#include "nsIComponentManager.h"
#ifndef MOZILLA_INTERNAL_API
nsresult CallGetService(const nsCID& aCID, const nsIID& aIID, void** aResult) {
nsCOMPtr<nsIServiceManager> servMgr;
nsresult status = NS_GetServiceManager(getter_AddRefs(servMgr));
if (servMgr) {
status = servMgr->GetService(aCID, aIID, aResult);
}
return status;
}
nsresult CallGetService(const char* aContractID, const nsIID& aIID,
void** aResult) {
nsCOMPtr<nsIServiceManager> servMgr;
nsresult status = NS_GetServiceManager(getter_AddRefs(servMgr));
if (servMgr) {
status = servMgr->GetServiceByContractID(aContractID, aIID, aResult);
}
return status;
}
#else
# include "nsComponentManager.h"
nsresult CallGetService(const nsCID& aCID, const nsIID& aIID, void** aResult) {
nsComponentManagerImpl* compMgr = nsComponentManagerImpl::gComponentManager;
if (!compMgr) {
return NS_ERROR_NOT_INITIALIZED;
}
return compMgr->nsComponentManagerImpl::GetService(aCID, aIID, aResult);
}
nsresult CallGetService(const char* aContractID, const nsIID& aIID,
void** aResult) {
nsComponentManagerImpl* compMgr = nsComponentManagerImpl::gComponentManager;
if (!compMgr) {
return NS_ERROR_NOT_INITIALIZED;
}
return compMgr->nsComponentManagerImpl::GetServiceByContractID(aContractID,
aIID, aResult);
}
#endif
#ifndef MOZILLA_INTERNAL_API
nsresult CallCreateInstance(const nsCID& aCID, const nsIID& aIID,
void** aResult) {
nsCOMPtr<nsIComponentManager> compMgr;
nsresult status = NS_GetComponentManager(getter_AddRefs(compMgr));
if (compMgr) {
status = compMgr->CreateInstance(aCID, aIID, aResult);
}
return status;
}
nsresult CallCreateInstance(const char* aContractID, const nsIID& aIID,
void** aResult) {
nsCOMPtr<nsIComponentManager> compMgr;
nsresult status = NS_GetComponentManager(getter_AddRefs(compMgr));
if (compMgr)
status = compMgr->CreateInstanceByContractID(aContractID, aIID, aResult);
return status;
}
nsresult CallGetClassObject(const nsCID& aCID, const nsIID& aIID,
void** aResult) {
nsCOMPtr<nsIComponentManager> compMgr;
nsresult status = NS_GetComponentManager(getter_AddRefs(compMgr));
if (compMgr) {
status = compMgr->GetClassObject(aCID, aIID, aResult);
}
return status;
}
nsresult CallGetClassObject(const char* aContractID, const nsIID& aIID,
void** aResult) {
nsCOMPtr<nsIComponentManager> compMgr;
nsresult status = NS_GetComponentManager(getter_AddRefs(compMgr));
if (compMgr)
status = compMgr->GetClassObjectByContractID(aContractID, aIID, aResult);
return status;
}
#else
# include "nsComponentManager.h"
nsresult CallCreateInstance(const nsCID& aCID, const nsIID& aIID,
void** aResult) {
nsComponentManagerImpl* compMgr = nsComponentManagerImpl::gComponentManager;
if (NS_WARN_IF(!compMgr)) {
return NS_ERROR_NOT_INITIALIZED;
}
return compMgr->nsComponentManagerImpl::CreateInstance(aCID, aIID, aResult);
}
nsresult CallCreateInstance(const char* aContractID, const nsIID& aIID,
void** aResult) {
nsComponentManagerImpl* compMgr = nsComponentManagerImpl::gComponentManager;
if (NS_WARN_IF(!compMgr)) {
return NS_ERROR_NOT_INITIALIZED;
}
return compMgr->nsComponentManagerImpl::CreateInstanceByContractID(
aContractID, aIID, aResult);
}
nsresult CallGetClassObject(const nsCID& aCID, const nsIID& aIID,
void** aResult) {
nsComponentManagerImpl* compMgr = nsComponentManagerImpl::gComponentManager;
if (NS_WARN_IF(!compMgr)) {
return NS_ERROR_NOT_INITIALIZED;
}
return compMgr->nsComponentManagerImpl::GetClassObject(aCID, aIID, aResult);
}
nsresult CallGetClassObject(const char* aContractID, const nsIID& aIID,
void** aResult) {
nsComponentManagerImpl* compMgr = nsComponentManagerImpl::gComponentManager;
if (NS_WARN_IF(!compMgr)) {
return NS_ERROR_NOT_INITIALIZED;
}
return compMgr->nsComponentManagerImpl::GetClassObjectByContractID(
aContractID, aIID, aResult);
}
#endif
nsresult nsCreateInstanceByCID::operator()(const nsIID& aIID,
void** aInstancePtr) const {
nsresult status = CallCreateInstance(mCID, aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
if (mErrorPtr) {
*mErrorPtr = status;
}
return status;
}
nsresult nsCreateInstanceByContractID::operator()(const nsIID& aIID,
void** aInstancePtr) const {
nsresult status = CallCreateInstance(mContractID, aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
if (mErrorPtr) {
*mErrorPtr = status;
}
return status;
}
nsresult nsCreateInstanceFromFactory::operator()(const nsIID& aIID,
void** aInstancePtr) const {
nsresult status = mFactory->CreateInstance(aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
if (mErrorPtr) {
*mErrorPtr = status;
}
return status;
}
nsresult nsGetClassObjectByCID::operator()(const nsIID& aIID,
void** aInstancePtr) const {
nsresult status = CallGetClassObject(mCID, aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
if (mErrorPtr) {
*mErrorPtr = status;
}
return status;
}
nsresult nsGetClassObjectByContractID::operator()(const nsIID& aIID,
void** aInstancePtr) const {
nsresult status = CallGetClassObject(mContractID, aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
if (mErrorPtr) {
*mErrorPtr = status;
}
return status;
}
nsresult nsGetServiceByCID::operator()(const nsIID& aIID,
void** aInstancePtr) const {
nsresult status = CallGetService(mCID, aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
return status;
}
nsresult nsGetServiceByCIDWithError::operator()(const nsIID& aIID,
void** aInstancePtr) const {
nsresult status = CallGetService(mCID, aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
if (mErrorPtr) {
*mErrorPtr = status;
}
return status;
}
nsresult nsGetServiceByContractID::operator()(const nsIID& aIID,
void** aInstancePtr) const {
nsresult status = CallGetService(mContractID, aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
return status;
}
nsresult nsGetServiceByContractIDWithError::operator()(
const nsIID& aIID, void** aInstancePtr) const {
nsresult status = CallGetService(mContractID, aIID, aInstancePtr);
if (NS_FAILED(status)) {
*aInstancePtr = 0;
}
if (mErrorPtr) {
*mErrorPtr = status;
}
return status;
}