Attachment #248258 for bug #429739

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




	} else if (propertyName.equals (XPCOM.NS_GRE_DIR)) {
		propertyValue = mozillaPath;
	} else if (propertyName.equals (XPCOM.NS_GRE_COMPONENT_DIR)) {
		propertyValue = mozillaPath + COMPONENTS_DIR;
	} else if (propertyName.equals (XPCOM.NS_XPCOM_INIT_CURRENT_PROCESS_DIR)) {
		propertyValue = mozillaPath;
	} else if (propertyName.equals (XPCOM.NS_OS_CURRENT_PROCESS_DIR)) {
		propertyValue = mozillaPath;
	} else if (propertyName.equals (XPCOM.NS_XPCOM_COMPONENT_DIR)) {
		propertyValue = profilePath + COMPONENTS_DIR;
	} else if (propertyName.equals (XPCOM.NS_XPCOM_CURRENT_PROCESS_DIR)) {
		propertyValue = profilePath;
	} else if (propertyName.equals (XPCOM.NS_APP_PREF_DEFAULTS_50_DIR)) {
		/*
		* Answering a value for this property causes problems in Mozilla versions




	XPCOMObject supports;
	XPCOMObject external;
	XPCOMObject classInfo;
	XPCOMObject securityCheckedComponent;
	XPCOMObject scriptObjectOwner;
	XPCOMObject xpcScriptable;
	int refCount = 0;
	
	static final String CALLJAVA = "callJava"; //$NON-NLS-1$

	static Callback CallJavaProc, GetScriptableFlags24Proc = null;
	static {
		CallJavaProc = new Callback (External.class, CALLJAVA, 3);
		if (CallJavaProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);

		/*
		 * On win32 a substitute callback is provided for nsIXPCScriptable.getScriptableFlags()
		 * because it does not use the standard XPCOM calling convention.
		 */
		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24) && SWT.getPlatform ().equals ("win32")) { //$NON-NLS-1$
			GetScriptableFlags24Proc = new Callback (External.class, "getScriptableFlags", 0); //$NON-NLS-1$
			if (GetScriptableFlags24Proc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
		}
	}

External () {
	createCOMInterfaces ();


/* external */

/*
 * This is the BrowserFunction entry point for XULRunner releases >= 4 because
 * QueryInterface answers an nsIScriptObjectOwner implementation (which points
 * at this function) iff the detected XULRunner version is >= 4.
 */
static long /*int*/ callJava (long /*int*/ cx, long /*int*/ argc, long /*int*/ vp) {
	int jsval_sizeof = 8;
	long /*int*/ argsPtr = vp + 2 * jsval_sizeof;
	nsIVariant resultVariant = null;

	long /*int*/[] result = new long /*int*/[1];
	int rc = XPCOM.NS_GetServiceManager (result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
	result[0] = 0;
	rc = serviceManager.GetService (XPCOM.NS_IXPCONNECT_CID, IIDStore.GetIID (nsIXPConnect.class), result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

	nsIXPConnect connect = new nsIXPConnect (result[0]);
	result[0] = 0;

	/* extract the first argument value (the function id) */
	rc = connect.JSValToVariant (cx, argsPtr, result);
	if (rc == XPCOM.NS_OK && result[0] != 0) {
		nsIVariant idVariant = new nsIVariant (result[0]);
		result[0] = 0;
		short[] dataType = new short[1];
		rc = idVariant.GetDataType (dataType);
		if (rc == XPCOM.NS_OK && dataType[0] == nsIDataType.VTYPE_INT32) {
			int[] intResult = new int[1];
			rc = idVariant.GetAsInt32 (intResult); /* PRInt32 */
			if (rc == XPCOM.NS_OK) {
				int functionId = intResult[0];

				/* get the second argument variant (the token string) */
				argsPtr += jsval_sizeof;
				rc = connect.JSValToVariant (cx, argsPtr, result);
				if (rc == XPCOM.NS_OK && result[0] != 0) {
					long /*int*/ tokenVariant = result[0];
					result[0] = 0;

					/* get the third argument variant (the invocation args) */
					argsPtr += jsval_sizeof;
					rc = connect.JSValToVariant (cx, argsPtr, result);
					if (rc == XPCOM.NS_OK && result[0] != 0) {
						long /*int*/ argsVariant = result[0];
						result[0] = 0;

						/* invoke the BrowserFunction */
						resultVariant = new nsIVariant (invokeFunction (functionId, tokenVariant, argsVariant));
						new nsISupports (argsVariant).Release ();
					}
					new nsISupports (tokenVariant).Release ();
				}
			}
		}
		idVariant.Release ();
	}
	result[0] = 0;

	/* if the BrowserFunction could not be invoked for some reason then return null to JS */
	if (resultVariant == null) {
		rc = XPCOM.NS_GetComponentManager (result);
		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
		if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
		result[0] = 0;
		resultVariant = convertToJS (null, componentManager);
		componentManager.Release ();
	}

	/* convert the resulting variant to a jsval */
	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIMemory.class), result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
	serviceManager.Release();

	nsIMemory memory = new nsIMemory (result[0]);
	result[0] = 0;
	long /*int*/ jsVal = memory.Alloc (jsval_sizeof);
	C.memset (jsVal, 0, jsval_sizeof);
	long /*int*/ globalObject = 0;
	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) {
		globalObject = XPCOM.JS_GetGlobalForScopeChain24 (cx);
	} else {
		globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx);
	}
	rc = connect.VariantToJS (cx, globalObject, resultVariant.getAddress (), jsVal);
	resultVariant.Release ();
	connect.Release ();

	long /*int*/ returnValue = XPCOM.JS_FALSE;
	if (rc == XPCOM.NS_OK) {
		/* write the jsval to the return value slot */
		C.memmove (vp, jsVal, jsval_sizeof);
		returnValue = XPCOM.JS_TRUE;
	}
	memory.Free (jsVal);
	memory.Release ();
	return returnValue;
}

/* this is the BrowserFunction entry point when the detected XULRunner version is < 4 */
static int callJava (int functionId, long /*int*/ tokenVariant, long /*int*/ argsVariant, long /*int*/ returnPtr) {
	long /*int*/ resultVariant = invokeFunction (functionId, tokenVariant, argsVariant);
	C.memmove (returnPtr, new long /*int*/[] {resultVariant}, C.PTR_SIZEOF);
	return XPCOM.NS_OK;
}

static Object convertToJava (nsIVariant variant) {
	short[] dataType = new short[1];
	int rc = variant.GetDataType (dataType);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	switch (dataType[0]) {
		case nsIDataType.VTYPE_EMPTY:
		case nsIDataType.VTYPE_VOID:
			return null;

			return new Object[0];
		case nsIDataType.VTYPE_BOOL:
			int[] boolResult = new int[1]; /*PRInt32*/
			rc = variant.GetAsBool (boolResult);
			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
			return new Boolean (boolResult[0] != 0);
		case nsIDataType.VTYPE_INT32:


					nsIVariant currentVariant = new nsIVariant (result[0]);
					result[0] = 0;
					currentType[0] = 0;
					rc = currentVariant.GetDataType (currentType);
					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
					try {
						arrayReturn[i] = convertToJava (currentVariant);
						currentVariant.Release ();
					} catch (IllegalArgumentException e) {
						/* invalid argument value type */


	if (function != null) {
		try {
			short[] type = new short[1]; /* PRUint16 */
			nsIVariant variant = new nsIVariant (tokenVariant);
			Object temp = convertToJava (variant);
			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
			Object temp = convertToJava (variant, type[0]);
			type[0] = 0;
			if (temp instanceof String) {
				String token = (String)temp;
				if (token.equals (function.token)) {
					variant = new nsIVariant (args);
					temp = convertToJava (variant);
					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
					temp = convertToJava (variant, type[0]);
					if (temp instanceof Object[]) {
						Object[] arguments = (Object[])temp;
						try {

		public long /*int*/ method10 (long /*int*/[] args) {return getClassIDNoAlloc (args[0]);}
	};

	securityCheckedComponent = new XPCOMObject (new int[] {2, 0, 0, 2, 3, 3, 3}) {
		@Override
		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
		@Override
		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
		@Override
		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
		@Override
		public long /*int*/ method3 (long /*int*/[] args) {return canCreateWrapper (args[0], args[1]);}
		@Override
		public long /*int*/ method4 (long /*int*/[] args) {return canCallMethod (args[0], args[1], args[2]);}
		@Override
		public long /*int*/ method5 (long /*int*/[] args) {return canGetProperty (args[0], args[1], args[2]);}
		@Override
		public long /*int*/ method6 (long /*int*/[] args) {return canSetProperty (args[0], args[1], args[2]);}
	};

	external = new XPCOMObject (new int[] {2, 0, 0, 4}) {
		@Override
		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

		@Override
		public long /*int*/ method3 (long /*int*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2], args[3]);}
	};

	scriptObjectOwner = new XPCOMObject (new int[] {2, 0, 0, 2, 1}) {
		@Override
		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
		@Override
		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
		@Override
		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
		@Override
		public long /*int*/ method3 (long /*int*/[] args) {return getScriptObject (args[0], args[1]);}
		@Override
		public long /*int*/ method4 (long /*int*/[] args) {return setScriptObject (args[0]);}
	};

	xpcScriptable = new XPCOMObject (new int[] {2, 0, 0, 1, 0, 4, 3, 3, 3, 6, 5, 6, 6, 4, 7, 7, 6, 3, 7, 5, 5, 6, 4, 2}) {
		@Override
		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
		@Override
		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
		@Override
		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
		@Override
		public long /*int*/ method3 (long /*int*/[] args) {return getClassName (args[0]);}
		@Override
		public long /*int*/ method4 (long /*int*/[] args) {return getScriptableFlags ();}
		@Override
		public long /*int*/ method7 (long /*int*/[] args) {return postCreate (args[0], args[1], args[2]);}
	};

	if (GetScriptableFlags24Proc != null) {
		long /*int*/ ppVtable = xpcScriptable.getVtable ();
		long /*int*/[] pVtable = new long /*int*/[1];
		C.memmove (pVtable, ppVtable, C.PTR_SIZEOF);
		long /*int*/[] funcs = new long /*int*/[24];
		C.memmove (funcs, pVtable[0], C.PTR_SIZEOF * funcs.length);
		funcs[4] = XPCOM.CALLBACK_GetScriptableFlags24 (GetScriptableFlags24Proc.getAddress ());
		C.memmove (pVtable[0], funcs, C.PTR_SIZEOF * funcs.length);
	}
}

void disposeCOMInterfaces () {

		classInfo.dispose ();
		classInfo = null;
	}
	if (securityCheckedComponent != null) {
		securityCheckedComponent.dispose ();
		securityCheckedComponent = null;
	}
	if (external != null) {
		external.dispose ();
		external = null;
	}
	if (scriptObjectOwner != null) {
		scriptObjectOwner.dispose ();
		scriptObjectOwner = null;
	}
	if (xpcScriptable != null) {
		xpcScriptable.dispose ();
		xpcScriptable = null;
	}
}

long /*int*/ getAddress () {

		AddRef();
		return XPCOM.NS_OK;
	}
	if (guid.Equals (XPCOM.NS_ISECURITYCHECKEDCOMPONENT_IID)) {
		XPCOM.memmove (ppvObject, new long /*int*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
		AddRef();
		return XPCOM.NS_OK;
	}
	if (guid.Equals (EXTERNAL_IID)) {
		XPCOM.memmove (ppvObject, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
		AddRef();
		return XPCOM.NS_OK;
	}

	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
		if (guid.Equals (XPCOM.NS_ISCRIPTOBJECTOWNER_IID)) {
			XPCOM.memmove (ppvObject, new long /*int*/[] {scriptObjectOwner.getAddress ()}, C.PTR_SIZEOF);
			AddRef();
			return XPCOM.NS_OK;
		}
		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) {
			if (guid.Equals (XPCOM.NS_IXPCSCRIPTABLE_IID)) {
				XPCOM.memmove (ppvObject, new long /*int*/[] {xpcScriptable.getAddress ()}, C.PTR_SIZEOF);
				AddRef();
				return XPCOM.NS_OK;
			}
		}
	}

	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
	return XPCOM.NS_ERROR_NO_INTERFACE;
}

}

int getFlags (long /*int*/ flags) {
	C.memmove (flags, new int[] {nsIClassInfo.DOM_OBJECT}, 4); /* PRUint32 */
	return XPCOM.NS_OK;
}



	nsIMemory memory = new nsIMemory (result[0]);
	result[0] = 0;
	long /*int*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
	XPCOM.memmove (securityCheckedComponentIID, XPCOM.NS_ISECURITYCHECKEDCOMPONENT_IID, nsID.sizeof);
	long /*int*/ externalIID = memory.Alloc (nsID.sizeof);
	XPCOM.memmove (externalIID, EXTERNAL_IID, nsID.sizeof);
	long /*int*/ ptrArray = memory.Alloc (C.PTR_SIZEOF);
	C.memmove (ptrArray, new long /*int*/[] {externalIID}, C.PTR_SIZEOF);
	C.memmove (ptrArray + C.PTR_SIZEOF, new long /*int*/[] {externalIID}, C.PTR_SIZEOF);

	C.memmove (array, new long /*int*/[] {ptrArray}, C.PTR_SIZEOF);
	memory.Release ();

	C.memmove (count, new int[] {1}, 4); /* PRUint */
	return XPCOM.NS_OK;
}

/* nsIScriptObjectOwner */

int getScriptObject (long /*int*/ aContext, long /*int*/ aScriptObject) {
	byte[] jsLibPath = Mozilla.getJSLibPathBytes ();
	long /*int*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (aContext);
	long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
	long /*int*/ newObject = XPCOM.JS_NewObject (jsLibPath, nativeContext, 0, 0, globalJSObject);

	byte[] functionName = MozillaDelegate.wcsToMbcs (null, CALLJAVA, true);
	int flags = XPCOM.JSPROP_ENUMERATE | XPCOM.JSPROP_READONLY | XPCOM.JSPROP_PERMANENT;
	XPCOM.JS_DefineFunction (jsLibPath, nativeContext, newObject, functionName, XPCOM.CALLBACK_JSNative (CallJavaProc.getAddress ()), 3, flags);
	XPCOM.memmove (aScriptObject, new long /*int*/[] {newObject}, C.PTR_SIZEOF);
	return XPCOM.NS_OK;
}

int setScriptObject (long /*int*/ aScriptObject) {
	return XPCOM.NS_COMFALSE;
}

/* nsISecurityCheckedComponent */

int canCreateWrapper (long /*int*/ iid, long /*int*/ _retVal) {
	long /*int*/[] result = new long /*int*/[1];
	int rc = XPCOM.NS_GetServiceManager (result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
	result[0] = 0;
	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIMemory.class), result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
	serviceManager.Release ();

	nsIMemory memory = new nsIMemory (result[0]);
	result[0] = 0;
	byte[] bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$
	long /*int*/ ptr = memory.Alloc (bytes.length);
	C.memmove (ptr, bytes, bytes.length);
	C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
	memory.Release ();

	return XPCOM.NS_OK;
}

int canCallMethod (long /*int*/ iid, long /*int*/ methodName, long /*int*/ _retVal) {
	long /*int*/[] result = new long /*int*/[1];
	int rc = XPCOM.NS_GetServiceManager (result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
	result[0] = 0;
	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIMemory.class), result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
	serviceManager.Release ();

	nsIMemory memory = new nsIMemory (result[0]);
	result[0] = 0;
	int length = XPCOM.strlen_PRUnichar (methodName);
	char[] dest = new char[length];
	XPCOM.memmove (dest, methodName, length * 2);
	String string = new String (dest);
	byte[] bytes;
	if (string.equals (CALLJAVA)) {
		bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$ 
	} else {
		bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
	}
	long /*int*/ ptr = memory.Alloc (bytes.length);
	C.memmove (ptr, bytes, bytes.length);
	C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
	memory.Release ();

	return XPCOM.NS_OK;
}

int canGetProperty (long /*int*/ iid, long /*int*/ propertyName, long /*int*/ _retVal) {
	long /*int*/[] result = new long /*int*/[1];
	int rc = XPCOM.NS_GetServiceManager (result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
	result[0] = 0;
	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIMemory.class), result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
	serviceManager.Release ();

	nsIMemory memory = new nsIMemory (result[0]);
	result[0] = 0;
	byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
	long /*int*/ ptr = memory.Alloc (bytes.length);
	C.memmove (ptr, bytes, bytes.length);
	C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
	memory.Release ();

	return XPCOM.NS_OK;
}

int canSetProperty (long /*int*/ iid, long /*int*/ propertyName, long /*int*/ _retVal) {
	long /*int*/[] result = new long /*int*/[1];
	int rc = XPCOM.NS_GetServiceManager (result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
	result[0] = 0;
	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIMemory.class), result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
	serviceManager.Release ();

	nsIMemory memory = new nsIMemory (result[0]);
	result[0] = 0;
	byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
	long /*int*/ ptr = memory.Alloc (bytes.length);
	C.memmove (ptr, bytes, bytes.length);
	C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
	memory.Release ();

	return XPCOM.NS_OK;
}

/* nsIXPCScriptable */

long /*int*/ getClassName (long /*int*/ aClassName) {
	long /*int*/[] result = new long /*int*/[1];
	int rc = XPCOM.NS_GetServiceManager (result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
	result[0] = 0;
	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIMemory.class), result);
	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
	serviceManager.Release ();

	nsIMemory memory = new nsIMemory (result[0]);
	result[0] = 0;
	byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
	long /*int*/ ptr = memory.Alloc (bytes.length);
	C.memmove (ptr, bytes, bytes.length);
	C.memmove (aClassName, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
	memory.Release ();

	return 0;
}

static long /*int*/ getScriptableFlags () {
	return XPCOM.WANT_POSTCREATE | XPCOM.USE_JSSTUB_FOR_ADDPROPERTY;
}

int postCreate (long /*int*/ wrapper, long /*int*/ cx, long /*int*/ obj) {
	byte[] functionName = MozillaDelegate.wcsToMbcs (null, CALLJAVA, true);
	int flags = XPCOM.JSPROP_ENUMERATE | XPCOM.JSPROP_READONLY | XPCOM.JSPROP_PERMANENT;
	XPCOM.JS_DefineFunction24 (cx, obj, functionName, XPCOM.CALLBACK_JSNative (CallJavaProc.getAddress ()), 3, flags);
	return 0;
}

}




			LocationProvider = new AppFileLocProvider (MozillaPath, profilePath, cacheParentPath, IsXULRunner);
			LocationProvider.AddRef ();

			/* write swt.xpt to the file system if needed */
			initExternal (LocationProvider.profilePath);

			/* invoke appropriate Init function (based on mozilla version) */

}

@Override
public Object evaluate (String script) throws SWTException {
	if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24))
		return super.evaluate (script);

	delegate.removeWindowSubclass ();

	long /*int*/[] result = new long /*int*/[1];
	int rc = webBrowser.QueryInterface(IIDStore.GetIID (nsIInterfaceRequestor.class), result);
	if (rc != XPCOM.NS_OK) error (rc);
	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
	nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
	result[0] = 0;
	rc = XPCOM.NS_GetServiceManager (result);
	if (rc != XPCOM.NS_OK) error (rc);
	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
	result[0] = 0;
	rc = interfaceRequestor.GetInterface (IIDStore.GetIID (nsIDOMWindow.class), result);
	interfaceRequestor.Release ();
	if (rc != XPCOM.NS_OK) error (rc);
	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

	nsIDOMWindow window = new nsIDOMWindow (result[0]);
	result[0] = 0;
	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.EXECUTE_CONTRACTID, true);
	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (Execute.class), result);
	if (rc != XPCOM.NS_OK) error (rc);
	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

	Execute execute = new Execute (result[0]);
	result[0] = 0;
	nsEmbedString data = new nsEmbedString (script);
	execute.EvalInWindow (window, data, result);
	data.dispose ();
	execute.Release ();
	if (result[0] == 0)
		return null;

	nsIVariant variant = new nsIVariant (result[0]);
	Object retval = External.convertToJava (variant);
	variant.Release ();
	return retval;
}
@Override
public boolean execute (String script) {
	/*
	* This could be the first content that is set into the browser, so

	*/
	delegate.removeWindowSubclass ();

	long /*int*/[] result = new long /*int*/[1];
	/*
	* As of mozilla 1.9 executing javascript via the javascript: protocol no
	* longer happens synchronously.  As a result, the result of executing JS
	* is not returned to the java side when expected by the client.  The
	* workaround for version 24 is to use a javascript-implemented component
	* which then executes synchronously.
	*/
	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) {
		result[0] = 0;
		int rc = webBrowser.QueryInterface(IIDStore.GetIID (nsIInterfaceRequestor.class), result);
		if (rc != XPCOM.NS_OK) error (rc);
		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
		result[0] = 0;
		rc = XPCOM.NS_GetServiceManager (result);
		if (rc != XPCOM.NS_OK) error (rc);
		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

		nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
		result[0] = 0;
		rc = interfaceRequestor.GetInterface (IIDStore.GetIID (nsIDOMWindow.class), result);
		interfaceRequestor.Release ();
		if (rc != XPCOM.NS_OK) error (rc);
		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

		nsIDOMWindow window = new nsIDOMWindow (result[0]);
		result[0] = 0;
		byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.EXECUTE_CONTRACTID, true);
		rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (Execute.class), result);
		if (rc != XPCOM.NS_OK) error (rc);
		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

		Execute execute = new Execute (result[0]);
		result[0] = 0;
		nsEmbedString data = new nsEmbedString (script);
		execute.EvalInWindow (window, data, result);
		if (result[0] != 0)
			new nsIVariant (result[0]).Release ();
		data.dispose ();
		execute.Release ();
		return true;
	}

	/*
	* As of mozilla 1.9 executing javascript via the javascript: protocol no
	* longer happens synchronously.  As a result, the result of executing JS

	* workaround is to invoke the javascript handler directly via C++, which is
	* exposed as of mozilla 1.9.
	*/
	long /*int*/[] result = new long /*int*/[1];
	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_9)) {
		int rc = XPCOM.NS_GetServiceManager (result);
		if (rc != XPCOM.NS_OK) error (rc);

				if (rc == XPCOM.NS_OK && result[0] != 0) {
					long /*int*/ scriptGlobalObject = result[0];
					result[0] = 0;
					rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
						rc = (int/*64*/)XPCOM.nsIScriptGlobalObject24_EnsureScriptEnvironment (scriptGlobalObject);
					} else {
						rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
					}
					if (rc != XPCOM.NS_OK) {
						new nsISupports (scriptGlobalObject).Release ();
					} else {
						long /*int*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
						if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */
							scriptContext = XPCOM.nsIScriptGlobalObject24_GetScriptContext (scriptGlobalObject);
						} else {
							scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
						}

						if (scriptContext != 0) {
							/* ensure that the received nsIScriptContext implements the expected interface */

								new nsISupports (result[0]).Release ();
								result[0] = 0;

								long /*int*/ jsContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
								if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */
									jsContext = XPCOM.nsIScriptContext24_GetNativeContext (scriptContext);
								} else {
									jsContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
								}
								if (jsContext != 0) {
									int length = script.length ();
									char[] scriptChars = new char[length];

										result[0] = 0;
									}
									byte[] jsLibPath = getJSLibPathBytes ();
									long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, jsContext);
									if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */
										globalJSObject = XPCOM.nsIScriptGlobalObject24_GetGlobalJSObject (scriptGlobalObject);
									} else {
										globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, jsContext);
									}
									if (globalJSObject != 0) {
										if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */
											boolean success = XPCOM.JS_EvaluateUCScriptForPrincipals24 (jsLibPath, jsContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, 0) != 0;
											// should principals be Release()d too?
											new nsISupports (scriptGlobalObject).Release ();
											principal.Release ();
											serviceManager.Release ();
											return success;
										}
										/* 1.9.x - 10.x */
										aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
										rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIJSContextStack.class), result);
										if (rc == XPCOM.NS_OK && result[0] != 0) {


void initExternal (String profilePath) {
	File componentsDir = new File (profilePath, AppFileLocProvider.COMPONENTS_DIR);
	java.io.InputStream is = Library.class.getResourceAsStream ("/swt.xpt"); //$NON-NLS-1$
	if (is != null) {
		if (!componentsDir.exists ()) {
			componentsDir.mkdirs ();
		}
		int read;
		byte [] buffer = new byte [4096];
		File file = new File (componentsDir, "swt.xpt"); //$NON-NLS-1$
		try {
			FileOutputStream os = new FileOutputStream (file);
			while ((read = is.read (buffer)) != -1) {
				os.write(buffer, 0, read);
			}
			os.close ();
			is.close ();
		} catch (FileNotFoundException e) {
		} catch (IOException e) {
		}
	}
	is = Library.class.getResourceAsStream ("/swt.js"); //$NON-NLS-1$
	if (is != null) {
		if (!componentsDir.exists ()) {
			componentsDir.mkdirs ();
		}
		int read;
		byte [] buffer = new byte [4096];
		File file = new File (componentsDir, "swt.js"); //$NON-NLS-1$
		try {
			FileOutputStream os = new FileOutputStream (file);
			while ((read = is.read (buffer)) != -1) {
				os.write(buffer, 0, read);
			}
			os.close ();
			is.close ();
		} catch (FileNotFoundException e) {
		} catch (IOException e) {
		}
	}
	is = Library.class.getResourceAsStream ("/chrome.manifest"); //$NON-NLS-1$
	if (is != null) {
		int read;
		byte [] buffer = new byte [4096];
		File file = new File (profilePath, "chrome.manifest"); //$NON-NLS-1$
		try {
			FileOutputStream os = new FileOutputStream (file);
			while ((read = is.read (buffer)) != -1) {

			error (XPCOM.NS_ERROR_NULL_POINTER);
		}

		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24, true)) {
			Library.loadLibrary("swt-xulrunner24"); //$NON-NLS-1$
		}
		MozillaDelegate.loadAdditionalLibraries (mozillaPath, true);

		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {




/* ***** BEGIN LICENSE BLOCK *****
 * Version: MPL 1.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 Communicator client code, released March 31, 1998.
 *
 * The Initial Developer of the Original Code is
 * Netscape Communications Corporation.
 * Portions created by Netscape are Copyright (C) 1998-1999
 * Netscape Communications Corporation.  All Rights Reserved.
 *
 * Contributor(s):
 *
 * IBM
 * -  Binding to permit interfacing between Mozilla and SWT
 * -  Copyright (C) 2003, 2012 IBM Corp.  All Rights Reserved.
 *
 * ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.mozilla;


public class Execute extends nsISupports {

	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;

	static final String EXECUTE_IID_STR = "75a03044-d129-4d96-9292-bc1623876de1";

	static {
		IIDStore.RegisterIID(Execute.class, MozillaVersion.VERSION_BASE, new nsID(EXECUTE_IID_STR));
	}

	public Execute(long /*int*/ address) {
		super(address);
	}

	public int EvalInWindow(nsIDOMWindow aWindow, nsEmbedString code, long /*int*/[] aVariant) {
    return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWindow.getAddress(), code.getAddress(), aVariant);
	}
}




	public static final nsID NS_IXPCSCRIPTABLE_IID = new nsID ("155d1863-2b0b-4f5e-b800-05184944156b"); //$NON-NLS-1$

	/* contract ID constants */
	public static final String EXECUTE_CONTRACTID = "@eclipse.org/execute;1"; //$NON-NLS-1$
	public static final String EXTERNAL_CONTRACTID = "@eclipse.org/external;1"; //$NON-NLS-1$
	public static final String NS_AUTHPROMPTER_CONTRACTID = "@mozilla.org/passwordmanager/authpromptfactory;1"; //$NON-NLS-1$
	public static final String NS_CERTOVERRIDE_CONTRACTID = "@mozilla.org/security/certoverride;1"; //$NON-NLS-1$

	public static final int SEC_ERROR_UNTRUSTED_CERT = 0x805A1FEB;
	public static final int SEC_ERROR_UNTRUSTED_ISSUER = 0x805A1FEC;
	public static final int SSL_ERROR_BAD_CERT_DOMAIN = 0x805A2FF4;
	public static final int USE_JSSTUB_FOR_ADDPROPERTY = 1 << 17;
	public static final int WANT_POSTCREATE = 4;

	/* JSAPI constants */
	public static final int JSPROP_ENUMERATE = 0x1;
	public static final int JSPROP_PERMANENT = 0x4;
	public static final int JSPROP_READONLY = 0x2;
	public static final int JS_FALSE = 0x0;
	public static final int JS_TRUE = 0x1;

public static final native int nsDynamicFunctionLoad_sizeof ();


public static final native long /*int*/ CALLBACK_JSNative(long /*int*/ func);

/** @method flags=no_gen */
public static final native long /*int*/ _JS_DefineFunction(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags);	
public static final long /*int*/ JS_DefineFunction(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags) {
	lock.lock();
	try {
		return _JS_DefineFunction(mozillaPath, cx, obj, name, call, nargs, flags);
	} finally {
		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native long /*int*/ _JS_DefineFunction24(long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags);	
public static final long /*int*/ JS_DefineFunction24(long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags) {
	lock.lock();
	try {
		return _JS_DefineFunction24(cx, obj, name, call, nargs, flags);
	} finally {
		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal);	
public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal) {
	lock.lock();

	}
}
/** @method flags=no_gen */
public static final native int _JS_EvaluateUCScriptForPrincipals24(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/ retVal);	
public static final int JS_EvaluateUCScriptForPrincipals24(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/ retVal) {
	lock.lock();
	try {
		return _JS_EvaluateUCScriptForPrincipals24(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
	} finally {
		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native long /*int*/ _JS_GetGlobalForScopeChain24(long /*int*/ cx);	
public static final long /*int*/ JS_GetGlobalForScopeChain24(long /*int*/ cx) {
	lock.lock();
	try {
		return _JS_GetGlobalForScopeChain24(cx);
	} finally {
		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native long /*int*/ _JS_GetGlobalObject(byte[] mozillaPath, long /*int*/ cx);	
public static final long /*int*/ JS_GetGlobalObject(byte[] mozillaPath, long /*int*/ cx) {
	lock.lock();

	}
}
/** @method flags=no_gen */
public static final native long /*int*/ _JS_NewObject(byte[] mozillaPath, long /*int*/ cx, long /*int*/ clasp, long /*int*/ proto, long /*int*/ parent);	
public static final long /*int*/ JS_NewObject(byte[] mozillaPath, long /*int*/ cx, long /*int*/ clasp, long /*int*/ proto, long /*int*/ parent) {
	lock.lock();
	try {
		return _JS_NewObject(mozillaPath, cx, clasp, proto, parent);
	} finally {
		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native boolean _NS_Free(byte[] mozillaPath, long /*int*/ aPtr);
public static final boolean NS_Free(byte[] mozillaPath, long /*int*/ aPtr) {
	lock.lock();

		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native int _nsIScriptGlobalObject24_EnsureScriptEnvironment(long /*int*/ ptr);
public static final int nsIScriptGlobalObject24_EnsureScriptEnvironment(long /*int*/ ptr) {
	lock.lock();
	try {
		return _nsIScriptGlobalObject24_EnsureScriptEnvironment(ptr);
	} finally {
		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native long /*int*/ _nsIScriptGlobalObject24_GetGlobalJSObject(long /*int*/ ptr);
public static final long /*int*/ nsIScriptGlobalObject24_GetGlobalJSObject(long /*int*/ ptr) {
	lock.lock();
	try {
		return _nsIScriptGlobalObject24_GetGlobalJSObject(ptr);
	} finally {
		lock.unlock();
	}
}
/**
 * @method flags=cpp
 * @param ptr cast=(nsIScriptGlobalObject *)

		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native long /*int*/ _nsIScriptGlobalObject24_GetScriptContext(long /*int*/ ptr);
public static final long /*int*/ nsIScriptGlobalObject24_GetScriptContext(long /*int*/ ptr) {
	lock.lock();
	try {
		return _nsIScriptGlobalObject24_GetScriptContext(ptr);
	} finally {
		lock.unlock();
	}
}
/**
 * @method flags=cpp
 * @param ptr cast=(nsIScriptContext *)

		lock.unlock();
	}
}
/** @method flags=no_gen */
public static final native long /*int*/ _nsIScriptContext24_GetNativeContext(long /*int*/ ptr);
public static final long /*int*/ nsIScriptContext24_GetNativeContext(long /*int*/ ptr) {
	lock.lock();
	try {
		return _nsIScriptContext24_GetNativeContext(ptr);
	} finally {
		lock.unlock();
	}
}
/**
 * @method flags=cpp
 * @param ptr cast=(nsEmbedCString *)




/*******************************************************************************
 * Copyright (c) 2008, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation
 *******************************************************************************/

// to compile: xpidl -m typelib -I S:\swt-builddir\gecko-sdk\idl\ -e external.xpt external.idl

#include "nsISupports.idl"
#include "nsIVariant.idl"

[scriptable, uuid(ded01d20-ba6f-11dd-ad8b-0800200c9a66)]

interface External : nsISupports {
    nsIVariant callJava (in unsigned long index, in nsIVariant token, in nsIVariant args);
};




/*******************************************************************************
 * Copyright (c) 2008, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation
 *******************************************************************************/

// to compile: xpidl -m typelib -I S:\swt-builddir\gecko-sdk\idl\ -e external.xpt external.idl

#include "nsISupports.idl"
interface nsIVariant;
interface nsIDOMWindow;

[scriptable, uuid(ded01d20-ba6f-11dd-ad8b-0800200c9a66)]

interface External : nsISupports {
    nsIVariant callJava (in unsigned long index, in nsIVariant token, in nsIVariant args);
};

[scriptable, uuid(75a03044-d129-4d96-9292-bc1623876de1)]

interface Execute : nsISupports {
    nsIVariant evalInWindow (in nsIDOMWindow window, in AString code);
    nsIVariant evalAsChrome (in nsIDOMWindow window, in AString code);
    void evalAsync (in nsIDOMWindow window, in AString code);
};




Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");

function execute() {
}

execute.prototype.evalInWindow = function(aWindow, aString) {
    aWindow = XPCNativeWrapper.unwrap(aWindow);
    try {
        aWindow.external.QueryInterface(Components.interfaces.External);
    } catch (e) {
        aWindow.external = Components.classes["@eclipse.org/external;1"].createInstance();
    }
    return aWindow.eval(aString);
};

execute.prototype.evalAsChrome = function(aWindow, aString) {
    with (aWindow) {
        return eval(aString);
    }
};

execute.prototype.evalAsync = function(aWindow, aString) {
    aWindow.location = "javascript:" + unescape(aString) + ";void(0);";
};

execute.prototype.QueryInterface = XPCOMUtils.generateQI([Components.interfaces.Execute]);

execute.prototype.classID = Components.ID("{0aebcff1-f7b3-4522-a64b-1706d65dc232}");

var NSGetFactory = XPCOMUtils.generateNSGetFactory([execute]);

Return to bug 429739

Lines 92-97 public class XPCOM extends C { Link Here

(-)a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java (-99 / +1 lines)
92	public static final nsID NS_IXPCSCRIPTABLE_IID = new nsID ("155d1863-2b0b-4f5e-b800-05184944156b"); //$NON-NLS-1$	92	public static final nsID NS_IXPCSCRIPTABLE_IID = new nsID ("155d1863-2b0b-4f5e-b800-05184944156b"); //$NON-NLS-1$
93		93
94	/* contract ID constants */	94	/* contract ID constants */
		95	public static final String EXECUTE_CONTRACTID = "@eclipse.org/execute;1"; //$NON-NLS-1$
95	public static final String EXTERNAL_CONTRACTID = "@eclipse.org/external;1"; //$NON-NLS-1$	96	public static final String EXTERNAL_CONTRACTID = "@eclipse.org/external;1"; //$NON-NLS-1$
96	public static final String NS_AUTHPROMPTER_CONTRACTID = "@mozilla.org/passwordmanager/authpromptfactory;1"; //$NON-NLS-1$	97	public static final String NS_AUTHPROMPTER_CONTRACTID = "@mozilla.org/passwordmanager/authpromptfactory;1"; //$NON-NLS-1$
97	public static final String NS_CERTOVERRIDE_CONTRACTID = "@mozilla.org/security/certoverride;1"; //$NON-NLS-1$	98	public static final String NS_CERTOVERRIDE_CONTRACTID = "@mozilla.org/security/certoverride;1"; //$NON-NLS-1$
Lines 175-189 public class XPCOM extends C { Link Here
175	public static final int SEC_ERROR_UNTRUSTED_CERT = 0x805A1FEB;	176	public static final int SEC_ERROR_UNTRUSTED_CERT = 0x805A1FEB;
176	public static final int SEC_ERROR_UNTRUSTED_ISSUER = 0x805A1FEC;	177	public static final int SEC_ERROR_UNTRUSTED_ISSUER = 0x805A1FEC;
177	public static final int SSL_ERROR_BAD_CERT_DOMAIN = 0x805A2FF4;	178	public static final int SSL_ERROR_BAD_CERT_DOMAIN = 0x805A2FF4;
178	public static final int USE_JSSTUB_FOR_ADDPROPERTY = 1 << 17;
179	public static final int WANT_POSTCREATE = 4;
180
181	/* JSAPI constants */
182	public static final int JSPROP_ENUMERATE = 0x1;
183	public static final int JSPROP_PERMANENT = 0x4;
184	public static final int JSPROP_READONLY = 0x2;
185	public static final int JS_FALSE = 0x0;
186	public static final int JS_TRUE = 0x1;
187		179
188	public static final native int nsDynamicFunctionLoad_sizeof ();	180	public static final native int nsDynamicFunctionLoad_sizeof ();
189		181
Lines 234-259 public static final native long /int/ CALLBACK_GetScriptableFlags24(long /*int Link Here
234	public static final native long /int/ CALLBACK_JSNative(long /int/ func);	226	public static final native long /int/ CALLBACK_JSNative(long /int/ func);
235		227
236	/** @method flags=no_gen */	228	/** @method flags=no_gen */
237	public static final native long /int/ _JS_DefineFunction(byte[] mozillaPath, long /int/ cx, long /int/ obj, byte[] name, long /int/ call, int nargs, int flags);
238	public static final long /int/ JS_DefineFunction(byte[] mozillaPath, long /int/ cx, long /int/ obj, byte[] name, long /int/ call, int nargs, int flags) {
239	lock.lock();
240	try {
241	return _JS_DefineFunction(mozillaPath, cx, obj, name, call, nargs, flags);
242	} finally {
243	lock.unlock();
244	}
245	}
246	/** @method flags=no_gen */
247	public static final native long /int/ _JS_DefineFunction24(long /int/ cx, long /int/ obj, byte[] name, long /int/ call, int nargs, int flags);
248	public static final long /int/ JS_DefineFunction24(long /int/ cx, long /int/ obj, byte[] name, long /int/ call, int nargs, int flags) {
249	lock.lock();
250	try {
251	return _JS_DefineFunction24(cx, obj, name, call, nargs, flags);
252	} finally {
253	lock.unlock();
254	}
255	}
256	/** @method flags=no_gen */
257	public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /int/ cx, long /int/ obj, long /int/ principals, char[] chars, int length, byte[] filename, int lineno, long /int/[] retVal);	229	public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /int/ cx, long /int/ obj, long /int/ principals, char[] chars, int length, byte[] filename, int lineno, long /int/[] retVal);
258	public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /int/ cx, long /int/ obj, long /int/ principals, char[] chars, int length, byte[] filename, int lineno, long /int/[] retVal) {	230	public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /int/ cx, long /int/ obj, long /int/ principals, char[] chars, int length, byte[] filename, int lineno, long /int/[] retVal) {
259	lock.lock();	231	lock.lock();
Lines 274-299 public static final int JS_EvaluateUCScriptForPrincipals191(byte[] mozillaPath, Link Here
274	}	246	}
275	}	247	}
276	/** @method flags=no_gen */	248	/** @method flags=no_gen */
277	public static final native int _JS_EvaluateUCScriptForPrincipals24(byte[] mozillaPath, long /int/ cx, long /int/ obj, long /int/ principals, char[] chars, int length, byte[] filename, int lineno, long /int/ retVal);
278	public static final int JS_EvaluateUCScriptForPrincipals24(byte[] mozillaPath, long /int/ cx, long /int/ obj, long /int/ principals, char[] chars, int length, byte[] filename, int lineno, long /int/ retVal) {
279	lock.lock();
280	try {
281	return _JS_EvaluateUCScriptForPrincipals24(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
282	} finally {
283	lock.unlock();
284	}
285	}
286	/** @method flags=no_gen */
287	public static final native long /int/ _JS_GetGlobalForScopeChain24(long /int/ cx);
288	public static final long /int/ JS_GetGlobalForScopeChain24(long /int/ cx) {
289	lock.lock();
290	try {
291	return _JS_GetGlobalForScopeChain24(cx);
292	} finally {
293	lock.unlock();
294	}
295	}
296	/** @method flags=no_gen */
297	public static final native long /int/ _JS_GetGlobalObject(byte[] mozillaPath, long /int/ cx);	249	public static final native long /int/ _JS_GetGlobalObject(byte[] mozillaPath, long /int/ cx);
298	public static final long /int/ JS_GetGlobalObject(byte[] mozillaPath, long /int/ cx) {	250	public static final long /int/ JS_GetGlobalObject(byte[] mozillaPath, long /int/ cx) {
299	lock.lock();	251	lock.lock();
Lines 304-319 public static final long /int/ JS_GetGlobalObject(byte[] mozillaPath, long /*i Link Here
304	}	256	}
305	}	257	}
306	/** @method flags=no_gen */	258	/** @method flags=no_gen */
307	public static final native long /int/ _JS_NewObject(byte[] mozillaPath, long /int/ cx, long /int/ clasp, long /int/ proto, long /int/ parent);
308	public static final long /int/ JS_NewObject(byte[] mozillaPath, long /int/ cx, long /int/ clasp, long /int/ proto, long /int/ parent) {
309	lock.lock();
310	try {
311	return _JS_NewObject(mozillaPath, cx, clasp, proto, parent);
312	} finally {
313	lock.unlock();
314	}
315	}
316	/** @method flags=no_gen */
317	public static final native boolean _NS_Free(byte[] mozillaPath, long /int/ aPtr);	259	public static final native boolean _NS_Free(byte[] mozillaPath, long /int/ aPtr);
318	public static final boolean NS_Free(byte[] mozillaPath, long /int/ aPtr) {	260	public static final boolean NS_Free(byte[] mozillaPath, long /int/ aPtr) {
319	lock.lock();	261	lock.lock();
Lines 445-470 public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int Link Here
445	lock.unlock();	387	lock.unlock();
446	}	388	}
447	}	389	}
448	/** @method flags=no_gen */
449	public static final native int _nsIScriptGlobalObject24_EnsureScriptEnvironment(long /int/ ptr);
450	public static final int nsIScriptGlobalObject24_EnsureScriptEnvironment(long /int/ ptr) {
451	lock.lock();
452	try {
453	return _nsIScriptGlobalObject24_EnsureScriptEnvironment(ptr);
454	} finally {
455	lock.unlock();
456	}
457	}
458	/** @method flags=no_gen */
459	public static final native long /int/ _nsIScriptGlobalObject24_GetGlobalJSObject(long /int/ ptr);
460	public static final long /int/ nsIScriptGlobalObject24_GetGlobalJSObject(long /int/ ptr) {
461	lock.lock();
462	try {
463	return _nsIScriptGlobalObject24_GetGlobalJSObject(ptr);
464	} finally {
465	lock.unlock();
466	}
467	}
468	/**	390	/**
469	* @method flags=cpp	391	* @method flags=cpp
470	* @param ptr cast=(nsIScriptGlobalObject *)	392	* @param ptr cast=(nsIScriptGlobalObject *)
Lines 478-493 public static final long /int/ nsIScriptGlobalObject_GetScriptContext(long /*i Link Here
478	lock.unlock();	400	lock.unlock();
479	}	401	}
480	}	402	}
481	/** @method flags=no_gen */
482	public static final native long /int/ _nsIScriptGlobalObject24_GetScriptContext(long /int/ ptr);
483	public static final long /int/ nsIScriptGlobalObject24_GetScriptContext(long /int/ ptr) {
484	lock.lock();
485	try {
486	return _nsIScriptGlobalObject24_GetScriptContext(ptr);
487	} finally {
488	lock.unlock();
489	}
490	}
491	/**	403	/**
492	* @method flags=cpp	404	* @method flags=cpp
493	* @param ptr cast=(nsIScriptContext *)	405	* @param ptr cast=(nsIScriptContext *)
Lines 501-516 public static final long /int/ nsIScriptContext_GetNativeContext(long /int/ Link Here
501	lock.unlock();	413	lock.unlock();
502	}	414	}
503	}	415	}
504	/** @method flags=no_gen */
505	public static final native long /int/ _nsIScriptContext24_GetNativeContext(long /int/ ptr);
506	public static final long /int/ nsIScriptContext24_GetNativeContext(long /int/ ptr) {
507	lock.lock();
508	try {
509	return _nsIScriptContext24_GetNativeContext(ptr);
510	} finally {
511	lock.unlock();
512	}
513	}
514	/**	416	/**
515	* @method flags=cpp	417	* @method flags=cpp
516	* @param ptr cast=(nsEmbedCString *)	418	* @param ptr cast=(nsEmbedCString *)

Lines 293-307 int getFile(long /int/ prop, long /int/ persistent, long /int/ _retval) { Link Here

(-)a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java (-3 / +3 lines)
293	} else if (propertyName.equals (XPCOM.NS_GRE_DIR)) {	293	} else if (propertyName.equals (XPCOM.NS_GRE_DIR)) {
294	propertyValue = mozillaPath;	294	propertyValue = mozillaPath;
295	} else if (propertyName.equals (XPCOM.NS_GRE_COMPONENT_DIR)) {	295	} else if (propertyName.equals (XPCOM.NS_GRE_COMPONENT_DIR)) {
296	propertyValue = profilePath + COMPONENTS_DIR;	296	propertyValue = mozillaPath + COMPONENTS_DIR;
297	} else if (propertyName.equals (XPCOM.NS_XPCOM_INIT_CURRENT_PROCESS_DIR)) {	297	} else if (propertyName.equals (XPCOM.NS_XPCOM_INIT_CURRENT_PROCESS_DIR)) {
298	propertyValue = mozillaPath;	298	propertyValue = mozillaPath;
299	} else if (propertyName.equals (XPCOM.NS_OS_CURRENT_PROCESS_DIR)) {	299	} else if (propertyName.equals (XPCOM.NS_OS_CURRENT_PROCESS_DIR)) {
300	propertyValue = mozillaPath;	300	propertyValue = mozillaPath;
301	} else if (propertyName.equals (XPCOM.NS_XPCOM_COMPONENT_DIR)) {	301	} else if (propertyName.equals (XPCOM.NS_XPCOM_COMPONENT_DIR)) {
302	propertyValue = mozillaPath + COMPONENTS_DIR;	302	propertyValue = profilePath + COMPONENTS_DIR;
303	} else if (propertyName.equals (XPCOM.NS_XPCOM_CURRENT_PROCESS_DIR)) {	303	} else if (propertyName.equals (XPCOM.NS_XPCOM_CURRENT_PROCESS_DIR)) {
304	propertyValue = mozillaPath;	304	propertyValue = profilePath;
305	} else if (propertyName.equals (XPCOM.NS_APP_PREF_DEFAULTS_50_DIR)) {	305	} else if (propertyName.equals (XPCOM.NS_APP_PREF_DEFAULTS_50_DIR)) {
306	/*	306	/*
307	* Answering a value for this property causes problems in Mozilla versions	307	* Answering a value for this property causes problems in Mozilla versions

Lines 702-708 public void create (Composite parent, int style) { Link Here

(-)a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java (-39 / +131 lines)
702	LocationProvider = new AppFileLocProvider (MozillaPath, profilePath, cacheParentPath, IsXULRunner);	702	LocationProvider = new AppFileLocProvider (MozillaPath, profilePath, cacheParentPath, IsXULRunner);
703	LocationProvider.AddRef ();	703	LocationProvider.AddRef ();
704		704
705	/* write external.xpt to the file system if needed */	705	/* write swt.xpt to the file system if needed */
706	initExternal (LocationProvider.profilePath);	706	initExternal (LocationProvider.profilePath);
707		707
708	/* invoke appropriate Init function (based on mozilla version) */	708	/* invoke appropriate Init function (based on mozilla version) */
Lines 1392-1397 void disposeCOMInterfaces () { Link Here
1392	}	1392	}
1393		1393
1394	@Override	1394	@Override
		1395	public Object evaluate (String script) throws SWTException {
		1396	if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24))
		1397	return super.evaluate (script);
		1398
		1399	delegate.removeWindowSubclass ();
		1400
		1401	long /int/[] result = new long /int/[1];
		1402	int rc = webBrowser.QueryInterface(IIDStore.GetIID (nsIInterfaceRequestor.class), result);
		1403	if (rc != XPCOM.NS_OK) error (rc);
		1404	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		1405	nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
		1406	result[0] = 0;
		1407	rc = XPCOM.NS_GetServiceManager (result);
		1408	if (rc != XPCOM.NS_OK) error (rc);
		1409	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		1410
		1411	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
		1412	result[0] = 0;
		1413	rc = interfaceRequestor.GetInterface (IIDStore.GetIID (nsIDOMWindow.class), result);
		1414	interfaceRequestor.Release ();
		1415	if (rc != XPCOM.NS_OK) error (rc);
		1416	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		1417
		1418	nsIDOMWindow window = new nsIDOMWindow (result[0]);
		1419	result[0] = 0;
		1420	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.EXECUTE_CONTRACTID, true);
		1421	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (Execute.class), result);
		1422	if (rc != XPCOM.NS_OK) error (rc);
		1423	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		1424
		1425	Execute execute = new Execute (result[0]);
		1426	result[0] = 0;
		1427	nsEmbedString data = new nsEmbedString (script);
		1428	execute.EvalInWindow (window, data, result);
		1429	data.dispose ();
		1430	execute.Release ();
		1431	if (result[0] == 0)
		1432	return null;
		1433
		1434	nsIVariant variant = new nsIVariant (result[0]);
		1435	Object retval = External.convertToJava (variant);
		1436	variant.Release ();
		1437	return retval;
		1438	}
		1439	@Override
1395	public boolean execute (String script) {	1440	public boolean execute (String script) {
1396	/*	1441	/*
1397	* This could be the first content that is set into the browser, so	1442	* This could be the first content that is set into the browser, so
Lines 1400-1405 public boolean execute (String script) { Link Here
1400	*/	1445	*/
1401	delegate.removeWindowSubclass ();	1446	delegate.removeWindowSubclass ();
1402		1447
		1448	long /int/[] result = new long /int/[1];
		1449	/*
		1450	* As of mozilla 1.9 executing javascript via the javascript: protocol no
		1451	* longer happens synchronously. As a result, the result of executing JS
		1452	* is not returned to the java side when expected by the client. The
		1453	* workaround for version 24 is to use a javascript-implemented component
		1454	* which then executes synchronously.
		1455	*/
		1456	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) {
		1457	result[0] = 0;
		1458	int rc = webBrowser.QueryInterface(IIDStore.GetIID (nsIInterfaceRequestor.class), result);
		1459	if (rc != XPCOM.NS_OK) error (rc);
		1460	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		1461	nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
		1462	result[0] = 0;
		1463	rc = XPCOM.NS_GetServiceManager (result);
		1464	if (rc != XPCOM.NS_OK) error (rc);
		1465	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		1466
		1467	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
		1468	result[0] = 0;
		1469	rc = interfaceRequestor.GetInterface (IIDStore.GetIID (nsIDOMWindow.class), result);
		1470	interfaceRequestor.Release ();
		1471	if (rc != XPCOM.NS_OK) error (rc);
		1472	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		1473
		1474	nsIDOMWindow window = new nsIDOMWindow (result[0]);
		1475	result[0] = 0;
		1476	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.EXECUTE_CONTRACTID, true);
		1477	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (Execute.class), result);
		1478	if (rc != XPCOM.NS_OK) error (rc);
		1479	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
		1480
		1481	Execute execute = new Execute (result[0]);
		1482	result[0] = 0;
		1483	nsEmbedString data = new nsEmbedString (script);
		1484	execute.EvalInWindow (window, data, result);
		1485	if (result[0] != 0)
		1486	new nsIVariant (result[0]).Release ();
		1487	data.dispose ();
		1488	execute.Release ();
		1489	return true;
		1490	}
		1491
1403	/*	1492	/*
1404	* As of mozilla 1.9 executing javascript via the javascript: protocol no	1493	* As of mozilla 1.9 executing javascript via the javascript: protocol no
1405	* longer happens synchronously. As a result, the result of executing JS	1494	* longer happens synchronously. As a result, the result of executing JS
Lines 1407-1413 public boolean execute (String script) { Link Here
1407	* workaround is to invoke the javascript handler directly via C++, which is	1496	* workaround is to invoke the javascript handler directly via C++, which is
1408	* exposed as of mozilla 1.9.	1497	* exposed as of mozilla 1.9.
1409	*/	1498	*/
1410	long /int/[] result = new long /int/[1];
1411	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_9)) {	1499	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_9)) {
1412	int rc = XPCOM.NS_GetServiceManager (result);	1500	int rc = XPCOM.NS_GetServiceManager (result);
1413	if (rc != XPCOM.NS_OK) error (rc);	1501	if (rc != XPCOM.NS_OK) error (rc);
Lines 1439-1458 public boolean execute (String script) { Link Here
1439	if (rc == XPCOM.NS_OK && result[0] != 0) {	1527	if (rc == XPCOM.NS_OK && result[0] != 0) {
1440	long /int/ scriptGlobalObject = result[0];	1528	long /int/ scriptGlobalObject = result[0];
1441	result[0] = 0;	1529	result[0] = 0;
1442	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */	1530	rc = (int/64/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
1443	rc = (int/64/)XPCOM.nsIScriptGlobalObject24_EnsureScriptEnvironment (scriptGlobalObject);
1444	} else {
1445	rc = (int/64/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
1446	}
1447	if (rc != XPCOM.NS_OK) {	1531	if (rc != XPCOM.NS_OK) {
1448	new nsISupports (scriptGlobalObject).Release ();	1532	new nsISupports (scriptGlobalObject).Release ();
1449	} else {	1533	} else {
1450	long /int/ scriptContext;	1534	long /int/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
1451	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */
1452	scriptContext = XPCOM.nsIScriptGlobalObject24_GetScriptContext (scriptGlobalObject);
1453	} else {
1454	scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
1455	}
1456		1535
1457	if (scriptContext != 0) {	1536	if (scriptContext != 0) {
1458	/* ensure that the received nsIScriptContext implements the expected interface */	1537	/* ensure that the received nsIScriptContext implements the expected interface */
Lines 1462-1473 public boolean execute (String script) { Link Here
1462	new nsISupports (result[0]).Release ();	1541	new nsISupports (result[0]).Release ();
1463	result[0] = 0;	1542	result[0] = 0;
1464		1543
1465	long /int/ jsContext;	1544	long /int/ jsContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
1466	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */
1467	jsContext = XPCOM.nsIScriptContext24_GetNativeContext (scriptContext);
1468	} else {
1469	jsContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
1470	}
1471	if (jsContext != 0) {	1545	if (jsContext != 0) {
1472	int length = script.length ();	1546	int length = script.length ();
1473	char[] scriptChars = new char[length];	1547	char[] scriptChars = new char[length];
Lines 1480-1501 public boolean execute (String script) { Link Here
1480	result[0] = 0;	1554	result[0] = 0;
1481	}	1555	}
1482	byte[] jsLibPath = getJSLibPathBytes ();	1556	byte[] jsLibPath = getJSLibPathBytes ();
1483	long /int/ globalJSObject;	1557	long /int/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, jsContext);
1484	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */
1485	globalJSObject = XPCOM.nsIScriptGlobalObject24_GetGlobalJSObject (scriptGlobalObject);
1486	} else {
1487	globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, jsContext);
1488	}
1489	if (globalJSObject != 0) {	1558	if (globalJSObject != 0) {
1490	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* >= 24.x */
1491	boolean success = XPCOM.JS_EvaluateUCScriptForPrincipals24 (jsLibPath, jsContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, 0) != 0;
1492	// should principals be Release()d too?
1493	new nsISupports (scriptGlobalObject).Release ();
1494	principal.Release ();
1495	serviceManager.Release ();
1496	return success;
1497	}
1498	/* 1.9.x - 10.x */
1499	aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);	1559	aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
1500	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIJSContextStack.class), result);	1560	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIJSContextStack.class), result);
1501	if (rc == XPCOM.NS_OK && result[0] != 0) {	1561	if (rc == XPCOM.NS_OK && result[0] != 0) {
Lines 1896-1909 static String InitDiscoverXULRunner () { Link Here
1896		1956
1897	void initExternal (String profilePath) {	1957	void initExternal (String profilePath) {
1898	File componentsDir = new File (profilePath, AppFileLocProvider.COMPONENTS_DIR);	1958	File componentsDir = new File (profilePath, AppFileLocProvider.COMPONENTS_DIR);
1899	java.io.InputStream is = Library.class.getResourceAsStream ("/external.xpt"); //$NON-NLS-1$	1959	java.io.InputStream is = Library.class.getResourceAsStream ("/swt.xpt"); //$NON-NLS-1$
1900	if (is != null) {	1960	if (is != null) {
1901	if (!componentsDir.exists ()) {	1961	if (!componentsDir.exists ()) {
1902	componentsDir.mkdirs ();	1962	componentsDir.mkdirs ();
1903	}	1963	}
1904	int read;	1964	int read;
1905	byte [] buffer = new byte [4096];	1965	byte [] buffer = new byte [4096];
1906	File file = new File (componentsDir, "external.xpt"); //$NON-NLS-1$	1966	File file = new File (componentsDir, "swt.xpt"); //$NON-NLS-1$
		1967	try {
		1968	FileOutputStream os = new FileOutputStream (file);
		1969	while ((read = is.read (buffer)) != -1) {
		1970	os.write(buffer, 0, read);
		1971	}
		1972	os.close ();
		1973	is.close ();
		1974	} catch (FileNotFoundException e) {
		1975	} catch (IOException e) {
		1976	}
		1977	}
		1978	is = Library.class.getResourceAsStream ("/swt.js"); //$NON-NLS-1$
		1979	if (is != null) {
		1980	if (!componentsDir.exists ()) {
		1981	componentsDir.mkdirs ();
		1982	}
		1983	int read;
		1984	byte [] buffer = new byte [4096];
		1985	File file = new File (componentsDir, "swt.js"); //$NON-NLS-1$
		1986	try {
		1987	FileOutputStream os = new FileOutputStream (file);
		1988	while ((read = is.read (buffer)) != -1) {
		1989	os.write(buffer, 0, read);
		1990	}
		1991	os.close ();
		1992	is.close ();
		1993	} catch (FileNotFoundException e) {
		1994	} catch (IOException e) {
		1995	}
		1996	}
		1997	is = Library.class.getResourceAsStream ("/chrome.manifest"); //$NON-NLS-1$
		1998	if (is != null) {
		1999	int read;
		2000	byte [] buffer = new byte [4096];
		2001	File file = new File (profilePath, "chrome.manifest"); //$NON-NLS-1$
1907	try {	2002	try {
1908	FileOutputStream os = new FileOutputStream (file);	2003	FileOutputStream os = new FileOutputStream (file);
1909	while ((read = is.read (buffer)) != -1) {	2004	while ((read = is.read (buffer)) != -1) {
Lines 2182-2190 void initXPCOM (String mozillaPath, boolean isXULRunner) { Link Here
2182	error (XPCOM.NS_ERROR_NULL_POINTER);	2277	error (XPCOM.NS_ERROR_NULL_POINTER);
2183	}	2278	}
2184		2279
2185	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24, true)) {
2186	Library.loadLibrary("swt-xulrunner24"); //$NON-NLS-1$
2187	}
2188	MozillaDelegate.loadAdditionalLibraries (mozillaPath, true);	2280	MozillaDelegate.loadAdditionalLibraries (mozillaPath, true);
2189		2281
2190	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {	2282	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {

Added Link Here

(-)a/bundles/org.eclipse.swt/Eclipse (+48 lines)
1	/* *** BEGIN LICENSE BLOCK ***
2	* Version: MPL 1.1
3	*
4	* The contents of this file are subject to the Mozilla Public License Version
5	* 1.1 (the "License"); you may not use this file except in compliance with
6	* the License. You may obtain a copy of the License at
7	* http://www.mozilla.org/MPL/
8	*
9	* Software distributed under the License is distributed on an "AS IS" basis,
10	* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
11	* for the specific language governing rights and limitations under the
12	* License.
13	*
14	* The Original Code is Mozilla Communicator client code, released March 31, 1998.
15	*
16	* The Initial Developer of the Original Code is
17	* Netscape Communications Corporation.
18	* Portions created by Netscape are Copyright (C) 1998-1999
19	* Netscape Communications Corporation. All Rights Reserved.
20	*
21	* Contributor(s):
22	*
23	* IBM
24	* - Binding to permit interfacing between Mozilla and SWT
25	* - Copyright (C) 2003, 2012 IBM Corp. All Rights Reserved.
26	*
27	* *** END LICENSE BLOCK *** */
28	package org.eclipse.swt.internal.mozilla;
29
30
31	public class Execute extends nsISupports {
32
33	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
34
35	static final String EXECUTE_IID_STR = "75a03044-d129-4d96-9292-bc1623876de1";
36
37	static {
38	IIDStore.RegisterIID(Execute.class, MozillaVersion.VERSION_BASE, new nsID(EXECUTE_IID_STR));
39	}
40
41	public Execute(long /int/ address) {
42	super(address);
43	}
44
45	public int EvalInWindow(nsIDOMWindow aWindow, nsEmbedString code, long /int/[] aVariant) {
46	return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWindow.getAddress(), code.getAddress(), aVariant);
47	}
48	}

Lines 1-21 Link Here

(-)a/bundles/org.eclipse.swt/components/external.idl (-21 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11
12	// to compile: xpidl -m typelib -I S:\swt-builddir\gecko-sdk\idl\ -e external.xpt external.idl
13
14	#include "nsISupports.idl"
15	#include "nsIVariant.idl"
16
17	[scriptable, uuid(ded01d20-ba6f-11dd-ad8b-0800200c9a66)]
18
19	interface External : nsISupports {
20	nsIVariant callJava (in unsigned long index, in nsIVariant token, in nsIVariant args);
21	};

Added Link Here

(-)a/bundles/org.eclipse.swt/components/swt.js (+30 lines)
1	Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
2
3	function execute() {
4	}
5
6	execute.prototype.evalInWindow = function(aWindow, aString) {
7	aWindow = XPCNativeWrapper.unwrap(aWindow);
8	try {
9	aWindow.external.QueryInterface(Components.interfaces.External);
10	} catch (e) {
11	aWindow.external = Components.classes["@eclipse.org/external;1"].createInstance();
12	}
13	return aWindow.eval(aString);
14	};
15
16	execute.prototype.evalAsChrome = function(aWindow, aString) {
17	with (aWindow) {
18	return eval(aString);
19	}
20	};
21
22	execute.prototype.evalAsync = function(aWindow, aString) {
23	aWindow.location = "javascript:" + unescape(aString) + ";void(0);";
24	};
25
26	execute.prototype.QueryInterface = XPCOMUtils.generateQI([Components.interfaces.Execute]);
27
28	execute.prototype.classID = Components.ID("{0aebcff1-f7b3-4522-a64b-1706d65dc232}");
29
30	var NSGetFactory = XPCOMUtils.generateNSGetFactory([execute]);