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

Merge ServiceManager and ComponentManager. Bug 96457. r=dp@netscape.com, sr=wat

Browse Source 
erson@netscape.com


git-svn-id: svn://10.0.0.236/trunk@102449 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
2001-09-06 21:13:11 +00:00
parent 8b0885ab65
commit 6abd1d51a4
46 changed files with 1167 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
mozilla/xpcom/proxy/src/nsProxyEvent.cpp
View File

@@ -40,7 +40,7 @@
#include "prmem.h"
#include "xptcall.h"
#include "nsRepository.h"
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsMemory.h"
#include "nsIEventQueueService.h"
@@ -403,20 +403,41 @@ nsProxyObject::Post( PRUint32 methodIndex, nsXPTMethodInfo *methodInfo, nsXPTCMi
if (methodInfo->IsNotXPCOM())
return NS_ERROR_PROXY_INVALID_IN_PARAMETER;
PLEvent *event = PR_NEW(PLEvent);
if (event == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
nsXPTCVariant *fullParam;
uint8 paramCount;
rv = convertMiniVariantToVariant(methodInfo, params, &fullParam, &paramCount);
if (NS_FAILED(rv))
{
PR_DELETE(event);
return rv;
PRBool callDirectly;
// see if we should call into the method directly. Either it is a QI function call
// (methodIndex == 0), or it is a sync proxy and this code is running on the same thread
// as the destination event queue.
if ( (methodIndex == 0) ||
(mProxyType & PROXY_SYNC &&
NS_SUCCEEDED(mDestQueue->IsQueueOnCurrentThread(&callDirectly)) &&
callDirectly))
{
// invoke the magic of xptc...
nsresult rv = XPTC_InvokeByIndex( mRealObject,
methodIndex,
paramCount,
fullParam);
if (fullParam)
free(fullParam);
return rv;
}
PLEvent *event = PR_NEW(PLEvent);
if (event == nsnull) {
if (fullParam)
free(fullParam);
return NS_ERROR_OUT_OF_MEMORY;
}
nsProxyObjectCallInfo *proxyInfo = new nsProxyObjectCallInfo(this,
@@ -426,11 +447,10 @@ nsProxyObject::Post( PRUint32 methodIndex, nsXPTMethodInfo *methodInfo, nsXPTCMi
paramCount,
event); // will be deleted by ~()
if (proxyInfo == nsnull)
{
if (proxyInfo == nsnull) {
PR_DELETE(event);
if (fullParam)
free(fullParam); // allocated with malloc
free(fullParam);
return NS_ERROR_OUT_OF_MEMORY;
}
@@ -441,25 +461,10 @@ nsProxyObject::Post( PRUint32 methodIndex, nsXPTMethodInfo *methodInfo, nsXPTCMi
if (mProxyType & PROXY_SYNC)
{
PRBool callDirectly;
mDestQueue->IsQueueOnCurrentThread(&callDirectly);
if (callDirectly)
{
EventHandler(event);
PL_DestroyEvent(event);
// there is no need to call the DestroyHandler() because
// there is no need to wake up the nested event loop.
}
else
{
rv = PostAndWait(proxyInfo);
if (NS_FAILED(rv))
return rv;
}
rv = PostAndWait(proxyInfo);
rv = proxyInfo->GetResult();
if (NS_SUCCEEDED(rv))
rv = proxyInfo->GetResult();
delete proxyInfo;
return rv;
}