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

39
mozilla/java/plugins/src/Registry.cpp
View File

@@ -19,8 +19,9 @@
* Contributor(s):
*/
#include "PlugletEngine.h"
#include "iPlugletEngine.h"
#include "Registry.h"
#include "nsCOMPtr.h"
jclass Registry::clazz = NULL;
jmethodID Registry::setPeerMID = NULL;
@@ -33,7 +34,17 @@ void Registry::SetPeer(jobject key, jlong peer) {
return;
}
}
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;
}
env->CallStaticVoidMethod(clazz,setPeerMID,key,peer);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
@@ -48,7 +59,17 @@ void Registry::Remove(jobject key) {
return;
}
}
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;
}
env->CallStaticVoidMethod(clazz,removeMID,key);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
@@ -57,7 +78,17 @@ void Registry::Remove(jobject key) {
}
void Registry::Initialize() {
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;
}