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

100
mozilla/java/plugins/src/Pluglet.cpp
View File

@@ -18,14 +18,18 @@
*
* Contributor(s):
*/
#include "nsIServiceManager.h"
#include "Pluglet.h"
#include "PlugletEngine.h"
#include "iPlugletEngine.h"
#include "PlugletStreamListener.h"
#include "PlugletPeer.h"
#include "Registry.h"
#include "PlugletViewFactory.h"
#include "PlugletLog.h"
jmethodID Pluglet::initializeMID = NULL;
jmethodID Pluglet::startMID = NULL;
jmethodID Pluglet::stopMID = NULL;
@@ -38,8 +42,29 @@ static NS_DEFINE_IID(kIPluginInstanceIID, NS_IPLUGININSTANCE_IID);
NS_IMPL_ISUPPORTS1(Pluglet,nsIPluginInstance);
Pluglet::Pluglet(jobject object) {
jthis = PlugletEngine::GetJNIEnv()->NewGlobalRef(object);
Pluglet::Pluglet(jobject object) : plugletEngine(nsnull) {
nsIServiceManager *servman = nsnull;
NS_GetServiceManager(&servman);
nsresult rv;
rv = servman->GetServiceByContractID(PLUGLETENGINE_ContractID,
NS_GET_IID(iPlugletEngine),
getter_AddRefs(plugletEngine));
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Pluglet: Cannot access iPlugletEngine service\n"));
return;
}
JNIEnv *jniEnv = nsnull;
rv = plugletEngine->GetJNIEnv(&jniEnv);
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Pluglet: plugletEngine->GetJNIEnv failed\n"));
return;
}
jthis = jniEnv->NewGlobalRef(object);
//nb check for null
peer = NULL;
view = PlugletViewFactory::GetPlugletView();
@@ -48,7 +73,16 @@ Pluglet::Pluglet(jobject object) {
Pluglet::~Pluglet() {
Registry::Remove(jthis);
PlugletEngine::GetJNIEnv()->DeleteGlobalRef(jthis);
JNIEnv *jniEnv = nsnull;
nsresult rv;
rv = plugletEngine->GetJNIEnv(&jniEnv);
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::~Pluglet: plugletEngine->GetJNIEnv failed\n"));
return;
}
jniEnv->DeleteGlobalRef(jthis);
NS_RELEASE(peer);
}
@@ -62,7 +96,15 @@ NS_METHOD Pluglet::HandleEvent(nsPluginEvent* event, PRBool* handled) {
NS_METHOD Pluglet::Initialize(nsIPluginInstancePeer* _peer) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Initialize\n"));
JNIEnv *env = PlugletEngine::GetJNIEnv();
JNIEnv *env = nsnull;
nsresult rv;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Initialize: plugletEngine->GetJNIEnv failed\n"));
return rv;
}
if (!printMID) {
jclass clazz = env->FindClass("org/mozilla/pluglet/Pluglet");
if (env->ExceptionOccurred()) {
@@ -126,7 +168,14 @@ NS_METHOD Pluglet::GetPeer(nsIPluginInstancePeer* *result) {
NS_METHOD Pluglet::Start(void) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Start\n"));
JNIEnv * env = PlugletEngine::GetJNIEnv();
JNIEnv *env = nsnull;
nsresult rv;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Start: plugletEngine->GetJNIEnv failed\n"));
return rv;
}
env->CallVoidMethod(jthis,startMID);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
@@ -137,7 +186,14 @@ NS_METHOD Pluglet::Start(void) {
NS_METHOD Pluglet::Stop(void) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Stop\n"));
JNIEnv * env = PlugletEngine::GetJNIEnv();
JNIEnv *env = nsnull;
nsresult rv;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Stop: plugletEngine->GetJNIEnv failed\n"));
return rv;
}
env->CallVoidMethod(jthis,stopMID);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
@@ -148,7 +204,15 @@ NS_METHOD Pluglet::Stop(void) {
NS_METHOD Pluglet::Destroy(void) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Destroy\n"));
JNIEnv * env = PlugletEngine::GetJNIEnv();
JNIEnv *env = nsnull;
nsresult rv;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Destroy: plugletEngine->GetJNIEnv failed\n"));
return rv;
}
env->CallVoidMethod(jthis,destroyMID);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
@@ -163,7 +227,15 @@ NS_METHOD Pluglet::NewStream(nsIPluginStreamListener** listener) {
if(!listener) {
return NS_ERROR_FAILURE;
}
JNIEnv * env = PlugletEngine::GetJNIEnv();
nsresult rv;
JNIEnv *env;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Destroy: plugletEngine->GetJNIEnv failed\n"));
return rv;
}
jobject obj = env->CallObjectMethod(jthis,newStreamMID);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
@@ -186,7 +258,15 @@ NS_METHOD Pluglet::SetWindow(nsPluginWindow* window) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::SetWindow\n"));
if (view->SetWindow(window) == PR_TRUE) {
JNIEnv *env = PlugletEngine::GetJNIEnv();
nsresult rv;
JNIEnv *env;
rv = plugletEngine->GetJNIEnv(&env);
if (NS_FAILED(rv)) {
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
("Pluglet::Destroy: plugletEngine->GetJNIEnv failed\n"));
return rv;
}
env->CallVoidMethod(jthis,setWindowMID,view->GetJObject());
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();