Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-22 03:43:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*not part of the build*

Browse Source 
fix for 77579
r=yiming.chung@eng.sun.com
This commit is contained in:
idk%eng.sun.com 2001-06-02 04:44:35 +00:00
parent 770e473d23
commit 70a44612bc
1 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
java/plugins/src/PlugletEngine.cpp
View File

@ -51,8 +51,75 @@ PRLogModuleInfo* PlugletLog::log = NULL;
0xc1e694f3, 0x9be1, 0x11d3, { 0x83, 0x7c, 0x0, 0x4, 0xac, 0x56, 0xc4, 0x9e } \
}
#ifdef XP_PC
NS_GENERIC_FACTORY_CONSTRUCTOR(PlugletEngine)
#else //XP_PC
#include <dlfcn.h>
/*
* CheckForXTSymbol
* return value
* 1 - AWT will not complain
* 0 - AWT will not work
*
*/
int
CheckForXTSymbol(void)
{
Dl_info dlinfo;
void *v;
v = dlsym(RTLD_DEFAULT, "vendorShellWidgetClass");
if (v != NULL && dladdr(v, &dlinfo)) {
if (strstr(dlinfo.dli_fname, "libXt.so") != NULL) {
fprintf(stderr, "\nRuntime link error - it appears that "
"libXt got loaded before libXm,\n"
"which is not allowed for pluglets\n");
return 0;
}
}
return 1;
}
static NS_IMETHODIMP
PlugletEngineConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
{
nsresult rv;
PlugletEngine * inst;
if ( !CheckForXTSymbol() ) {
rv = NS_ERROR_FAILURE;
return rv;
}
if (NULL == aResult) {
rv = NS_ERROR_NULL_POINTER;
return rv;
}
*aResult = NULL;
if (NULL != aOuter) {
rv = NS_ERROR_NO_AGGREGATION;
return rv;
}
NS_NEWXPCOM(inst, PlugletEngine);
if (NULL == inst) {
rv = NS_ERROR_OUT_OF_MEMORY;
return rv;
}
NS_ADDREF(inst);
rv = inst->QueryInterface(aIID, aResult);
NS_RELEASE(inst);
return rv;
}
#endif //XP_PC
static nsModuleComponentInfo components[] =
{
{
@ -187,7 +254,7 @@ void PlugletEngine::StartJVM() {
JavaVMInitArgs vm_args;
JavaVMOption options[2];
char * classpathEnv = PR_GetEnv("CLASSPATH");
if (classpath != NULL) {
if (classpathEnv != NULL) {
sprintf(classpath, "-Djava.class.path=%s",classpathEnv);
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("PlugletEngine::StartJVM about to create JVM classpath=%s\n",classpath));