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/PlugletFactory.cpp

@@ -18,8 +18,10 @@
  *
  * Contributor(s): 
  */
+#include "nsIServiceManager.h"
+
 #include "PlugletFactory.h"
-#include "PlugletEngine.h"
+#include "iPlugletEngine.h"
 #include "PlugletLoader.h"
 #include "Pluglet.h"
 #include "plstr.h"
@@ -37,9 +39,14 @@ nsresult PlugletFactory::CreatePluginInstance(const char* aPluginMIMEType, void
        || Initialize() != NS_OK) {
 	return NS_ERROR_FAILURE;
     }
-    JNIEnv *env = PlugletEngine::GetJNIEnv();
-    if(!env) {
-	return NS_ERROR_FAILURE;
+    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;
     }
     jstring jstr = env->NewStringUTF(aPluginMIMEType);
     jobject obj = env->CallObjectMethod(jthis,createPlugletMID, jstr);
@@ -59,10 +66,16 @@ nsresult PlugletFactory::CreatePluginInstance(const char* aPluginMIMEType, void
 nsresult PlugletFactory::Initialize(void) {
     PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
 	    ("PlugletFactory::Initialize\n"));
-    JNIEnv *env = PlugletEngine::GetJNIEnv();
-    if(!env) {
-        return NS_ERROR_FAILURE;
+    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 (!initializeMID) { 
 	jclass clazz = env->FindClass("org/mozilla/pluglet/PlugletFactory");
 	if(!clazz) {
@@ -91,7 +104,12 @@ nsresult PlugletFactory::Initialize(void) {
 	if (!jthis) {
 	    return NS_ERROR_FAILURE;
 	}
-	env->CallVoidMethod(jthis,initializeMID,PlugletEngine::GetPlugletManager());
+	jobject plugletEngineObj = nsnull;
+	rv = plugletEngine->GetPlugletManager((void **) &plugletEngineObj);
+	if (NS_FAILED(rv)) {
+	    return rv;
+	}
+	env->CallVoidMethod(jthis,initializeMID,plugletEngineObj);
 	if (env->ExceptionOccurred()) {
 	    env->ExceptionDescribe();
 	    return NS_ERROR_FAILURE;
@@ -107,9 +125,14 @@ nsresult PlugletFactory::Shutdown(void) {
     if(!jthis) {
 	return NS_ERROR_FAILURE;
     }
-    JNIEnv *env = PlugletEngine::GetJNIEnv();
-    if(!env) {
-	return NS_ERROR_FAILURE;
+    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;
     }
     env->CallVoidMethod(jthis,shutdownMID);
     if (env->ExceptionOccurred()) {
@@ -129,12 +152,24 @@ nsresult PlugletFactory::GetMIMEDescription(const char* *result) {
     return (*result) ? NS_OK : NS_ERROR_FAILURE;
 }
 
-PlugletFactory::PlugletFactory(const char *mimeDescription, const char *path) {
+PlugletFactory::PlugletFactory(const char *mimeDescription, const char *path) : plugletEngine(nsnull) {
     jthis = NULL;
     this->path = new char[strlen(path)+1];
     strcpy(this->path,path);
     this->mimeDescription = new char[strlen(mimeDescription)+1];
     strcpy(this->mimeDescription,mimeDescription);
+
+    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::PlugletFactory: Cannot access iPlugletEngine service\n"));
+	return;
+    }
     
 }
  
@@ -145,7 +180,16 @@ PlugletFactory::~PlugletFactory(void) {
     if (mimeDescription != NULL) {
         delete[] mimeDescription;
     }
-    JNIEnv *env = PlugletEngine::GetJNIEnv();
+    JNIEnv *env = nsnull;
+    nsresult rv;
+    rv = plugletEngine->GetJNIEnv(&env);
+
+    if (NS_FAILED(rv)) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	       ("PlugletFactory::~PlugletFactory: plugletEngine->GetJNIEnv failed\n"));
+	return;
+    }
+
     if (env != NULL) {
         env->DeleteGlobalRef(jthis);
     }