908f89a2bf
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
69 lines
1.8 KiB
C++
69 lines
1.8 KiB
C++
/*
|
|
* The contents of this file are subject to the Mozilla Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/MPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is mozilla.org code.
|
|
*
|
|
* The Initial Developer of the Original Code is Sun Microsystems,
|
|
* Inc. Portions created by Sun are
|
|
* Copyright (C) 1999 Sun Microsystems, Inc. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
*/
|
|
#ifndef __PlugletEngine_h__
|
|
#define __PlugletEngine_h__
|
|
#include "nsplugin.h"
|
|
#include "nsIPluginManager.h"
|
|
#include "nsIObserver.h"
|
|
#include "PlugletsDir.h"
|
|
#include "iPlugletEngine.h"
|
|
#include "nsCOMPtr.h"
|
|
|
|
#ifndef OJI_DISABLE
|
|
#include "nsJVMManager.h"
|
|
#include "PlugletSecurityContext.h"
|
|
#endif /* OJI_DISABLE */
|
|
|
|
class PlugletEngine : public nsIObserver, public iPlugletEngine, public nsIPlugin {
|
|
public:
|
|
PlugletEngine();
|
|
virtual ~PlugletEngine(void);
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSIOBSERVER
|
|
NS_DECL_IPLUGLETENGINE
|
|
NS_DECL_NSIPLUGIN
|
|
NS_DECL_NSIFACTORY
|
|
|
|
static PlugletEngine *_NewInstance();
|
|
|
|
private:
|
|
static int objectCount;
|
|
static PRInt32 lockCount;
|
|
static PlugletsDir *dir;
|
|
static PlugletEngine * engine;
|
|
static nsCOMPtr<nsIPluginManager> pluginManager;
|
|
static jobject plugletManager;
|
|
#ifndef OJI_DISABLE
|
|
static nsJVMManager * jvmManager;
|
|
static PlugletSecurityContext *securityContext;
|
|
#else /* OJI_DISABLE */
|
|
static JavaVM *jvm;
|
|
static void StartJVM(void);
|
|
#endif /* OJI_DISABLE */
|
|
};
|
|
|
|
#endif /* __PlugletEngine_h__ */
|
|
|
|
|
|
|
|
|
|
|