| author | Josh Aas <joshmoz@gmail.com> |
| Thu, 09 Apr 2009 22:38:21 -0400 | |
| changeset 27158 | 88e7b02b100ac7e195df2376b48d6dd56116fd3e |
| parent 27157 | c82f707141cd8b6a9964aa2b9fb0765c89d13bc5 |
| child 27159 | 8d5495c3449e4471ae13b4bbcf4b474112edc8b4 |
| push id | 1 |
| push user | root |
| push date | Tue, 26 Apr 2011 22:38:44 +0000 |
| treeherder | mozilla-beta@bfdb6e623a36 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| bugs | 485984 |
| milestone | 1.9.2a1pre |
--- a/browser/installer/unix/packages-static +++ b/browser/installer/unix/packages-static @@ -144,19 +144,16 @@ bin/components/necko_file.xpt bin/components/necko_ftp.xpt bin/components/necko_http.xpt bin/components/necko_res.xpt bin/components/necko_socket.xpt bin/components/necko_strconv.xpt bin/components/necko_viewsource.xpt bin/components/necko_wifi.xpt bin/components/necko.xpt -#ifdef OJI -bin/components/oji.xpt -#endif bin/components/loginmgr.xpt bin/components/places.xpt bin/components/plugin.xpt bin/components/prefetch.xpt bin/components/pref.xpt bin/components/proxyObjInst.xpt bin/components/toolkitremote.xpt bin/components/rdf.xpt
--- a/browser/installer/windows/packages-static +++ b/browser/installer/windows/packages-static @@ -151,19 +151,16 @@ bin\components\necko_about.xpt bin\components\necko_dns.xpt bin\components\necko_file.xpt bin\components\necko_ftp.xpt bin\components\necko_http.xpt bin\components\necko_res.xpt bin\components\necko_socket.xpt bin\components\necko_viewsource.xpt bin\components\necko_wifi.xpt -#ifdef OJI -bin\components\oji.xpt -#endif bin\components\loginmgr.xpt bin\components\places.xpt bin\components\plugin.xpt bin\components\pref.xpt bin\components\prefetch.xpt bin\components\profile.xpt bin\components\proxyObject.xpt bin\components\rdf.xpt
--- a/configure.in +++ b/configure.in @@ -2669,27 +2669,16 @@ case "$target" in *-msvc*|*-mks*|*-mingw*|*-cygwin*|*-wince) if test -z "$GNU_CC"; then NO_LD_ARCHIVE_FLAGS= fi ;; esac AC_SUBST(NO_LD_ARCHIVE_FLAGS) -dnl -dnl Indicate that platform requires special thread safe -dnl locking when starting up the OJI JVM -dnl (see mozilla/modules/oji/src/nsJVMManager.cpp) -dnl ======================================================== -case "$target" in - *-hpux*) - AC_DEFINE(MOZ_OJI_REQUIRE_THREAD_SAFE_ON_STARTUP) - ;; -esac - dnl ======================================================== dnl = Flags to strip unused symbols from .so components dnl ======================================================== case "$target" in *-linux*|*-kfreebsd*-gnu) MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' ;; *-solaris*) @@ -4483,17 +4472,16 @@ MOZ_AUTH_EXTENSION=1 MOZ_NO_ACTIVEX_SUPPORT=1 MOZ_NO_INSPECTOR_APIS= MOZ_NO_XPCOM_OBSOLETE= MOZ_NO_FAST_LOAD= MOZ_OGG=1 MOZ_SYDNEYAUDIO= MOZ_WAVE=1 MOZ_MEDIA= -MOZ_OJI=1 MOZ_PERMISSIONS=1 MOZ_PLACES= MOZ_PLAINTEXT_EDITOR_ONLY= MOZ_PLUGINS=1 MOZ_PREF_EXTENSIONS=1 MOZ_PROFILELOCKING=1 MOZ_PSM=1 MOZ_PYTHON_EXTENSIONS="xpcom dom" @@ -4598,17 +4586,16 @@ basic) MOZ_INSTALLER= MOZ_JSDEBUGGER= MOZ_MATHML= MOZ_AUTH_EXTENSION= MOZ_NO_ACTIVEX_SUPPORT=1 MOZ_NO_INSPECTOR_APIS=1 MOZ_NO_XPCOM_OBSOLETE=1 MOZ_NO_FAST_LOAD=1 - MOZ_OJI= MOZ_PLAINTEXT_EDITOR_ONLY=1 # MOZ_PLUGINS= MOZ_PREF_EXTENSIONS= MOZ_PROFILELOCKING= MOZ_SPELLCHECK= MOZ_SVG= MOZ_UNIVERSALCHARDET= MOZ_UPDATER= @@ -4641,17 +4628,16 @@ minimal) MOZ_INSTALLER= MOZ_JSDEBUGGER= MOZ_MATHML= MOZ_AUTH_EXTENSION= MOZ_NO_ACTIVEX_SUPPORT=1 MOZ_NO_INSPECTOR_APIS=1 MOZ_NO_XPCOM_OBSOLETE=1 MOZ_NO_FAST_LOAD=1 - MOZ_OJI= MOZ_PLAINTEXT_EDITOR_ONLY=1 MOZ_PLUGINS= MOZ_PREF_EXTENSIONS= MOZ_PROFILELOCKING= MOZ_SPELLCHECK= MOZ_STORAGE=1 MOZ_PLACES= MOZ_SVG= @@ -5301,27 +5287,16 @@ MOZ_ARG_DISABLE_BOOL(plugins, dnl ======================================================== dnl = Disable building dbm dnl ======================================================== MOZ_ARG_DISABLE_BOOL(dbm, [ --disable-dbm Disable building dbm], NSS_DISABLE_DBM=1, NSS_DISABLE_DBM=) -dnl ======================================================== -dnl = Open JVM Interface (OJI) support -dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(oji, -[ --disable-oji Disable Open JVM Integration support], - MOZ_OJI=, - MOZ_OJI=1) -if test -n "$MOZ_OJI"; then - AC_DEFINE(OJI) -fi - dnl bi-directional support always on IBMBIDI=1 AC_DEFINE(IBMBIDI) dnl ======================================================== dnl view source support on by default dnl ======================================================== MOZ_ARG_DISABLE_BOOL(view-source, @@ -8014,17 +7989,16 @@ AC_SUBST(MOZ_DEBUG_DISABLE_DEFS) AC_SUBST(MOZ_DEBUG_FLAGS) AC_SUBST(MOZ_DEBUG_LDFLAGS) AC_SUBST(WARNINGS_AS_ERRORS) AC_SUBST(MOZ_DBGRINFO_MODULES) AC_SUBST(MOZ_EXTENSIONS) AC_SUBST(MOZ_IMG_DECODERS) AC_SUBST(MOZ_IMG_ENCODERS) AC_SUBST(MOZ_JSDEBUGGER) -AC_SUBST(MOZ_OJI) AC_SUBST(MOZ_NO_XPCOM_OBSOLETE) AC_SUBST(MOZ_PLUGINS) AC_SUBST(ENABLE_EAZEL_PROFILER) AC_SUBST(EAZEL_PROFILER_CFLAGS) AC_SUBST(EAZEL_PROFILER_LIBS) AC_SUBST(MOZ_PERF_METRICS) AC_SUBST(GC_LEAK_DETECTOR) AC_SUBST(MOZ_LOG_REFCNT)
--- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -142,29 +142,21 @@ #include "nsIPluginInstance.h" #include "nsIPluginInstanceInternal.h" #include "nsIObjectFrame.h" #include "nsIObjectLoadingContent.h" #include "nsIScriptablePlugin.h" #include "nsIPluginHost.h" #include "nsPIPluginHost.h" -#ifdef OJI -// HTMLAppletElement helper includes -#include "nsIJVMManager.h" -#include "nsILiveConnectManager.h" -#include "nsIJVMPluginInstance.h" -#endif - // Oh, did I mention that I hate Microsoft for doing this to me? #ifdef XP_WIN #undef GetClassName #endif - // HTMLOptionsCollection includes #include "nsIDOMHTMLOptionElement.h" #include "nsIDOMNSHTMLOptionElement.h" #include "nsIDOMHTMLOptionsCollection.h" #include "nsIDOMNSHTMLOptionCollectn.h" #include "nsIDOMHTMLOptionsCollection.h" // ContentList includes @@ -1450,24 +1442,16 @@ jsval nsDOMClassInfo::sAddEventListener_ jsval nsDOMClassInfo::sBaseURIObject_id = JSVAL_VOID; jsval nsDOMClassInfo::sNodePrincipal_id = JSVAL_VOID; jsval nsDOMClassInfo::sDocumentURIObject_id=JSVAL_VOID; jsval nsDOMClassInfo::sOncopy_id = JSVAL_VOID; jsval nsDOMClassInfo::sOncut_id = JSVAL_VOID; jsval nsDOMClassInfo::sOnpaste_id = JSVAL_VOID; jsval nsDOMClassInfo::sJava_id = JSVAL_VOID; jsval nsDOMClassInfo::sPackages_id = JSVAL_VOID; -#ifdef OJI -jsval nsDOMClassInfo::sNetscape_id = JSVAL_VOID; -jsval nsDOMClassInfo::sSun_id = JSVAL_VOID; -jsval nsDOMClassInfo::sJavaObject_id = JSVAL_VOID; -jsval nsDOMClassInfo::sJavaClass_id = JSVAL_VOID; -jsval nsDOMClassInfo::sJavaArray_id = JSVAL_VOID; -jsval nsDOMClassInfo::sJavaMember_id = JSVAL_VOID; -#endif static const JSClass *sObjectClass = nsnull; const JSClass *nsDOMClassInfo::sXPCNativeWrapperClass = nsnull; static PRBool sDoSecurityCheckInAddProperty = PR_TRUE; const JSClass* NS_DOMClassInfo_GetXPCNativeWrapperClass() @@ -1649,24 +1633,16 @@ nsDOMClassInfo::DefineStaticJSVals(JSCon SET_JSVAL_TO_STRING(sBaseURIObject_id, cx, "baseURIObject"); SET_JSVAL_TO_STRING(sNodePrincipal_id, cx, "nodePrincipal"); SET_JSVAL_TO_STRING(sDocumentURIObject_id,cx,"documentURIObject"); SET_JSVAL_TO_STRING(sOncopy_id, cx, "oncopy"); SET_JSVAL_TO_STRING(sOncut_id, cx, "oncut"); SET_JSVAL_TO_STRING(sOnpaste_id, cx, "onpaste"); SET_JSVAL_TO_STRING(sJava_id, cx, "java"); SET_JSVAL_TO_STRING(sPackages_id, cx, "Packages"); -#ifdef OJI - SET_JSVAL_TO_STRING(sNetscape_id, cx, "netscape"); - SET_JSVAL_TO_STRING(sSun_id, cx, "sun"); - SET_JSVAL_TO_STRING(sJavaObject_id, cx, "JavaObject"); - SET_JSVAL_TO_STRING(sJavaClass_id, cx, "JavaClass"); - SET_JSVAL_TO_STRING(sJavaArray_id, cx, "JavaArray"); - SET_JSVAL_TO_STRING(sJavaMember_id, cx, "JavaMember"); -#endif return NS_OK; } // static nsresult nsDOMClassInfo::WrapNative(JSContext *cx, JSObject *scope, nsISupports *native, const nsIID* aIID, jsval *vp, @@ -4415,24 +4391,16 @@ nsDOMClassInfo::ShutDown() sBaseURIObject_id = JSVAL_VOID; sNodePrincipal_id = JSVAL_VOID; sDocumentURIObject_id=JSVAL_VOID; sOncopy_id = JSVAL_VOID; sOncut_id = JSVAL_VOID; sOnpaste_id = JSVAL_VOID; sJava_id = JSVAL_VOID; sPackages_id = JSVAL_VOID; -#ifdef OJI - sNetscape_id = JSVAL_VOID; - sSun_id = JSVAL_VOID; - sJavaObject_id = JSVAL_VOID; - sJavaClass_id = JSVAL_VOID; - sJavaArray_id = JSVAL_VOID; - sJavaMember_id = JSVAL_VOID; -#endif NS_IF_RELEASE(sXPConnect); NS_IF_RELEASE(sSecMan); sIsInitialized = PR_FALSE; } // Window helper @@ -6512,22 +6480,17 @@ nsWindowSH::NewResolve(nsIXPConnectWrapp if (!ok) { return NS_ERROR_FAILURE; } *objp = obj; return NS_OK; } - if (id == sJava_id || id == sPackages_id -#ifdef OJI - || id == sNetscape_id || id == sSun_id || id == sJavaObject_id || - id == sJavaClass_id || id == sJavaArray_id || id == sJavaMember_id -#endif - ) { + if (id == sJava_id || id == sPackages_id) { static PRBool isResolvingJavaProperties; if (!isResolvingJavaProperties) { isResolvingJavaProperties = PR_TRUE; PRBool oldVal = sDoSecurityCheckInAddProperty; sDoSecurityCheckInAddProperty = PR_FALSE; @@ -9646,51 +9609,17 @@ nsHTMLPluginObjElementSH::Call(nsIXPConn // static nsresult nsHTMLPluginObjElementSH::GetJavaPluginJSObject(JSContext *cx, JSObject *obj, nsIPluginInstance *plugin_inst, JSObject **plugin_obj, JSObject **plugin_proto) { -#ifdef OJI - *plugin_obj = nsnull; - *plugin_proto = nsnull; - - nsCOMPtr<nsIJVMManager> jvm(do_GetService(nsIJVMManager::GetCID())); - - if (!jvm) { -#endif - return NS_OK; -#ifdef OJI - } - - nsCOMPtr<nsIJVMPluginInstance> javaPluginInstance = - do_QueryInterface(plugin_inst); - - if (!javaPluginInstance) { - return NS_OK; - } - - jobject appletObject = nsnull; - nsresult rv = javaPluginInstance->GetJavaObject(&appletObject); - - if (NS_FAILED(rv) || !appletObject) { - return rv; - } - - nsCOMPtr<nsILiveConnectManager> manager = - do_GetService(nsIJVMManager::GetCID()); - - if (!manager) { - return NS_OK; - } - - return manager->WrapJavaObject(cx, appletObject, plugin_obj); -#endif /* OJI */ + return NS_OK; } // HTMLEmbed/ObjectElement helper nsresult nsHTMLPluginObjElementSH::GetPluginJSObject(JSContext *cx, JSObject *obj, nsIPluginInstance *plugin_inst, @@ -9830,28 +9759,19 @@ nsHTMLPluginObjElementSH::NewResolve(nsI nsCOMPtr<nsIPluginInstance> pi; nsresult rv = GetPluginInstanceIfSafe(wrapper, getter_AddRefs(pi)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIPluginInstanceInternal> plugin_internal = do_QueryInterface(pi); -#ifdef OJI - nsCOMPtr<nsIJVMPluginInstance> java_plugin_instance = - do_QueryInterface(pi); -#endif - // Bail if we don't have a plugin instance or this is an NPRuntime or Java // plugin since the following code is only useful for XPCOM plugins. - if (!pi || (plugin_internal && plugin_internal->GetJSObject(cx)) -#ifdef OJI - || java_plugin_instance -#endif - ) { + if (!pi || (plugin_internal && plugin_internal->GetJSObject(cx))) { return nsHTMLElementSH::NewResolve(wrapper, cx, obj, id, flags, objp, _retval); } JSObject *proto = ::JS_GetPrototype(cx, obj); if (!proto || strcmp(STOBJ_GET_CLASS(proto)->name, NPRUNTIME_JSCLASS_NAME)) { // This is not an NPRuntime plugin or Java plugin, continue on...
--- a/dom/base/nsDOMClassInfo.h +++ b/dom/base/nsDOMClassInfo.h @@ -324,24 +324,16 @@ protected: static jsval sBaseURIObject_id; static jsval sNodePrincipal_id; static jsval sDocumentURIObject_id; static jsval sOncopy_id; static jsval sOncut_id; static jsval sOnpaste_id; static jsval sJava_id; static jsval sPackages_id; -#ifdef OJI - static jsval sNetscape_id; - static jsval sSun_id; - static jsval sJavaObject_id; - static jsval sJavaClass_id; - static jsval sJavaArray_id; - static jsval sJavaMember_id; -#endif static const JSClass *sXPCNativeWrapperClass; }; typedef nsDOMClassInfo nsDOMGenericSH; // EventProp scriptable helper, this class should be the base class of // all objects that should support things like
--- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -69,20 +69,16 @@ #include "nsStyleCoord.h" #include "nsMimeTypeArray.h" #include "nsNetUtil.h" #include "nsICachingChannel.h" #include "nsPluginArray.h" #include "nsIPluginHost.h" #include "nsPIPluginHost.h" #include "nsGeolocation.h" -#ifdef OJI -#include "nsIJVMManager.h" -#include "nsILiveConnectManager.h" -#endif #include "nsContentCID.h" #include "nsLayoutStatics.h" #include "nsCycleCollector.h" #include "nsCCUncollectableMarker.h" #include "nsDOMThreadService.h" // Interfaces Needed #include "nsIWidget.h" @@ -341,19 +337,16 @@ static PRBool gDOMWindowDu return NS_ERROR_NOT_AVAILABLE; \ } \ } \ return GetCurrentInnerWindowInternal()->method args; \ } \ PR_END_MACRO // CIDs -#ifdef OJI -static NS_DEFINE_CID(kJVMServiceCID, NS_JVMMANAGER_CID); -#endif static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); static const char sJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1"; static const char kCryptoContractID[] = NS_CRYPTO_CONTRACTID; static const char kPkcs11ContractID[] = NS_PKCS11_CONTRACTID; static PRBool @@ -5805,47 +5798,16 @@ nsGlobalWindow::InitJavaProperties() // done here. return; } // No NPRuntime enabled Java plugin found, null out the owner we // would have used in that case as it's no longer needed. mDummyJavaPluginOwner = nsnull; - -#ifdef OJI - JSContext *cx = (JSContext *)scx->GetNativeContext(); - - nsCOMPtr<nsILiveConnectManager> manager = - do_GetService(nsIJVMManager::GetCID()); - - if (!manager) { - return; - } - - PRBool started = PR_FALSE; - manager->StartupLiveConnect(::JS_GetRuntime(cx), started); - - nsCOMPtr<nsIJVMManager> jvmManager(do_QueryInterface(manager)); - - if (!jvmManager) { - return; - } - - PRBool javaEnabled = PR_FALSE; - if (NS_FAILED(jvmManager->GetJavaEnabled(&javaEnabled)) || !javaEnabled) { - return; - } - - { - JSAutoRequest ar(cx); - - manager->InitLiveConnectClasses(cx, mJSObject); - } -#endif } void* nsGlobalWindow::GetCachedXBLPrototypeHandler(nsXBLPrototypeHandler* aKey) { void* handler = nsnull; if (mCachedXBLPrototypeHandlers.IsInitialized()) { mCachedXBLPrototypeHandlers.Get(aKey, &handler); @@ -9286,27 +9248,16 @@ nsNavigator::GetBuildID(nsAString& aBuil return NS_OK; } NS_IMETHODIMP nsNavigator::JavaEnabled(PRBool *aReturn) { *aReturn = nsContentUtils::GetBoolPref("security.enable_java"); -#ifdef OJI - // Ask the nsIJVMManager if Java is enabled - nsCOMPtr<nsIJVMManager> jvmService = do_GetService(kJVMServiceCID); - if (jvmService) { - jvmService->GetJavaEnabled(aReturn); - } - else { - *aReturn = PR_FALSE; - } -#endif - return NS_OK; } NS_IMETHODIMP nsNavigator::TaintEnabled(PRBool *aReturn) { *aReturn = PR_FALSE; return NS_OK;
--- a/embedding/browser/activex/src/plugin/LegacyPlugin.cpp +++ b/embedding/browser/activex/src/plugin/LegacyPlugin.cpp @@ -32,29 +32,24 @@ * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ #include "stdafx.h" -#include "jni.h" #include "npapi.h" #include "nsISupports.h" #ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT #include "XPConnect.h" #endif -#ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT -#include "LiveConnect.h" -#endif - #include "LegacyPlugin.h" #ifdef XPC_IDISPATCH_SUPPORT #include "nsCOMPtr.h" #include "nsStringAPI.h" #include "nsIDocument.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" @@ -239,36 +234,20 @@ NPError NPP_Initialize(void) // NPP_Shutdown // // shutdown the plugin library. Revert initializition // void NPP_Shutdown(void) { ATLTRACE(_T("NPP_Shutdown()\n")); -#ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT - liveconnect_Shutdown(); -#endif _Module.Unlock(); } -// NPP_GetJavaClass -// -// Return the Java class representing this plugin -// -jref NPP_GetJavaClass(void) -{ - ATLTRACE(_T("NPP_GetJavaClass()\n")); -#ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT - return liveconnect_GetJavaClass(); -#endif - return NULL; -} - #define MIME_OLEOBJECT1 "application/x-oleobject" #define MIME_OLEOBJECT2 "application/oleobject" enum MozAxPluginErrors { MozAxErrorControlIsNotSafeForScripting, MozAxErrorCouldNotCreateControl, };
deleted file mode 100644 --- a/embedding/browser/activex/src/plugin/LiveConnect.cpp +++ /dev/null @@ -1,545 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * 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 - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Adam Lock <adamlock@netscape.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#include "stdafx.h" - -#include "jni.h" -#include "npapi.h" - -#include "_java/java_lang_Throwable.h" -#include "_java/java_lang_Error.h" -#include "_java/java_lang_String.h" -#include "_java/java_lang_Boolean.h" -#include "_java/java_lang_Number.h" -#include "_java/java_lang_Integer.h" -#include "_java/java_lang_Long.h" -// TODO: -// These things require certain native statics to be implemented -// so they're commented out for the time being. -//#include "_java/java_lang_Double.h" -//#include "_java/java_lang_Float.h" -#include "_java/java_lang_Character.h" -#include "_java/netscape_plugin_Plugin.h" -#include "_java/MozAxPlugin.h" - -#include "LegacyPlugin.h" -#include "LiveConnect.h" - -void liveconnect_Shutdown() -{ - JRIEnv* env = NPN_GetJavaEnv(); - if (env) { - unuse_MozAxPlugin(env); - unuse_netscape_plugin_Plugin(env); - unuse_java_lang_Error(env); -// unuse_java_lang_String(env); - unuse_java_lang_Number(env); - unuse_java_lang_Boolean(env); - unuse_java_lang_Integer(env); - unuse_java_lang_Long(env); -// unuse_java_lang_Float(env); -// unuse_java_lang_Double(env); - unuse_java_lang_Character(env); - } -} - -jref liveconnect_GetJavaClass() -{ - JRIEnv* env = NPN_GetJavaEnv(); - if (env) { - // Note: The order of these is important (for some unknown reason) - // and was determined through trial and error. Do not rearrange - // without testing the new order! - use_netscape_plugin_Plugin(env); - jref myClass = (jref) use_MozAxPlugin(env); - use_java_lang_Error(env); -// use_java_lang_String(env); - use_java_lang_Number(env); - use_java_lang_Boolean(env); - use_java_lang_Integer(env); - use_java_lang_Long(env); -// use_java_lang_Float(env); -// use_java_lang_Double(env); - use_java_lang_Character(env); - return myClass; - } - return NULL; -} - -// The following will be callable from Javascript through LiveConnect -HRESULT -_GetIDispatchFromJRI(JRIEnv *env, struct MozAxPlugin* self, IDispatch **pdisp) -{ - if (pdisp == NULL || env == NULL || self == NULL) - { - return E_INVALIDARG; - } - *pdisp = NULL; - - // Note: You get a nasty crash calling self->getPeer(env), this obscure cast fixes - // it. More details in the link: - // - // http://groups.google.com/groups?selm=385D9543.4087F1C6%40ermapper.com.au&output=gplain - - NPP npp = (NPP) netscape_plugin_Plugin_getPeer(env, - reinterpret_cast<netscape_plugin_Plugin*> (self)); - PluginInstanceData *pData = (PluginInstanceData *) npp->pdata; - if (pData == NULL) - { - return E_FAIL; - } - - IUnknownPtr unk; - HRESULT hr = pData->pControlSite->GetControlUnknown(&unk); - if (unk.GetInterfacePtr() == NULL) - { - return E_FAIL; - } - - IDispatchPtr disp = unk; - if (disp.GetInterfacePtr() == NULL) - { - return E_FAIL; - } - - *pdisp = disp.GetInterfacePtr(); - (*pdisp)->AddRef(); - - return S_OK; -} - -HRESULT -_VariantToJRIObject(JRIEnv *env, VARIANT *v, java_lang_Object **o) -{ - if (v == NULL || env == NULL || o == NULL) - { - return E_INVALIDARG; - } - - *o = NULL; - - // TODO - VT_BYREF will cause problems - if (v->vt == VT_EMPTY) - { - return S_OK; - } - else if (v->vt == VT_BOOL) - { - jbool value = (v->boolVal == VARIANT_TRUE) ? JRITrue : JRIFalse; - java_lang_Boolean *j = java_lang_Boolean_new(env, - class_java_lang_Boolean(env), value); - *o = reinterpret_cast<java_lang_Object *>(j); - return S_OK; - } - else if (v->vt == VT_I4) - { - jlong value = v->lVal; - java_lang_Long *j = java_lang_Long_new(env, - class_java_lang_Long(env), value); - *o = reinterpret_cast<java_lang_Object *>(j); - return S_OK; - } - else if (v->vt == VT_I2) - { - jlong value = v->iVal; - java_lang_Long *j = java_lang_Long_new(env, - class_java_lang_Long(env), value); - *o = reinterpret_cast<java_lang_Object *>(j); - return S_OK; - } -/* else if (v->vt == VT_R4) - { - jfloat value = v->fltVal; - java_lang_Float *j = java_lang_Float_new(env, - class_java_lang_Float(env), value); - *o = reinterpret_cast<java_lang_Object *>(j); - return S_OK; - } - else if (v->vt == VT_R8) - { - jdouble value = v->dblVal; - java_lang_Double *j = java_lang_Double_new(env, - class_java_lang_Double(env), value); - *o = reinterpret_cast<java_lang_Object *>(j); - return S_OK; - } */ - else if (v->vt == VT_BSTR) - { - USES_CONVERSION; - char * value = OLE2A(v->bstrVal); - java_lang_String *j = JRI_NewStringUTF(env, value, strlen(value)); - *o = reinterpret_cast<java_lang_Object *>(j); - return S_OK; - } - /* TODO else if VT_UI1 etc. */ - - return E_FAIL; -} - -HRESULT -_JRIObjectToVariant(JRIEnv *env, java_lang_Object *o, VARIANT *v) -{ - VariantInit(v); - if (JRI_IsInstanceOf(env, (jref) o, class_java_lang_String(env))) - { - USES_CONVERSION; - const char *value = JRI_GetStringUTFChars(env, reinterpret_cast<java_lang_String *>(o)); - v->vt = VT_BSTR; - v->bstrVal = SysAllocString(A2COLE(value)); - } - else if (JRI_IsInstanceOf(env, (jref) o, class_java_lang_Boolean(env))) - { - jbool value = java_lang_Boolean_booleanValue(env, reinterpret_cast<java_lang_Boolean *>(o)); - v->vt = VT_BOOL; - v->boolVal = value == JRITrue ? VARIANT_TRUE : VARIANT_FALSE; - } - else if (JRI_IsInstanceOf(env, o, class_java_lang_Integer(env))) - { - jint value = java_lang_Integer_intValue(env, reinterpret_cast<java_lang_Integer *>(o)); - v->vt = VT_I4; - v->lVal = value; - } - else if (JRI_IsInstanceOf(env, o, class_java_lang_Long(env))) - { - jlong value = java_lang_Long_longValue(env, reinterpret_cast<java_lang_Long *>(o)); - v->vt = VT_I4; - v->lVal = value; - } -/* else if (JRI_IsInstanceOf(env, o, class_java_lang_Double(env))) - { - jdouble value = java_lang_Double_doubleValue(env, reinterpret_cast<java_lang_Double *>(o)); - v->vt = VT_R8; - v->dblVal = value; - } - else if (JRI_IsInstanceOf(env, o, class_java_lang_Float(env))) - { - jfloat value = java_lang_Float_floatValue(env, reinterpret_cast<java_lang_Float *>(o)); - v->vt = VT_R4; - v->fltVal = value; - } */ - else if (JRI_IsInstanceOf(env, o, class_java_lang_Character(env))) - { - jchar value = java_lang_Character_charValue(env, reinterpret_cast<java_lang_Character *>(o)); - v->vt = VT_UI1; - v->bVal = value; - } - else if (JRI_IsInstanceOf(env, o, class_java_lang_Number(env))) - { - jlong value = java_lang_Number_longValue(env, reinterpret_cast<java_lang_Number *>(o)); - v->vt = VT_I4; - v->lVal = value; - } - else - { - // TODO dump diagnostic error here - return E_FAIL; - } - return S_OK; -} - -struct java_lang_Object * -_InvokeFromJRI(JRIEnv *env, struct MozAxPlugin* self, struct java_lang_String *func, int nargs, java_lang_Object *args[]) -{ - HRESULT hr; - DISPID dispid = 0; - - // call the requested function - const char* funcName = JRI_GetStringUTFChars(env, func); - - IDispatchPtr disp; - if (FAILED(_GetIDispatchFromJRI(env, self, &disp))) - { - return NULL; - } - - _variant_t *vargs = new _variant_t[nargs]; - for (int i = 0; i < nargs; i++) - { - if (FAILED(_JRIObjectToVariant(env, args[i], &vargs[i]))) - { - delete []vargs; - char error[64]; - sprintf(error, "Argument %d could not be converted into a variant", i); - JRI_ThrowNew(env, class_java_lang_Error(env), error); - return NULL; - } - } - - USES_CONVERSION; - OLECHAR FAR* szMember = A2OLE(funcName); - hr = disp->GetIDsOfNames(IID_NULL, &szMember, 1, LOCALE_USER_DEFAULT, &dispid); - if (FAILED(hr)) - { - char error[128]; - memset(error, 0, sizeof(error)); - _snprintf(error, sizeof(error) - 1, "invoke failed, member \"%s\" not found, hr=0x%08x", funcName, hr); - JRI_ThrowNew(env, class_java_lang_Error(env), error); - return NULL; - } - - DISPPARAMS dispparams = {NULL, NULL, 0, 0}; - dispparams.rgvarg = vargs; - dispparams.cArgs = nargs; - - _variant_t vResult; - hr = disp->Invoke( - dispid, - IID_NULL, - LOCALE_USER_DEFAULT, - DISPATCH_METHOD, - &dispparams, &vResult, NULL, NULL); - - if (FAILED(hr)) - { - char error[64]; - sprintf(error, "invoke failed, result from object = 0x%08x", hr); - JRI_ThrowNew(env, class_java_lang_Error(env), error); - return NULL; - } - - java_lang_Object *oResult = NULL; - _VariantToJRIObject(env, &vResult, &oResult); - - return reinterpret_cast<java_lang_Object *>(oResult); -} - -/******************************************************************************* - * Native Methods: - * These are the native methods which we are implementing. - ******************************************************************************/ - -/*** private native xinvoke (Ljava/lang/String;)Ljava/lang/Object; ***/ -extern "C" JRI_PUBLIC_API(struct java_lang_Object *) -native_MozAxPlugin_xinvoke(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a) -{ - return _InvokeFromJRI(env, self, a, 0, NULL); -} - -/*** private native xinvoke1 (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; ***/ -extern "C" JRI_PUBLIC_API(struct java_lang_Object *) -native_MozAxPlugin_xinvoke1(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a, struct java_lang_Object *b) -{ - java_lang_Object *args[1]; - args[0] = b; - return _InvokeFromJRI(env, self, a, sizeof(args) / sizeof(args[0]), args); -} - -/*** private native xinvoke2 (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ***/ -extern "C" JRI_PUBLIC_API(struct java_lang_Object *) -native_MozAxPlugin_xinvoke2(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a, struct java_lang_Object *b, struct java_lang_Object *c) -{ - java_lang_Object *args[2]; - args[0] = b; - args[1] = c; - return _InvokeFromJRI(env, self, a, sizeof(args) / sizeof(args[0]), args); -} - -/*** private native xinvoke3 (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ***/ -extern "C" JRI_PUBLIC_API(struct java_lang_Object *) -native_MozAxPlugin_xinvoke3(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a, struct java_lang_Object *b, struct java_lang_Object *c, struct java_lang_Object *d) -{ - java_lang_Object *args[3]; - args[0] = b; - args[1] = c; - args[2] = d; - return _InvokeFromJRI(env, self, a, sizeof(args) / sizeof(args[0]), args); -} - -/*** private native xinvoke4 (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ***/ -extern "C" JRI_PUBLIC_API(struct java_lang_Object *) -native_MozAxPlugin_xinvoke4(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a, struct java_lang_Object *b, struct java_lang_Object *c, struct java_lang_Object *d, struct java_lang_Object *e) -{ - java_lang_Object *args[4]; - args[0] = b; - args[1] = c; - args[2] = d; - args[3] = e; - return _InvokeFromJRI(env, self, a, sizeof(args) / sizeof(args[0]), args); -} - -/*** private native xinvokeX (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object; ***/ -extern "C" JRI_PUBLIC_API(struct java_lang_Object *) -native_MozAxPlugin_xinvokeX(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a, jobjectArray b) -{ - // Turn the Java array of objects into a C++ array - jsize length = JRI_GetObjectArrayLength(env, b); - java_lang_Object **args = NULL; - if (length) - { - args = (java_lang_Object **) malloc(length * sizeof(java_lang_Object *)); - for (long i = 0; i < length; i++) - { - args[i] = reinterpret_cast<java_lang_Object *>(JRI_GetObjectArrayElement(env, b, i)); - } - } - java_lang_Object *o = _InvokeFromJRI(env, self, a, length, args); - free(args); - return o; -} - -/*** private native xgetProperty (Ljava/lang/String;)Ljava/lang/Object; ***/ -extern "C" JRI_PUBLIC_API(struct java_lang_Object *) -native_MozAxPlugin_xgetProperty(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a) -{ - HRESULT hr; - DISPID dispid; - _variant_t vResult; - - IDispatchPtr disp; - if (FAILED(_GetIDispatchFromJRI(env, self, &disp))) - { - return NULL; - } - - // return the requested property to the Java peer - USES_CONVERSION; - OLECHAR FAR* szMember = A2OLE(JRI_GetStringUTFChars(env, a)); - hr = disp->GetIDsOfNames(IID_NULL, &szMember, 1, LOCALE_USER_DEFAULT, &dispid); - if (FAILED(hr)) - { - char error[128]; - memset(error, 0, sizeof(error)); - _snprintf(error, sizeof(error) - 1, "getProperty failed, member \"%s\" not found, hr=0x%08x", szMember, hr); - JRI_ThrowNew(env, class_java_lang_Error(env), error); - return NULL; - } - DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; - hr = disp->Invoke( - dispid, - IID_NULL, - LOCALE_USER_DEFAULT, - DISPATCH_PROPERTYGET, - &dispparamsNoArgs, &vResult, NULL, NULL); - if (FAILED(hr)) - { - char error[64]; - sprintf(error, "getProperty failed, result from object = 0x%08x", hr); - JRI_ThrowNew(env, class_java_lang_Error(env), error); - return NULL; - } - - java_lang_Object *oResult = NULL; - _VariantToJRIObject(env, &vResult, &oResult); - - return oResult; -} - -/*** private native xsetProperty2 (Ljava/lang/String;Ljava/lang/Object;)V ***/ -extern "C" JRI_PUBLIC_API(void) -native_MozAxPlugin_xsetProperty2(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a, struct java_lang_Object *b) - -{ - HRESULT hr; - DISPID dispid; - VARIANT VarResult; - - IDispatchPtr disp; - if (FAILED(_GetIDispatchFromJRI(env, self, &disp))) - { - return; - } - - USES_CONVERSION; - OLECHAR FAR* szMember = A2OLE(JRI_GetStringUTFChars(env, a)); - hr = disp->GetIDsOfNames(IID_NULL, &szMember, 1, LOCALE_USER_DEFAULT, &dispid); - if (FAILED(hr)) - { - char error[128]; - memset(error, 0, sizeof(error)); - _snprintf(error, sizeof(error) - 1, "setProperty failed, member \"%s\" not found, hr=0x%08x", szMember, hr); - JRI_ThrowNew(env, class_java_lang_Error(env), error); - return; - } - - _variant_t *pvars = new _variant_t[1]; - if (FAILED(_JRIObjectToVariant(env, b, &pvars[0]))) - { - delete []pvars; - char error[64]; - sprintf(error, "Property value could not be converted into a variant"); - JRI_ThrowNew(env, class_java_lang_Error(env), error); - return; - } - - DISPID dispIdPut = DISPID_PROPERTYPUT; - - DISPPARAMS functionArgs; - functionArgs.rgdispidNamedArgs = &dispIdPut; - functionArgs.rgvarg = pvars; - functionArgs.cArgs = 1; - functionArgs.cNamedArgs = 1; - - hr = disp->Invoke( - dispid, - IID_NULL, - LOCALE_USER_DEFAULT, - DISPATCH_PROPERTYPUT, - &functionArgs, &VarResult, NULL, NULL); - - delete []pvars; - - if (FAILED(hr)) - { - char error[64]; - sprintf(error, "setProperty failed, result from object = 0x%08x", hr); - JRI_ThrowNew(env, class_java_lang_Error(env), error); - return; - } -} - -/*** private native xsetProperty1 (Ljava/lang/String;Ljava/lang/String;)V ***/ -extern "C" JRI_PUBLIC_API(void) -native_MozAxPlugin_xsetProperty1(JRIEnv* env, struct MozAxPlugin* self, struct java_lang_String *a, struct java_lang_String *b) -{ - native_MozAxPlugin_xsetProperty2(env, self, a, reinterpret_cast<java_lang_Object *>(b)); -} - - -/////////////////////////////////////////////////////////////////////////////// - -/*** private native printStackTrace0 (Ljava/io/PrintStream;)V ***/ -extern "C" JRI_PUBLIC_API(void) -native_java_lang_Throwable_printStackTrace0(JRIEnv* env, struct java_lang_Throwable* self, struct java_io_PrintStream *a) -{ -} - -/*** public native fillInStackTrace ()Ljava/lang/Throwable; ***/ -extern "C" JRI_PUBLIC_API(struct java_lang_Throwable *) -native_java_lang_Throwable_fillInStackTrace(JRIEnv* env, struct java_lang_Throwable* self) -{ - return self; -}
deleted file mode 100644 --- a/embedding/browser/activex/src/plugin/LiveConnect.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * 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 - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Adam Lock <adamlock@netscape.com> - * Paul Oswald <paul.oswald@isinet.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#ifndef LIVECONNECT_H -#define LIVECONNECT_H - -extern void liveconnect_Shutdown(); -extern jref liveconnect_GetJavaClass(); - -#endif \ No newline at end of file
--- a/embedding/browser/activex/src/plugin/Makefile.in +++ b/embedding/browser/activex/src/plugin/Makefile.in @@ -48,17 +48,16 @@ include $(DEPTH)/config/autoconf.mk MODULE = npmozax LIBRARY_NAME = npmozax RESFILE = MozActiveX.res DEFFILE = npmozax.def GRE_MODULE = 1 REQUIRES = \ xpcom \ - java \ plugin \ string \ dom \ content \ layout \ widget \ gfx \ js \ @@ -82,45 +81,16 @@ XPIFILE = mozactivex.xpi FORCE_SHARED_LIB = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 # Path to the Mozilla ActiveX common dir (some files are copied from there) AXCOMMONSRC=$(srcdir)/../common ############ -# LiveConnect settings - -# MOZ_ACTIVEX_PLUGIN_LIVECONNECT = 1 - -# Settings that specify where the PluginSDK, Java compiler (javac or oldjavac), -# Java header file generator (javah) and classes live. -# -# You need the Netscape PluginSDK: -# -# http://home.netscape.com/comprod/development_partners/plugin_api/index.html -# -# You also need a JDK with the old java compiler. Anything from 1.3 -# downwards should do. See here for various JDK releases: -# -# http://java.sun.com/products/archive/index.html -# -# You should use the javah found in the plugin SDK because this generates -# the JRI stubs. - -ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT -PLUGINSDK = c:/m/PluginSDK -SDK_JAVADIR = c:/jdk1.02 -SDK_JAVAH = $(PLUGINSDK)/bin/win32/javah -SDK_JAVAC = $(SDK_JAVADIR)/bin/javac -SDK_CLASSES = $(PLUGINSDK)/classes/java_30.zip -SDK_CLASSPATH = "$(subst /,\,$(SDK_CLASSES));." -endif - -############ # XPConnect settings MOZ_ACTIVEX_PLUGIN_XPCONNECT = 1 # XPConnect support in (Netscape 6.1+/Mozilla) # Uncomment this line to install the plugin & policy # MOZ_USE_ACTIVEX_PLUGIN = 1 @@ -153,17 +123,17 @@ ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT _AXCOMMON_CPPSRCS = \ ActiveScriptSite.cpp \ ControlEventSink.cpp \ ControlSite.cpp \ ControlSiteIPFrame.cpp \ ItemContainer.cpp \ PropertyBag.cpp \ $(NULL) -CPPSRCS += LiveConnect.cpp $(_AXCOMMON_CPPSRCS) +CPPSRCS += $(_AXCOMMON_CPPSRCS) CSRCS += javastubs.c endif ifdef XPC_IDISPATCH_SUPPORT CPPSRCS += PrefObserver.cpp endif LOCAL_INCLUDES = -I$(srcdir) -I$(AXCOMMONSRC) @@ -201,37 +171,25 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_COMPONENT_LIBS) \ $(NSPR_LIBS) \ $(NULL) LIBS = \ $(NSPR_LIBS) \ $(NULL) -# LiveConnect links to XPCOM glue -ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT -EXTRA_DSO_LDOPTS += \ - $(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) -LIBS += \ - $(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) -endif - # XPConnect links to XPCOM and the shared activex lib ifdef XPC_IDISPATCH_SUPPORT EXTRA_DSO_LDOPTS += \ ../common/$(LIB_PREFIX)ax_common_s.$(LIB_SUFFIX) \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ $(NULL) endif - - SRCS_IN_OBJDIR = 1 ENABLE_CXX_EXCEPTIONS = 1 include $(topsrcdir)/config/rules.mk ifdef MOZ_ACTIVEX_PLUGIN_LIVCONNECT copy-sources: $(addprefix $(MOZCTLSRC)/,$(_CONTROL_CPPSRCS)) @@ -299,123 +257,8 @@ endif @echo "; This file was autogenerated by mkctldef.bat!" >> $@ @echo "" >> $@ @echo "LIBRARY "npmozax.DLL"" >> $@ @echo "EXPORTS" >> $@ @echo "; Plugin exports" >> $@ @echo "NP_GetEntryPoints @1" >> $@ @echo "NP_Initialize @2" >> $@ @echo "NP_Shutdown @3" >> $@ - -ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT -./MozAxPlugin.class: ./MozAxPlugin.java - $(SDK_JAVAC) -classpath $(SDK_CLASSPATH) MozAxPlugin.java - -./_java/MozAxPlugin.h \ -./_java/MozAxPlugin.c: ./MozAxPlugin.class - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java MozAxPlugin - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java MozAxPlugin - -./_java/java_lang_Object.h \ -./_java/java_lang_Object.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Object - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Object - -./_java/java_lang_Error.h \ -./_java/java_lang_Error.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Error - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Error - -./_java/java_lang_Throwable.h \ -./_java/java_lang_Throwable.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Throwable - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Throwable - -./_java/java_lang_String.h \ -./_java/java_lang_String.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.String - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.String - -./_java/java_lang_Boolean.h \ -./_java/java_lang_Boolean.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Boolean - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Boolean - -./_java/java_lang_Number.h \ -./_java/java_lang_Number.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Number - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Number - -./_java/java_lang_Integer.h \ -./_java/java_lang_Integer.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Integer - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Integer - -./_java/java_lang_Short.h \ -./_java/java_lang_Short.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Short - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Short - -./_java/java_lang_Long.h \ -./_java/java_lang_Long.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Long - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Long - -./_java/java_lang_Double.h \ -./_java/java_lang_Double.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Double - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Double - -./_java/java_lang_Float.h \ -./_java/java_lang_Float.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Float - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Float - -./_java/java_lang_Byte.h \ -./_java/java_lang_Byte.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Byte - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Byte - -./_java/java_lang_Character.h \ -./_java/java_lang_Character.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Character - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Character - -./_java/netscape_plugin_Plugin.h \ -./_java/netscape_plugin_Plugin.c : $(SDK_CLASSES) - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java netscape.plugin.Plugin - $(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java netscape.plugin.Plugin - -javastubs.c : \ - ./MozAxPlugin.class \ - ./_java/MozAxPlugin.c \ - ./_java/netscape_plugin_Plugin.c \ - ./_java/java_lang_Object.c \ - ./_java/java_lang_Throwable.c \ - ./_java/java_lang_Error.c \ - ./_java/java_lang_String.c \ - ./_java/java_lang_Boolean.c \ - ./_java/java_lang_Number.c \ - ./_java/java_lang_Integer.c \ - ./_java/java_lang_Long.c \ - ./_java/java_lang_Double.c \ - ./_java/java_lang_Float.c \ - ./_java/java_lang_Character.c \ - $(NULL) - -LiveConnect.cpp: StdAfx.h \ - ./MozAxPlugin.class \ - ./_java/MozAxPlugin.h \ - ./_java/netscape_plugin_Plugin.h \ - ./_java/java_lang_Object.h \ - ./_java/java_lang_Throwable.h \ - ./_java/java_lang_Error.h \ - ./_java/java_lang_String.h \ - ./_java/java_lang_Boolean.h \ - ./_java/java_lang_Number.h \ - ./_java/java_lang_Integer.h \ - ./_java/java_lang_Long.h \ - ./_java/java_lang_Double.h \ - ./_java/java_lang_Float.h \ - ./_java/java_lang_Character.h \ - $(NULL) -endif -
deleted file mode 100644 --- a/embedding/browser/activex/src/plugin/javastubs.c +++ /dev/null @@ -1,17 +0,0 @@ -/* NOTE: This is a C file to avoid some nasty typecasting issues that C++ has - with the JDK generated code. - */ - -#define IMPLEMENT_MozAxPlugin -#include "_java/MozAxPlugin.c" -#include "_java/netscape_plugin_Plugin.c" -#include "_java/java_lang_Throwable.c" -#include "_java/java_lang_Error.c" -#include "_java/java_lang_String.c" -#include "_java/java_lang_Boolean.c" -#include "_java/java_lang_Number.c" -#include "_java/java_lang_Integer.c" -#include "_java/java_lang_Long.c" -//#include "_java/java_lang_Double.c" -//#include "_java/java_lang_Float.c" -#include "_java/java_lang_Character.c"
--- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -71,19 +71,16 @@ #include "nsIDocument.h" #include "nsINodeInfo.h" #include "nsIURL.h" #include "nsNetUtil.h" #include "nsIPluginInstanceOwner.h" #include "nsIPluginInstancePeer2.h" #include "plstr.h" #include "nsILinkHandler.h" -#ifdef OJI -#include "nsIJVMPluginTagInfo.h" -#endif #include "nsIEventListener.h" #include "nsIScrollableView.h" #include "nsIScrollPositionListener.h" #include "nsITimer.h" #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeOwner.h" #include "nsDocShellCID.h" #include "nsIWebBrowserChrome.h" @@ -231,19 +228,16 @@ public: { return nsEventStatus_eConsumeNoDefault; } }; class nsPluginInstanceOwner : public nsIPluginInstanceOwner, public nsIPluginTagInfo2, -#ifdef OJI - public nsIJVMPluginTagInfo, -#endif public nsIEventListener, public nsITimerCallback, public nsIDOMMouseListener, public nsIDOMMouseMotionListener, public nsIDOMKeyListener, public nsIDOMFocusListener, public nsIScrollPositionListener @@ -314,31 +308,16 @@ public: NS_IMETHOD GetBorderVertSpace(PRUint32 *result); NS_IMETHOD GetBorderHorizSpace(PRUint32 *result); NS_IMETHOD GetUniqueID(PRUint32 *result); NS_IMETHOD GetDOMElement(nsIDOMElement* *result); -#ifdef OJI - //nsIJVMPluginTagInfo interface - - NS_IMETHOD GetCode(const char* *result); - - NS_IMETHOD GetCodeBase(const char* *result); - - NS_IMETHOD GetArchive(const char* *result); - - NS_IMETHOD GetName(const char* *result); - - NS_IMETHOD GetMayScript(PRBool *result); - -#endif /* OJI */ - // nsIDOMMouseListener interfaces NS_IMETHOD MouseDown(nsIDOMEvent* aMouseEvent); NS_IMETHOD MouseUp(nsIDOMEvent* aMouseEvent); NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent); NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent); NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent); NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent); NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent); @@ -2306,19 +2285,16 @@ nsPluginInstanceOwner::~nsPluginInstance NS_IMPL_ADDREF(nsPluginInstanceOwner) NS_IMPL_RELEASE(nsPluginInstanceOwner) NS_INTERFACE_MAP_BEGIN(nsPluginInstanceOwner) NS_INTERFACE_MAP_ENTRY(nsIPluginInstanceOwner) NS_INTERFACE_MAP_ENTRY(nsIPluginTagInfo) NS_INTERFACE_MAP_ENTRY(nsIPluginTagInfo2) -#ifdef OJI - NS_INTERFACE_MAP_ENTRY(nsIJVMPluginTagInfo) -#endif NS_INTERFACE_MAP_ENTRY(nsIEventListener) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) NS_INTERFACE_MAP_ENTRY(nsIDOMMouseListener) NS_INTERFACE_MAP_ENTRY(nsIDOMMouseMotionListener) NS_INTERFACE_MAP_ENTRY(nsIDOMKeyListener) NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener) NS_INTERFACE_MAP_ENTRY(nsIScrollPositionListener) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMMouseListener) @@ -2934,79 +2910,16 @@ NS_IMETHODIMP nsPluginInstanceOwner::Get NS_IMETHODIMP nsPluginInstanceOwner::GetUniqueID(PRUint32 *result) { NS_ENSURE_ARG_POINTER(result); *result = NS_PTR_TO_INT32(mOwner); return NS_OK; } -#ifdef OJI -NS_IMETHODIMP nsPluginInstanceOwner::GetCode(const char* *result) -{ - nsresult rv; - nsPluginTagType tagType; - NS_ENSURE_SUCCESS(rv = GetTagType(&tagType), rv); - - rv = NS_ERROR_FAILURE; - if (nsPluginTagType_Object != tagType) - rv = GetAttribute("CODE", result); - if (NS_FAILED(rv)) - rv = GetParameter("CODE", result); - - return rv; -} - -NS_IMETHODIMP nsPluginInstanceOwner::GetCodeBase(const char* *result) -{ - nsresult rv; - if (NS_FAILED(rv = GetAttribute("CODEBASE", result))) - rv = GetParameter("CODEBASE", result); - return rv; -} - -NS_IMETHODIMP nsPluginInstanceOwner::GetArchive(const char* *result) -{ - nsresult rv; - if (NS_FAILED(rv = GetAttribute("ARCHIVE", result))) - rv = GetParameter("ARCHIVE", result); - return rv; -} - -NS_IMETHODIMP nsPluginInstanceOwner::GetName(const char* *result) -{ - nsresult rv; - nsPluginTagType tagType; - NS_ENSURE_SUCCESS(rv = GetTagType(&tagType), rv); - - rv = NS_ERROR_FAILURE; - if (nsPluginTagType_Object != tagType) - rv = GetAttribute("NAME", result); - if (NS_FAILED(rv)) - rv = GetParameter("NAME", result); - - return rv; -} - -NS_IMETHODIMP nsPluginInstanceOwner::GetMayScript(PRBool *result) -{ - NS_ENSURE_ARG_POINTER(result); - nsPluginTagType tagType; - NS_ENSURE_SUCCESS(GetTagType(&tagType), NS_ERROR_FAILURE); - - const char* unused; - if (nsPluginTagType_Object == tagType) - *result = NS_SUCCEEDED(GetParameter("MAYSCRIPT", &unused)); - else - *result = NS_SUCCEEDED(GetAttribute("MAYSCRIPT", &unused)); - - return NS_OK; -} -#endif /* OJI */ - // Cache the attributes and/or parameters of our tag into a single set // of arrays to be compatible with 4.x. The attributes go first, // followed by a PARAM/null and then any PARAM tags. Also, hold the // cached array around for the duration of the life of the instance // because 4.x did. See bug 111008. nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays() {
deleted file mode 100644 --- a/modules/oji/Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# 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 -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = oji - -DIRS = public - -ifdef MOZ_OJI -DIRS += src -endif - -include $(topsrcdir)/config/rules.mk -
deleted file mode 100644 --- a/modules/oji/public/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# 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 -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = oji -GRE_MODULE = 1 - -XPIDLSRCS = \ - nsIJVMManager.idl \ - nsIJVMPluginInstance.idl \ - nsIJVMConfigManager.idl \ - $(NULL) - -EXPORTS = \ - nsjvm.h \ - nsIJRIPlugin.h \ - nsIJVMConsole.h \ - nsIJVMPlugin.h \ - nsIJVMPluginTagInfo.h \ - nsIJVMPrefsWindow.h \ - nsIJVMWindow.h \ - nsISymantecDebugManager.h \ - nsISymantecDebugger.h \ - nsISecureEnv.h \ - ProxyJNI.h \ - nsIJVMThreadManager.h \ - nsILiveConnectManager.h \ - $(NULL) - -include $(topsrcdir)/config/rules.mk -
deleted file mode 100644 --- a/modules/oji/public/ProxyJNI.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * 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 - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* - ProxyJNI.h - */ - -#ifndef PROXY_JNI_H -#define PROXY_JNI_H - -#ifndef JNI_H -#include <jni.h> -#endif - -class nsIJVMPlugin; -class nsISecureEnv; -class nsISecurityContext; -/** - * Creates a proxy JNIEnv using the given JVM plugin, and optional native JNIEnv*. - */ -JNIEnv* CreateProxyJNI(nsIJVMPlugin* jvmPlugin, nsISecureEnv* secureEnv = NULL); - -/** - * Deletes the proxy JNIEnv. Releases the connection - * to the underlying JVM. - */ -void DeleteProxyJNI(JNIEnv* proxyEnv); - - -/** - * Returns the secure env associated with the given proxy env. - */ -nsISecureEnv* GetSecureEnv(JNIEnv* proxyEnv); - -/** - * Sets SecurityCotext for proxy env - */ -PR_EXTERN(void) SetSecurityContext(JNIEnv* proxyEnv, nsISecurityContext *context); - -/** - * Gets current SecurityContext for proxy env - */ -PR_EXTERN(nsresult) GetSecurityContext(JNIEnv* proxyEnv, nsISecurityContext **context); -#endif /* PROXY_JNI_H */ -
deleted file mode 100644 --- a/modules/oji/public/nsIJRIPlugin.h +++ /dev/null @@ -1,85 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * 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 - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -//////////////////////////////////////////////////////////////////////////////// -// NETSCAPE JAVA VM PLUGIN EXTENSIONS -// -// This interface allows a Java virtual machine to be plugged into -// Communicator to implement the APPLET tag and host applets. -// -// Note that this is the C++ interface that the plugin sees. The browser -// uses a specific implementation of this, nsJVMPlugin, found in jvmmgr.h. -//////////////////////////////////////////////////////////////////////////////// - -#ifndef nsIJRIPlugin_h___ -#define nsIJRIPlugin_h___ - -#include "nsISupports.h" -#include "jri.h" - -//////////////////////////////////////////////////////////////////////////////// -// JRI Plugin Class Interface -// This interface is provided for backward compatibility for the Netscape JVM. - -class nsIJRIPlugin : public nsISupports { -public: - - // QueryInterface on nsIJVMPlugin to get this. - - // Find or create a JRIEnv for the current thread. - // Returns NULL if an error occurs. - NS_IMETHOD_(nsrefcnt) - GetJRIEnv(JRIEnv* *result) = 0; - - // This method must be called when the caller is done using the JRIEnv. - // This decrements a refcount associated with it may free it. - NS_IMETHOD_(nsrefcnt) - ReleaseJRIEnv(JRIEnv* env) = 0; - -}; - -#define NS_IJRIPLUGIN_IID \ -{ /* bfe2d7d0-0164-11d2-815b-006008119d7a */ \ - 0xbfe2d7d0, \ - 0x0164, \ - 0x11d2, \ - {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - -//////////////////////////////////////////////////////////////////////////////// - -#endif /* nsIJRIPlugin_h___ */
deleted file mode 100644 --- a/modules/oji/public/nsIJVMConfigManager.idl +++ /dev/null @@ -1,80 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * <