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

*not part of the build*

Browse Source 
fix for 93888
a = ovk@sparc.spb.su
    jonsmirl@mediaone.net
r = jaggernaut@netscape.com
    idk@eng.sun.com


git-svn-id: svn://10.0.0.236/trunk@101787 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
idk%eng.sun.com
2001-08-25 01:32:15 +00:00
parent 4f4514acd4
commit ad7d96c999
7 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/java/xpcom/java/components/bcBlackConnectInit.cpp
View File

@@ -27,8 +27,6 @@
#include "bcXPCOMWrappersCID.h"
NS_DEFINE_CID(kXPCOMWrappers,BC_XPCOMWRAPPERS_CID);
extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *compMgr,
nsIFile *location,
nsIModule** result) //I am using it for initialization only
@@ -49,14 +47,14 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *compMgr,
if (NS_SUCCEEDED(r)) {
blackConnectInit->InitComponentManager(cm);
}
NS_WITH_SERVICE(bcIXPCOMWrappers,xpcomWrappers,kXPCOMWrappers,&r);
nsCOMPtr<bcIXPCOMWrappers> xpcomWrappers = do_GetService(BC_XPCOMWRAPPERS_CONTRACTID, &r);
nsIID * wrapperIID;
if (NS_SUCCEEDED(r)) {
r = xpcomWrappers->GetWrapper((nsISupports*)NULL,NS_GET_IID(nsIServiceManager),&wrapperIID, (nsISupports**)&sm);
if (NS_SUCCEEDED(r)) {
printf("--[c++]about to call blackConnectInit->InitServiceManager(sm)\n");
blackConnectInit->InitServiceManager(sm);
}
if (NS_SUCCEEDED(r)) {
printf("--[c++]about to call blackConnectInit->InitServiceManager(sm)\n");
blackConnectInit->InitServiceManager(sm);
}
}
}
}

11
mozilla/java/xpcom/java/loader/bcJavaComponentFactory.cpp
View File

@@ -29,13 +29,8 @@
#include "bcIORBComponent.h"
#include "bcORBComponentCID.h"
static NS_DEFINE_CID(kJavaStubsAndProxies,BC_JAVASTUBSANDPROXIES_CID);
static NS_DEFINE_CID(kXPCOMStubsAndProxies,BC_XPCOMSTUBSANDPROXIES_CID);
static NS_DEFINE_CID(kORBComponent,BC_ORBCOMPONENT_CID);
NS_IMPL_THREADSAFE_ISUPPORTS1(bcJavaComponentFactory, nsIFactory)
bcJavaComponentFactory::bcJavaComponentFactory(const char *_location) {
NS_INIT_ISUPPORTS();
location = nsCRT::strdup(_location);
@@ -50,17 +45,17 @@ bcJavaComponentFactory::~bcJavaComponentFactory() {
NS_IMETHODIMP bcJavaComponentFactory::CreateInstance(nsISupports *aOuter, const nsIID & iid, void * *result) {
printf("--bcJavaComponentFactory::CreateInstance\n");
nsresult r;
NS_WITH_SERVICE(bcIJavaStubsAndProxies, javaStubsAndProxies, kJavaStubsAndProxies, &r);
nsCOMPtr<bcIJavaStubsAndProxies> javaStubsAndProxies = do_GetService(BC_JAVASTUBSANDPROXIES_ContractID, &r);
if (NS_FAILED(r)) {
printf("--bcJavaComponentFactory::CreateInstance javaStubsAndProxies failed \n");
return r;
}
NS_WITH_SERVICE(bcIXPCOMStubsAndProxies, xpcomStubsAndProxies, kXPCOMStubsAndProxies, &r);
nsCOMPtr<bcIXPCOMStubsAndProxies> xpcomStubsAndProxies = do_GetService(BC_XPCOMSTUBSANDPROXIES_ContractID, &r);
if (NS_FAILED(r)) {
printf("--bcJavaComponentFactory::CreateInstance xpcomStubsAndProxies failed \n");
return r;
}
NS_WITH_SERVICE(bcIORBComponent, _orb, kORBComponent, &r);
nsCOMPtr<bcIORBComponent> _orb = do_GetService(BC_ORBCOMPONENT_ContractID, &r);
if (NS_FAILED(r)) {
printf("--bcJavaComponentFactory::CreateInstance bcORB failed \n");
return r;

6
mozilla/java/xpcom/java/src/bcJavaMarshalToolkit.cpp
View File

@@ -92,8 +92,6 @@ jmethodID bcJavaMarshalToolkit::getClassMID = NULL;
#define double_map double
#define char_map PRInt16
static NS_DEFINE_CID(kJavaStubsAndProxies,BC_JAVASTUBSANDPROXIES_CID);
bcJavaMarshalToolkit::bcJavaMarshalToolkit(PRUint16 _methodIndex,
nsIInterfaceInfo *_interfaceInfo, jobjectArray _args, JNIEnv *_env, int isOnServer, bcIORB *_orb) {
env = _env;
@@ -373,7 +371,7 @@ bcJavaMarshalToolkit::MarshalElement(bcIMarshaler *m, jobject value, PRBool isO
EXCEPTION_CHECKING(env);
}
if (data != NULL) {
NS_WITH_SERVICE(bcJavaStubsAndProxies, javaStubsAndProxies, kJavaStubsAndProxies, &r);
nsCOMPtr<bcIJavaStubsAndProxies> javaStubsAndProxies = do_GetService(BC_JAVASTUBSANDPROXIES_ContractID,&r);
if (NS_FAILED(r)) {
return NS_ERROR_FAILURE;
}
@@ -607,7 +605,7 @@ bcJavaMarshalToolkit::UnMarshalElement(jobject *value, uint8 ind, bcIUnMarshaler
um->ReadSimple(&oid,type);
um->ReadSimple(&iid,bc_T_IID);
PR_LOG(log,PR_LOG_DEBUG,("%d oid\n",(int) oid));
NS_WITH_SERVICE(bcJavaStubsAndProxies, javaStubsAndProxies, kJavaStubsAndProxies, &r);
nsCOMPtr<bcIJavaStubsAndProxies> javaStubsAndProxies = do_GetService(BC_JAVASTUBSANDPROXIES_ContractID,&r);
if (NS_FAILED(r)) {
return NS_ERROR_FAILURE;
}

4
mozilla/java/xpcom/java/src/bcJavaStubsAndProxies.cpp
View File

@@ -41,8 +41,6 @@ jmethodID bcJavaStubsAndProxies::getInvocationHandlerID = 0;
jclass bcJavaStubsAndProxies::org_mozilla_xpcom_ProxyHandler = 0;
jmethodID bcJavaStubsAndProxies::getOIDID = 0;
NS_DEFINE_CID(kORBComponent,BC_ORBCOMPONENT_CID);
NS_GENERIC_FACTORY_CONSTRUCTOR(bcJavaStubsAndProxies);
static nsModuleComponentInfo components[] =
@@ -201,7 +199,7 @@ NS_IMETHODIMP bcJavaStubsAndProxies::GetOID(char *location, bcOID *oid) {
strcpy(location + strlen(location)-4,"info");
jobject object = env->CallStaticObjectMethod(componentLoader, loadComponentID, jstr);
bcIStub *stub = new bcJavaStub(object);
NS_WITH_SERVICE(bcIORBComponent,_orb,kORBComponent,&result);
nsCOMPtr<bcIORBComponent> _orb = do_GetService(BC_ORBCOMPONENT_ContractID,&result);
if (NS_FAILED(result)) {
PR_LOG(log,PR_LOG_DEBUG,("--bcJavaStubsAndProxies::GetOID failed\n"));
if (detachRequired) {

6
mozilla/java/xpcom/xpcom/bcXPCOMMarshalToolkit.cpp
View File

@@ -27,7 +27,6 @@
#include "nsCRT.h"
#include "bcXPCOMLog.h"
static NS_DEFINE_CID(kXPCOMStubsAndProxies,BC_XPCOMSTUBSANDPROXIES_CID);
static nsID nullID = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};
bcXPCOMMarshalToolkit::bcXPCOMMarshalToolkit(PRUint16 _methodIndex, nsIInterfaceInfo *_interfaceInfo,
@@ -292,7 +291,7 @@ nsresult bcXPCOMMarshalToolkit::MarshalElement(bcIMarshaler *m, void *data, nsXP
PR_LOG(log, PR_LOG_DEBUG, ("--[c++]XPCOMMarshallToolkit INTERFACE iid=%s\n",iid->ToString()));
bcOID oid = 0;
if (*(char**)data != NULL) {
NS_WITH_SERVICE(bcXPCOMStubsAndProxies, xpcomStubsAndProxies, kXPCOMStubsAndProxies, &r);
nsCOMPtr<bcIXPCOMStubsAndProxies> xpcomStubsAndProxies = do_GetService(BC_XPCOMSTUBSANDPROXIES_ContractID,&r);
if (NS_FAILED(r)) {
return r;
}
@@ -397,8 +396,7 @@ bcXPCOMMarshalToolkit::UnMarshalElement(void *data, bcIUnMarshaler *um, nsXPTPar
um->ReadSimple(&iid,bc_T_IID);
nsISupports *proxy = NULL;
if (oid != 0) {
NS_WITH_SERVICE(bcXPCOMStubsAndProxies, xpcomStubsAndProxies,
kXPCOMStubsAndProxies, &r);
nsCOMPtr<bcIXPCOMStubsAndProxies> xpcomStubsAndProxies = do_GetService(BC_XPCOMSTUBSANDPROXIES_ContractID, &r);
if (NS_FAILED(r)) {
return r;
}

3
mozilla/java/xpcom/xpcom/bcXPCOMProxy.cpp
View File

@@ -39,7 +39,6 @@
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_CID(kStubsAndProxies,BC_XPCOMSTUBSANDPROXIES_CID);
bcXPCOMProxy::bcXPCOMProxy(bcOID _oid, const nsIID &_iid, bcIORB *_orb) {
PRLogModuleInfo *log = bcXPCOMLog::GetLog();
@@ -106,7 +105,7 @@ NS_IMETHODIMP bcXPCOMProxy::CallMethod(PRUint16 methodIndex,
mt->Marshal(marshaler);
nsIEventQueue * eventQ;
nsCOMPtr<bcIXPCOMStubsAndProxies> stubsAndProxiesService;
stubsAndProxiesService = do_GetService(kStubsAndProxies);
stubsAndProxiesService = do_GetService(BC_XPCOMSTUBSANDPROXIES_ContractID);
stubsAndProxiesService->GetEventQueue(&eventQ);
if (eventQ == NULL) {
orb->SendReceive(call);

3
mozilla/java/xpcom/xpcom/bcXPCOMStub.cpp
View File

@@ -35,7 +35,6 @@
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_CID(kStubsAndProxies,BC_XPCOMSTUBSANDPROXIES_CID);
static void* PR_CALLBACK EventHandler(PLEvent *self);
@@ -111,7 +110,7 @@ void bcXPCOMStub::DispatchAndSaveThread(bcICall *call, nsIEventQueue *eventQueue
}
//push caller eventQ
nsCOMPtr<bcIXPCOMStubsAndProxies> stubsAndProxiesService;
stubsAndProxiesService = do_GetService(kStubsAndProxies);
stubsAndProxiesService = do_GetService(BC_XPCOMSTUBSANDPROXIES_ContractID);
stubsAndProxiesService->PushEventQueue(eventQueue);
if (mid == 2) { //Release
if (refCounter <= 0) {