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

I now have the pluglet.dll XPCOM module loading. The reason it was not

Browse Source 
loading: it depends on jvm.dll, which was not on my path.  I had to add
%JDKHOME%\jre\bin\client to my path and now it loaded. Thanks to shaver
and plasticmillion on #developers for the tip to use depends.exe, the
Dependency Walker.  What a nice tool.

Of course, there is now a crash after it loads, which will be my next
step after this checkin.

A plugins/src/iPlugletEngine.idl
A plugins/src/iPlugletManager.idl

- make IDL files for our external interfaces.

M plugins/src/Makefile.in

- move PlugletEngine.cpp to the top of the list.

M plugins/src/PlugletEngine.cpp
M plugins/src/PlugletEngine.h

- big changes here.  Make this a proper generic XPCOM component.

- use the iPlugletManager interface, and the nsICategoryManager
  to make sure we get called at startup.

M plugins/src/Pluglet.cpp
M plugins/src/Pluglet.h
M plugins/src/PlugletFactory.cpp
M plugins/src/PlugletFactory.h
M plugins/src/PlugletInputStream.cpp
M plugins/src/PlugletInputStream.h
M plugins/src/PlugletLoader.cpp
M plugins/src/PlugletManager.cpp
M plugins/src/PlugletPeer.cpp
M plugins/src/PlugletStreamInfo.cpp
M plugins/src/PlugletStreamListener.cpp
M plugins/src/PlugletViewWindows.cpp
M plugins/src/PlugletsDir.cpp
M plugins/src/Registry.cpp

- remove static method PlugletEngine::GetJNIEnv, in favor of instance
  method and use of nsIServiceManager.


git-svn-id: svn://10.0.0.236/trunk@200339 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2006-06-19 18:50:01 +00:00
parent 2c0c62438e
commit 908f89a2bf
19 changed files with 779 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
mozilla/java/plugins/src/PlugletLoader.cpp
View File

@@ -19,24 +19,25 @@
* Contributor(s):
*/
#include "string.h"
#include "PlugletEngine.h"
#include "iPlugletEngine.h"
#include "PlugletLoader.h"
#include "PlugletLog.h"
#include "nsCOMPtr.h"
jclass PlugletLoader::clazz = NULL;
jmethodID PlugletLoader::getMIMEDescriptionMID = NULL;
jmethodID PlugletLoader::getPlugletMID = NULL;
jclass PlugletLoader::clazz = nsnull;
jmethodID PlugletLoader::getMIMEDescriptionMID = nsnull;
jmethodID PlugletLoader::getPlugletMID = nsnull;
//nb for debug only
static char *ToString(jobject obj,JNIEnv *env) {
static jmethodID toStringID = NULL;
static jmethodID toStringID = nsnull;
if (!toStringID) {
jclass clazz = env->FindClass("java/lang/Object");
toStringID = env->GetMethodID(clazz,"toString","()Ljava/lang/String;");
}
jstring jstr = (jstring) env->CallObjectMethod(obj,toStringID);
//nb check for jni exception
const char * str = env->GetStringUTFChars(jstr,NULL);
const char * str = env->GetStringUTFChars(jstr,nsnull);
//nb check for jni exception
char * res = new char[strlen(str)];
strcpy(res,str);
@@ -48,14 +49,24 @@ void PlugletLoader::Initialize(void) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("PlugletLoader::Initialize\n"));
//nb errors handling
JNIEnv * env = PlugletEngine::GetJNIEnv();
nsCOMPtr<iPlugletEngine> plugletEngine;
nsresult rv = iPlugletEngine::GetInstance(getter_AddRefs(plugletEngine));
if (NS_FAILED(rv)) {
return;
}
JNIEnv *env = nsnull;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
return;
}
if (!env) {
return;
}
clazz = env->FindClass("org/mozilla/pluglet/PlugletLoader");
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
clazz = NULL;
clazz = nsnull;
return;
}
clazz = (jclass) env->NewGlobalRef(clazz);
@@ -63,13 +74,13 @@ void PlugletLoader::Initialize(void) {
getMIMEDescriptionMID = env->GetStaticMethodID(clazz,"getMIMEDescription","(Ljava/lang/String;)Ljava/lang/String;");
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
clazz = NULL;
clazz = nsnull;
return;
}
getPlugletMID = env->GetStaticMethodID(clazz,"getPluglet","(Ljava/lang/String;)Lorg/mozilla/pluglet/PlugletFactory;");
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
clazz = NULL;
clazz = nsnull;
return;
}
}
@@ -77,7 +88,16 @@ void PlugletLoader::Initialize(void) {
void PlugletLoader::Destroy(void) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("PlugletLoader::destroy\n"));
JNIEnv * env = PlugletEngine::GetJNIEnv();
nsCOMPtr<iPlugletEngine> plugletEngine;
nsresult rv = iPlugletEngine::GetInstance(getter_AddRefs(plugletEngine));
if (NS_FAILED(rv)) {
return;
}
JNIEnv *env = nsnull;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
return;
}
if (env) {
env->DeleteGlobalRef(clazz);
}
@@ -89,23 +109,32 @@ char * PlugletLoader::GetMIMEDescription(const char * path) {
if (!clazz) {
Initialize();
if (!clazz) {
return NULL;
return nsnull;
}
}
JNIEnv * env = PlugletEngine::GetJNIEnv();
nsCOMPtr<iPlugletEngine> plugletEngine;
nsresult rv = iPlugletEngine::GetInstance(getter_AddRefs(plugletEngine));
if (NS_FAILED(rv)) {
return nsnull;
}
JNIEnv *env = nsnull;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
return nsnull;
}
jstring jpath = env->NewStringUTF(path);
//nb check for null
jstring mimeDescription = (jstring)env->CallStaticObjectMethod(clazz,getMIMEDescriptionMID,jpath);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
return NULL;
return nsnull;
}
if (!mimeDescription) {
return NULL;
return nsnull;
}
const char* str = env->GetStringUTFChars(mimeDescription,NULL);
char *res = NULL;
const char* str = env->GetStringUTFChars(mimeDescription,nsnull);
char *res = nsnull;
if(str) {
res = new char[strlen(str)+1];
strcpy(res,str);
@@ -121,10 +150,20 @@ jobject PlugletLoader::GetPluglet(const char * path) {
if (!clazz) {
Initialize();
if (!clazz) {
return NULL;
return nsnull;
}
}
JNIEnv * env = PlugletEngine::GetJNIEnv();
nsCOMPtr<iPlugletEngine> plugletEngine;
nsresult rv = iPlugletEngine::GetInstance(getter_AddRefs(plugletEngine));
if (NS_FAILED(rv)) {
return nsnull;
}
JNIEnv *env = nsnull;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
return nsnull;
}
jstring jpath = env->NewStringUTF(path);
jobject jpluglet = env->CallStaticObjectMethod(clazz,getPlugletMID,jpath);
//nb check for jni exc