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

46
mozilla/java/plugins/src/PlugletInputStream.cpp
View File

@@ -18,15 +18,25 @@
*
* Contributor(s):
*/
#include "nsISupports.h"
#include "PlugletInputStream.h"
#include "PlugletEngine.h"
#include "nsCOMPtr.h"
#include "iPlugletEngine.h"
jclass PlugletInputStream::clazz = NULL;
jmethodID PlugletInputStream::initMID = NULL;
void PlugletInputStream::Initialize(void) {
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;
}
clazz = env->FindClass("org/mozilla/pluglet/mozilla/PlugletInputStream");
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
@@ -45,25 +55,45 @@ void PlugletInputStream::Initialize(void) {
void PlugletInputStream::Destroy(void) {
//nb who gonna cal it?
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(clazz) {
env->DeleteGlobalRef(clazz);
}
}
jobject PlugletInputStream::GetJObject(const nsIInputStream *stream) {
jobject res = NULL;
JNIEnv *env = PlugletEngine::GetJNIEnv();
jobject res = nsnull;
nsCOMPtr<iPlugletEngine> plugletEngine;
nsresult rv = iPlugletEngine::GetInstance(getter_AddRefs(plugletEngine));
if (NS_FAILED(rv)) {
return res;
}
JNIEnv *env = nsnull;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
return res;
}
if(!clazz) {
Initialize();
if (! clazz) {
return NULL;
return nsnull;
}
}
res = env->NewObject(clazz,initMID,(jlong)stream);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
res = NULL;
res = nsnull;
}
return res;
}