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

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

mozilla/java/plugins/src/PlugletStreamInfo.cpp

@@ -19,49 +19,77 @@
  * Contributor(s): 
  */
 #include "PlugletStreamInfo.h"
-#include "PlugletEngine.h"
+#include "iPlugletEngine.h"
+#include "nsCOMPtr.h"
 
-jclass    PlugletStreamInfo::clazz = NULL;
-jmethodID PlugletStreamInfo::initMID = NULL;
+jclass    PlugletStreamInfo::clazz = nsnull;
+jmethodID PlugletStreamInfo::initMID = nsnull;
 
 void PlugletStreamInfo::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/PlugletStreamInfoImpl");
     if (env->ExceptionOccurred()) {
 	env->ExceptionDescribe();
-        clazz = NULL;
+        clazz = nsnull;
 	return;
     }
     clazz = (jclass) env->NewGlobalRef(clazz);
     initMID =  env->GetMethodID(clazz,"<init>","(J)V");
     if (!initMID) {
 	env->ExceptionDescribe();
-        clazz = NULL;
+        clazz = nsnull;
 	return;
     }
 }
 
 void PlugletStreamInfo::Destroy(void) {
     //nb who gonna call 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 PlugletStreamInfo::GetJObject(const nsIPluginStreamInfo *streamInfo) {
-    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 nsnull;
+    }
+    JNIEnv *env = nsnull;
+    rv = plugletEngine->GetJNIEnv(&env);
+    if (NS_FAILED(rv)) {
+	return nsnull;
+    }
     if(!clazz) {
 	Initialize();
 	if (! clazz) {
-	    return NULL;
+	    return nsnull;
 	}
     }
     res = env->NewObject(clazz,initMID,(jlong)streamInfo);
     if (env->ExceptionOccurred()) {
 	env->ExceptionDescribe();
-	res = NULL;
+	res = nsnull;
     }
     return res;
 }