Bug 518542: Remove XULRunner related code from SWT source repository

Remove mozilla sources and clean up the build scripts and project files
from references to it.

Change-Id: I04c863337aaba3f698622b8b6583a346da5e23a2
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

152 files changed, 20 insertions, 33328 deletions

diff --git a/bundles/org.eclipse.swt/.classpath_cocoa b/bundles/org.eclipse.swt/.classpath_cocoa
index 0dafe5ff63..a863c5b7a6 100644
--- a/bundles/org.eclipse.swt/.classpath_cocoa
+++ b/bundles/org.eclipse.swt/.classpath_cocoa
@@ -29,9 +29,6 @@
     <classpathentry kind="src" path="Eclipse SWT Browser/common"/>
     <classpathentry kind="src" path="Eclipse SWT Browser/cocoa"/>
     <classpathentry kind="src" path="Eclipse SWT WebKit/cocoa"/>
-    <classpathentry kind="src" path="Eclipse SWT Mozilla/common"/>
-    <classpathentry kind="src" path="Eclipse SWT Mozilla/cocoa"/>
-    <classpathentry kind="src" path="components"/>
     <classpathentry kind="src" path="Eclipse SWT OpenGL/cocoa"/>
     <classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
     <classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.swt/.classpath_gtk b/bundles/org.eclipse.swt/.classpath_gtk
index 637af7c983..e8fea61f64 100644
--- a/bundles/org.eclipse.swt/.classpath_gtk
+++ b/bundles/org.eclipse.swt/.classpath_gtk
@@ -29,9 +29,6 @@
 	<classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
 	<classpathentry kind="src" path="Eclipse SWT Browser/common"/>
 	<classpathentry kind="src" path="Eclipse SWT Browser/gtk"/>
-	<classpathentry kind="src" path="Eclipse SWT Mozilla/common"/>
-	<classpathentry kind="src" path="Eclipse SWT Mozilla/gtk"/>
-	<classpathentry kind="src" path="components"/>
 	<classpathentry kind="src" path="Eclipse SWT OpenGL/gtk"/>
 	<classpathentry kind="src" path="Eclipse SWT OpenGL/glx"/>
 	<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
diff --git a/bundles/org.eclipse.swt/.classpath_gtk_win32 b/bundles/org.eclipse.swt/.classpath_gtk_win32
index ff12582343..d818663e2a 100644
--- a/bundles/org.eclipse.swt/.classpath_gtk_win32
+++ b/bundles/org.eclipse.swt/.classpath_gtk_win32
@@ -30,9 +30,6 @@
 	<classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
 	<classpathentry kind="src" path="Eclipse SWT Browser/common"/>
 	<classpathentry kind="src" path="Eclipse SWT Browser/gtk"/>
-	<classpathentry kind="src" path="Eclipse SWT Mozilla/common"/> <!-- TODO [win32] not available; browser common depends -->
-	<classpathentry kind="src" path="Eclipse SWT Mozilla/gtk"/> <!-- TODO [win32] not available; browser common depends -->
-	<classpathentry kind="src" path="components"/>
 	<classpathentry kind="src" path="Eclipse SWT OpenGL/gtk"/>
 	<classpathentry kind="src" path="Eclipse SWT OpenGL/glx"/> <!-- TODO [win32] not available; OpenGL/gtk depends -->
 	<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/bundles/org.eclipse.swt/.classpath_win32
index 99a3a553e8..7e5c1a5fec 100644
--- a/bundles/org.eclipse.swt/.classpath_win32
+++ b/bundles/org.eclipse.swt/.classpath_win32
@@ -25,9 +25,6 @@
 	<classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
 	<classpathentry kind="src" path="Eclipse SWT Browser/common"/>
 	<classpathentry kind="src" path="Eclipse SWT Browser/win32"/>
-	<classpathentry kind="src" path="Eclipse SWT Mozilla/common"/>
-	<classpathentry kind="src" path="Eclipse SWT Mozilla/win32"/>
-	<classpathentry kind="src" path="components"/>
 	<classpathentry kind="src" path="Eclipse SWT WebKit/win32"/>
 	<classpathentry kind="src" path="Eclipse SWT OpenGL/win32"/>
 	<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
deleted file mode 100644
index 3067abf0b9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-
-import java.io.File;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.internal.cocoa.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-class MozillaDelegate {
-	Browser browser;
-	Shell eventShell;
-	Listener listener;
-	boolean hasFocus;
-
-	static Boolean IsXULRunner24;
-	static final String LIB_XPCOM = "libxpcom.dylib"; //$NON-NLS-1$
-	static final String LIB_XUL = "XUL"; //$NON-NLS-1$
-	static final String MOZILLA_RUNNING = "org.eclipse.swt.internal.mozillaRunning"; //$NON-NLS-1$
-
-MozillaDelegate (Browser browser) {
-	super ();
-	this.browser = browser;
-}
-
-static Browser findBrowser (long /*int*/ handle) {
-	Display display = Display.getCurrent ();
-	return (Browser)display.findWidget (handle);
-}
-
-static String getCacheParentPath () {
-	if (OS.VERSION >= 0x1060) {
-		NSArray array = NSFileManager.defaultManager ().URLsForDirectory (OS.NSCachesDirectory, OS.NSUserDomainMask);
-		if (array.count () > 0) {
-			NSURL url = new NSURL (array.objectAtIndex (0));
-			return url.path ().getString () + Mozilla.SEPARATOR_OS + "eclipse"; //$NON-NLS-1$
-		}
-	}
-	String baseDir = System.getProperty ("user.home"); //$NON-NLS-1$
-	return baseDir + "/Library/Caches/eclipse"; //$NON-NLS-1$
-}
-
-static String[] getJSLibraryNames () {
-	return new String[] {"libxpcom.dylib"}; //$NON-NLS-1$
-}
-
-static String getJSLibraryName_Pre10 () {
-	return "libmozjs.dylib"; //$NON-NLS-1$
-}
-
-static String getLibraryName (String mozillaPath) {
-	/*
-	 * The name of the Gecko library to glue to changed between the XULRunner 10 and
-	 * 24 releases.  However it's not possible to programmatically know the version
-	 * of a XULRunner that's being used before it has been glued.  To determine the
-	 * appropriate Gecko library name to return, look for the presence of an "xpcom"
-	 * library in the mozilla path, which is present in all supported XULRunner releases
-	 * prior to XULRunner 24.  If this library is there then return it, and if it's not
-	 * there then assume that XULRunner 24 is being used and return the new library name
-	 * instead ("XUL").
-	 */
-	if (IsXULRunner24 == null) { /* IsXULRunner24 not yet initialized */
-		IsXULRunner24 = new File (mozillaPath, LIB_XPCOM).exists () ? Boolean.FALSE : Boolean.TRUE;
-	}
-	return IsXULRunner24.booleanValue () ? LIB_XUL : LIB_XPCOM;
-}
-
-static String getProfilePath () {
-	String baseDir = System.getProperty ("user.home"); //$NON-NLS-1$
-	return baseDir + Mozilla.SEPARATOR_OS + ".mozilla" + Mozilla.SEPARATOR_OS + "eclipse"; //$NON-NLS-1$ //$NON-NLS-2$
-}
-
-static String getSWTInitLibraryName () {
-	return "swt-xulrunner"; //$NON-NLS-1$
-}
-
-static void loadAdditionalLibraries (String mozillaPath, boolean isGlued) {
-	// workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=727616
-	if (!isGlued) {
-		String utilsPath = mozillaPath + Mozilla.SEPARATOR_OS + "libmozutils.dylib"; //$NON-NLS-1$
-		byte[] bytes = MozillaDelegate.wcsToMbcs (null, utilsPath, true);
-		OS.NSAddImage (bytes, OS.NSADDIMAGE_OPTION_RETURN_ON_ERROR | OS.NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME);
-	}
-}
-
-static char[] mbcsToWcs (String codePage, byte [] buffer) {
-//	int encoding = OS.CFStringGetSystemEncoding ();
-//	int cfstring = OS.CFStringCreateWithBytes (OS.kCFAllocatorDefault, buffer, buffer.length, encoding, false);
-//	char[] chars = null;
-//	if (cfstring != 0) {
-//		int length = OS.CFStringGetLength (cfstring);
-//		chars = new char [length];
-//		if (length != 0) {
-//			CFRange range = new CFRange ();
-//			range.length = length;
-//			OS.CFStringGetCharacters (cfstring, range, chars);
-//		}
-//		OS.CFRelease (cfstring);
-//	}
-//	return chars;
-	// TODO implement mbcsToWcs
-	return new String(buffer).toCharArray();
-}
-
-static boolean needsSpinup () {
-	return false;
-}
-
-static byte[] wcsToMbcs (String codePage, String string, boolean terminate) {
-//	char[] chars = new char [string.length()];
-//	string.getChars (0, chars.length, chars, 0);
-//	int cfstring = OS.CFStringCreateWithCharacters (OS.kCFAllocatorDefault, chars, chars.length);
-//	byte[] buffer = null;
-//	if (cfstring != 0) {
-//		CFRange range = new CFRange ();
-//		range.length = chars.length;
-//		int encoding = OS.CFStringGetSystemEncoding ();
-//		int[] size = new int[1];
-//		int numChars = OS.CFStringGetBytes (cfstring, range, encoding, (byte)'?', true, null, 0, size);
-//		buffer = new byte [size[0] + (terminate ? 1 : 0)];
-//		if (numChars != 0) {
-//			numChars = OS.CFStringGetBytes (cfstring, range, encoding, (byte)'?', true, buffer, size[0], size);
-//		}
-//		OS.CFRelease (cfstring);
-//	}
-//	return buffer;
-	// TODO implement wcsToMbcs
-	if (terminate) string += "\0";
-	return string.getBytes();
-}
-
-void addWindowSubclass () {
-}
-
-int createBaseWindow (nsIBaseWindow baseWindow) {
-	browser.getDisplay ().setData (MOZILLA_RUNNING, Boolean.TRUE);
-
-	/*
-	* Feature of Mozilla on OSX.  Mozilla replaces the OSX application menu whenever
-	* a browser's base window is created.  The workaround is to restore the previous
-	* menu after creating the base window.
-	*/
-	NSApplication application = NSApplication.sharedApplication ();
-	NSMenu mainMenu = application.mainMenu ();
-	if (mainMenu != null) mainMenu.retain ();
-	int rc = baseWindow.Create ();
-	application.setMainMenu (mainMenu);
-	if (mainMenu != null) mainMenu.release ();
-	((Mozilla)browser.webBrowser).Activate ();
-	return rc;
-}
-
-long /*int*/ getHandle () {
-	return browser.view.id;
-}
-
-Point getNativeSize (int width, int height) {
-	if (IsXULRunner24.booleanValue ()) {
-		NSScreen screen = browser.view.window ().screen ();
-		double /*float*/ scaling = screen.backingScaleFactor ();
-		return new Point ((int)(width * scaling), (int)(height * scaling));
-	}
-	return new Point (width, height);
-}
-
-long /*int*/ getSiteWindow () {
-	return browser.view.id;
-}
-
-void handleFocus () {
-	if (hasFocus) return;
-	hasFocus = true;
-	((Mozilla)browser.webBrowser).Activate ();
-	browser.setFocus ();
-	listener = new Listener () {
-		@Override
-		public void handleEvent (Event event) {
-			if (event.widget == browser) return;
-			if (event.type != SWT.Dispose) {
-				((Mozilla)browser.webBrowser).Deactivate ();
-				hasFocus = false;
-			}
-			eventShell.getDisplay ().removeFilter (SWT.FocusIn, this);
-			eventShell.removeListener (SWT.Deactivate, this);
-			eventShell.removeListener (SWT.Dispose, this);
-			eventShell = null;
-			listener = null;
-		}
-
-	};
-	eventShell = browser.getShell ();
-	eventShell.getDisplay ().addFilter (SWT.FocusIn, listener);
-	eventShell.addListener (SWT.Deactivate, listener);
-	eventShell.addListener (SWT.Dispose, listener);
-}
-
-void handleMouseDown () {
-	Mozilla mozilla = (Mozilla)browser.webBrowser;
-	if (!mozilla.isActive) mozilla.Activate ();
-}
-
-boolean hookEnterExit () {
-	return true;
-}
-
-void init () {
-}
-
-void onDispose (long /*int*/ embedHandle) {
-	if (listener != null) {
-		eventShell.getDisplay ().removeFilter (SWT.FocusIn, listener);
-		eventShell.removeListener (SWT.Deactivate, listener);
-		eventShell.removeListener (SWT.Dispose, listener);
-		eventShell = null;
-		listener = null;
-	}
-	browser = null;
-}
-
-void removeWindowSubclass () {
-}
-
-boolean sendTraverse () {
-	return true;
-}
-
-void setSize (long /*int*/ embedHandle, int width, int height) {
-	// TODO
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIGlobalObject_24.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIGlobalObject_24.h
deleted file mode 100644
index 5dea6c8b83..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIGlobalObject_24.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This file is derived from the Original Code provided by mozilla.org,
- * whose Initial Developer is Netscape Communications Corporation.  Changes
- * to the original file were made by SWT on September 18, 2013 and are marked
- * with trailing comment "//SWT-20130918".
- */
-
-#ifndef nsIGlobalObject_h__
-#define nsIGlobalObject_h__
-
-//#include "nsISupports.h" //SWT-20130918
-//#include "nsIScriptObjectPrincipal.h" //SWT-20130918
-
-class JSObject;
-
-#define NS_IGLOBALOBJECT_IID \
-{ 0x8503e9a9, 0x530, 0x4b26,  \
-{ 0xae, 0x24, 0x18, 0xca, 0x38, 0xe5, 0xed, 0x17 } }
-
-#define nsresult int //SWT-20130918
-
-class nsIGlobalObject /* : public nsIScriptObjectPrincipal */ //SWT-20130918
-{
-public:
-//  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IGLOBALOBJECT_IID) //SWT-20130918
-
-  virtual nsresult QueryInterface(/* const nsIID & uuid, void **result */) = 0; //SWT-20130918
-  virtual nsresult AddRef(void) = 0; //SWT-20130918
-  virtual nsresult Release(void) = 0; //SWT-20130918
-
-  virtual nsIPrincipal* GetPrincipal() = 0; //SWT-20130918
-
-  virtual JSObject* GetGlobalJSObject() = 0;
-};
-
-//NS_DEFINE_STATIC_IID_ACCESSOR(nsIGlobalObject, //SWT-20130918
-//                              NS_IGLOBALOBJECT_IID) //SWT-20130918
-
-#endif // nsIGlobalObject_h__
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h
deleted file mode 100644
index 5c42418993..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h
+++ /dev/null
@@ -1,468 +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-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of 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 ***** */
-
-/*
- * This file is derived from the Original Code provided by mozilla.org,
- * whose Initial Developer is Netscape Communications Corporation.  Changes
- * to the original file were made by SWT on April 7, 2009 and are marked
- * with trailing comment "//SWT-20090407".
- */
-
-#ifndef nsIScriptContext_h__
-#define nsIScriptContext_h__
-
-#include "nscore.h"
-//#include "nsStringGlue.h" //SWT-20090407
-#include "nsISupports.h"
-//#include "nsCOMPtr.h" //SWT-20090407
-#include "nsIProgrammingLanguage.h"
-
-class nsIScriptGlobalObject;
-class nsIScriptSecurityManager;
-class nsIPrincipal;
-class nsIAtom;
-class nsIArray;
-class nsIVariant;
-class nsIObjectInputStream;
-class nsIObjectOutputStream;
-class nsScriptObjectHolder;
-
-typedef void (*nsScriptTerminationFunc)(nsISupports* aRef);
-
-#define NS_ISCRIPTCONTEXT_IID \
-{ /* {e7b9871d-3adc-4bf7-850d-7fb9554886bf} */ \
-  0xe7b9871d, 0x3adc, 0x4bf7, \
- { 0x85, 0x0d, 0x7f, 0xb9, 0x55, 0x48, 0x86, 0xbf } }
-
-/* This MUST match JSVERSION_DEFAULT.  This version stuff if we don't
-   know what language we have is a little silly... */
-#define SCRIPTVERSION_DEFAULT JSVERSION_DEFAULT
-
-/**
- * It is used by the application to initialize a runtime and run scripts.
- * A script runtime would implement this interface.
- * <P><I>It does have a bit too much java script information now, that
- * should be removed in a short time. Ideally this interface will be
- * language neutral</I>
- */
-class nsIScriptContext : public nsISupports
-{
-public:
-//NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTCONTEXT_IID) //SWT-20090407
-
-  /* Get the ID of this language. */
-  virtual PRUint32 GetScriptTypeID() = 0;
-
-  /**
-   * Compile and execute a script.
-   *
-   * @param aScript a string representing the script to be executed
-   * @param aScopeObject a script object for the scope to execute in, or
-   *                     nsnull to use a default scope
-   * @param aPrincipal the principal that produced the script
-   * @param aURL the URL or filename for error messages
-   * @param aLineNo the starting line number of the script for error messages
-   * @param aVersion the script language version to use when executing
-   * @param aRetValue the result of executing the script, or null for no result.
-   *        If this is a JS context, it's the caller's responsibility to
-   *        preserve aRetValue from GC across this call
-   * @param aIsUndefined true if the result of executing the script is the
-   *                     undefined value
-   *
-   * @return NS_OK if the script was valid and got executed
-   *
-   **/
-  virtual nsresult EvaluateString(const nsAString& aScript,
-                                  void *aScopeObject,
-                                  nsIPrincipal *aPrincipal,
-                                  const char *aURL,
-                                  PRUint32 aLineNo,
-                                  PRUint32 aVersion,
-                                  nsAString *aRetValue,
-                                  PRBool* aIsUndefined) = 0;
-
-  // Note JS bigotry remains here - 'void *aRetValue' is assumed to be a
-  // jsval.  This must move to JSObject before it can be made agnostic.
-  virtual nsresult EvaluateStringWithValue(const nsAString& aScript,
-                                           void *aScopeObject,
-                                           nsIPrincipal *aPrincipal,
-                                           const char *aURL,
-                                           PRUint32 aLineNo,
-                                           PRUint32 aVersion,
-                                           void* aRetValue,
-                                           PRBool* aIsUndefined) = 0;
-
-  /**
-   * Compile a script.
-   *
-   * @param aText a PRUnichar buffer containing script source
-   * @param aTextLength number of characters in aText
-   * @param aScopeObject an object telling the scope in which to execute,
-   *                     or nsnull to use a default scope
-   * @param aPrincipal the principal that produced the script
-   * @param aURL the URL or filename for error messages
-   * @param aLineNo the starting line number of the script for error messages
-   * @param aVersion the script language version to use when executing
-   * @param aScriptObject an executable object that's the result of compiling
-   *                      the script.
-   *
-   * @return NS_OK if the script source was valid and got compiled.
-   *
-   **/
-  virtual nsresult CompileScript(const PRUnichar* aText,
-                                 PRInt32 aTextLength,
-                                 void* aScopeObject,
-                                 nsIPrincipal* aPrincipal,
-                                 const char* aURL,
-                                 PRUint32 aLineNo,
-                                 PRUint32 aVersion,
-                                 nsScriptObjectHolder &aScriptObject) = 0;
-
-  /**
-   * Execute a precompiled script object.
-   *
-   * @param aScriptObject an object representing the script to be executed
-   * @param aScopeObject an object telling the scope in which to execute,
-   *                     or nsnull to use a default scope
-   * @param aRetValue the result of executing the script, may be null in
-   *                  which case no result string is computed
-   * @param aIsUndefined true if the result of executing the script is the
-   *                     undefined value, may be null for "don't care"
-   *
-   * @return NS_OK if the script was valid and got executed
-   *
-   */
-  virtual nsresult ExecuteScript(void* aScriptObject,
-                                 void* aScopeObject,
-                                 nsAString* aRetValue,
-                                 PRBool* aIsUndefined) = 0;
-
-  /**
-   * Compile the event handler named by atom aName, with function body aBody
-   * into a function object returned if ok via aHandler.  Does NOT bind the
-   * function to anything - BindCompiledEventHandler() should be used for that
-   * purpose.  Note that this event handler is always considered 'shared' and
-   * hence is compiled without principals.  Never call the returned object
-   * directly - it must be bound (and thereby cloned, and therefore have the 
-   * correct principals) before use!
-   *
-   * @param aName an nsIAtom pointer naming the function; it must be lowercase
-   *        and ASCII, and should not be longer than 63 chars.  This bound on
-   *        length is enforced only by assertions, so caveat caller!
-   * @param aEventName the name that the event object should be bound to
-   * @param aBody the event handler function's body
-   * @param aURL the URL or filename for error messages
-   * @param aLineNo the starting line number of the script for error messages
-   * @param aVersion the script language version to use when executing
-   * @param aHandler the out parameter in which a void pointer to the compiled
-   *        function object is stored on success
-   *
-   * @return NS_OK if the function body was valid and got compiled
-   */
-  virtual nsresult CompileEventHandler(nsIAtom* aName,
-                                       PRUint32 aArgCount,
-                                       const char** aArgNames,
-                                       const nsAString& aBody,
-                                       const char* aURL,
-                                       PRUint32 aLineNo,
-                                       PRUint32 aVersion,
-                                       nsScriptObjectHolder &aHandler) = 0;
-
-  /**
-   * Call the function object with given args and return its boolean result,
-   * or true if the result isn't boolean.
-   *
-   * @param aTarget the event target
-   * @param aScript an object telling the scope in which to call the compiled
-   *        event handler function.
-   * @param aHandler function object (function and static scope) to invoke.
-   * @param argv array of arguments.  Note each element is assumed to
-   *        be an nsIVariant.
-   * @param rval out parameter returning result
-   **/
-  virtual nsresult CallEventHandler(nsISupports* aTarget,
-                                    void *aScope, void* aHandler,
-                                    nsIArray *argv, nsIVariant **rval) = 0;
-
-  /**
-   * Bind an already-compiled event handler function to a name in the given
-   * scope object.  The same restrictions on aName (lowercase ASCII, not too
-   * long) applies here as for CompileEventHandler.  Scripting languages with
-   * static scoping must re-bind the scope chain for aHandler to begin (after
-   * the activation scope for aHandler itself, typically) with aTarget's scope.
-   *
-   * Logically, this 'bind' operation is more of a 'copy' - it simply
-   * stashes/associates the event handler function with the event target, so
-   * it can be fetched later with GetBoundEventHandler().
-   *
-   * @param aTarget an object telling the scope in which to bind the compiled
-   *        event handler function.  The context will presumably associate
-   *        this nsISupports with a native script object.
-   * @param aName an nsIAtom pointer naming the function; it must be lowercase
-   *        and ASCII, and should not be longer than 63 chars.  This bound on
-   *        length is enforced only by assertions, so caveat caller!
-   * @param aHandler the function object to name, created by an earlier call to
-   *        CompileEventHandler
-   * @return NS_OK if the function was successfully bound to the name
-   *
-   * XXXmarkh - fold this in with SetProperty?  Exactly the same concept!
-   */
-  virtual nsresult BindCompiledEventHandler(nsISupports* aTarget, void *aScope,
-                                            nsIAtom* aName,
-                                            void* aHandler) = 0;
-
-  /**
-   * Lookup a previously bound event handler for the specified target.  This
-   * will return an object equivilent to the one passed to
-   * BindCompiledEventHandler (although the pointer may not be the same).
-   *
-   */
-  virtual nsresult GetBoundEventHandler(nsISupports* aTarget, void *aScope,
-                                        nsIAtom* aName,
-                                        nsScriptObjectHolder &aHandler) = 0;
-
-  /**
-   * Compile a function that isn't used as an event handler.
-   *
-   * NOTE: Not yet language agnostic (main problem is XBL - not yet agnostic)
-   * Caller must make sure aFunctionObject is a JS GC root.
-   *
-   **/
-  virtual nsresult CompileFunction(void* aTarget,
-                                   const nsACString& aName,
-                                   PRUint32 aArgCount,
-                                   const char** aArgArray,
-                                   const nsAString& aBody,
-                                   const char* aURL,
-                                   PRUint32 aLineNo,
-                                   PRUint32 aVersion,
-                                   PRBool aShared,
-                                   void **aFunctionObject) = 0;
-
-  /**
-   * Set the default scripting language version for this context, which must
-   * be a context specific to a particular scripting language.
-   *
-   **/
-  virtual void SetDefaultLanguageVersion(PRUint32 aVersion) = 0;
-
-  /**
-   * Return the global object.
-   *
-   **/
-  virtual nsIScriptGlobalObject *GetGlobalObject() = 0;
-
-  /**
-   * Return the native script context
-   *
-   **/
-  virtual void *GetNativeContext() = 0;
-
-  /**
-   * Return the native global object for this context.
-   *
-   **/
-  virtual void *GetNativeGlobal() = 0;
-
-  /**
-   * Create a new global object that will be used for an inner window.
-   * Return the native global and an nsISupports 'holder' that can be used
-   * to manage the lifetime of it.
-   */
-  virtual nsresult CreateNativeGlobalForInner(
-                                      nsIScriptGlobalObject *aNewInner,
-                                      PRBool aIsChrome,
-                                      void **aNativeGlobal,
-                                      nsISupports **aHolder) = 0;
-
-  /**
-   * Connect this context to a new inner window, to allow "prototype"
-   * chaining from the inner to the outer.
-   * Called after both the the inner and outer windows are initialized
-   **/
-  virtual nsresult ConnectToInner(nsIScriptGlobalObject *aNewInner,
-                                  void *aOuterGlobal) = 0;
-
-
-  /**
-   * Init this context ready for use.  If aGlobalObject is not NULL, this
-   * function may initialize based on this global (for example, using the
-   * global to locate a chrome window, create a new 'scope' for this
-   * global, etc)
-   *
-   * @param aGlobalObject the gobal object, which may be nsnull.
-   *
-   * @return NS_OK if context initialization was successful
-   *
-   **/
-  virtual nsresult InitContext(nsIScriptGlobalObject *aGlobalObject) = 0;
-
-  /**
-   * Check to see if context is as yet intialized. Used to prevent
-   * reentrancy issues during the initialization process.
-   *
-   * @return PR_TRUE if initialized, PR_FALSE if not
-   *
-   */
-  virtual PRBool IsContextInitialized() = 0;
-
-  /**
-   * Called as the global object discards its reference to the context.
-   */
-  virtual void FinalizeContext() = 0;
-
-  /**
-   * For garbage collected systems, do a synchronous collection pass.
-   * May be a no-op on other systems
-   *
-   * @return NS_OK if the method is successful
-   */
-  virtual void GC() = 0;
-
-  /**
-   * Inform the context that a script was evaluated.
-   * A GC may be done if "necessary."
-   * This call is necessary if script evaluation is done
-   * without using the EvaluateScript method.
-   * @param aTerminated If true then call termination function if it was 
-   *    previously set. Within DOM this will always be true, but outside 
-   *    callers (such as xpconnect) who may do script evaluations nested
-   *    inside DOM script evaluations can pass false to avoid premature
-   *    calls to the termination function.
-   * @return NS_OK if the method is successful
-   */
-  virtual void ScriptEvaluated(PRBool aTerminated) = 0;
-
-  virtual nsresult Serialize(nsIObjectOutputStream* aStream,
-                             void *aScriptObject) = 0;
-  
-  /* Deserialize a script from a stream.
-   */
-  virtual nsresult Deserialize(nsIObjectInputStream* aStream,
-                               nsScriptObjectHolder &aResult) = 0;
-
-  /**
-   * JS only - this function need not be implemented by languages other
-   * than JS (ie, this should be moved to a private interface!)
-   * Called to specify a function that should be called when the current
-   * script (if there is one) terminates. Generally used if breakdown
-   * of script state needs to happen, but should be deferred till
-   * the end of script evaluation.
-   *
-   * @throws NS_ERROR_OUT_OF_MEMORY if that happens
-   */
-  virtual nsresult SetTerminationFunction(nsScriptTerminationFunc aFunc,
-                                          nsISupports* aRef) = 0;
-
-  /**
-   * Called to disable/enable script execution in this context.
-   */
-  virtual PRBool GetScriptsEnabled() = 0;
-  virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts) = 0;
-
-  // SetProperty is suspect and jst believes should not be needed.  Currenly
-  // used only for "arguments".
-  virtual nsresult SetProperty(void *aTarget, const char *aPropName, nsISupports *aVal) = 0;
-  /** 
-   * Called to set/get information if the script context is
-   * currently processing a script tag
-   */
-  virtual PRBool GetProcessingScriptTag() = 0;
-  virtual void SetProcessingScriptTag(PRBool aResult) = 0;
-
-  /**
-   * Tell the context whether or not to GC when destroyed.  An optimization
-   * used when the window is a [i]frame, so GC will happen anyway.
-   */
-  virtual void SetGCOnDestruction(PRBool aGCOnDestruction) = 0;
-
-  /**
-   * Initialize DOM classes on aGlobalObj, always call
-   * WillInitializeContext() before calling InitContext(), and always
-   * call DidInitializeContext() when a context is fully
-   * (successfully) initialized.
-   */
-  virtual nsresult InitClasses(void *aGlobalObj) = 0;
-
-  /**
-   * Clear the scope object - may be called either as we are being torn down,
-   * or before we are attached to a different document.
-   *
-   * aClearFromProtoChain is probably somewhat JavaScript specific.  It
-   * indicates that the global scope polluter should be removed from the
-   * prototype chain and that the objects in the prototype chain should
-   * also have their scopes cleared.  We don't do this all the time
-   * because the prototype chain is shared between inner and outer
-   * windows, and needs to stay with inner windows that we're keeping
-   * around.
-   */
-  virtual void ClearScope(void* aGlobalObj, PRBool aClearFromProtoChain) = 0;
-
-  /**
-   * Tell the context we're about to be reinitialize it.
-   */
-  virtual void WillInitializeContext() = 0;
-
-  /**
-   * Tell the context we're done reinitializing it.
-   */
-  virtual void DidInitializeContext() = 0;
-
-  /**
-   * Tell the context our global has a new document, and the scope
-   * used by it.  Use nsISupports to avoid dependency issues - but expect
-   * a QI for nsIDOMDocument and/or nsIDocument.
-   */
-  virtual void DidSetDocument(nsISupports *aDoc, void *aGlobal) = 0;
-
-  /* Memory managment for script objects.  Used by the implementation of
-   * nsScriptObjectHolder to manage the lifetimes of the held script objects.
-   *
-   * See also nsIScriptRuntime, which has identical methods and is useful
-   * in situations when you do not have an nsIScriptContext.
-   * 
-   */
-  virtual nsresult DropScriptObject(void *object) = 0;
-  virtual nsresult HoldScriptObject(void *object) = 0;
-
-  /* Report a pending exception if there is one on the native context */
-  virtual void ReportPendingException() = 0;
-};
-
-//NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptContext, NS_ISCRIPTCONTEXT_IID) //SWT-20090407
-
-#endif // nsIScriptContext_h__
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext_24.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext_24.h
deleted file mode 100644
index 4ad89d21c1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext_24.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This file is derived from the Original Code provided by mozilla.org,
- * whose Initial Developer is Netscape Communications Corporation.  Changes
- * to the original file were made by SWT on September 18, 2013 and are marked
- * with trailing comment "//SWT-20130918".
- */
-
-#ifndef nsIScriptContext_h__
-#define nsIScriptContext_h__
-
-//#include "nscore.h" //SWT-20130918
-//#include "nsStringGlue.h" //SWT-20130918
-//#include "nsISupports.h" //SWT-20130918
-//#include "nsCOMPtr.h" //SWT-20130918
-//#include "nsIProgrammingLanguage.h" //SWT-20130918
-//#include "jsfriendapi.h" //SWT-20130918
-//#include "jspubtd.h" //SWT-20130918
-//#include "js/GCAPI.h" //SWT-20130918
-
-class nsIScriptGlobalObject;
-class nsIScriptSecurityManager;
-class nsIPrincipal;
-class nsIAtom;
-class nsIArray;
-class nsIVariant;
-class nsIObjectInputStream;
-class nsIObjectOutputStream;
-class nsIScriptObjectPrincipal;
-class nsIDOMWindow;
-class nsIURI;
-
-#define NS_ISCRIPTCONTEXT_IID \
-{ 0xef0c91ce, 0x14f6, 0x41c9, \
-  { 0xa5, 0x77, 0xa6, 0xeb, 0xdc, 0x6d, 0x44, 0x7b } }
-
-/* This MUST match JSVERSION_DEFAULT.  This version stuff if we don't
-   know what language we have is a little silly... */
-#define SCRIPTVERSION_DEFAULT JSVERSION_DEFAULT
-
-#define nsresult int //SWT-20130918
-
-/**
- * It is used by the application to initialize a runtime and run scripts.
- * A script runtime would implement this interface.
- */
-class nsIScriptContext /* : public nsISupports */ //SWT-20130918
-{
-public:
-//  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTCONTEXT_IID) //SWT-20130918
-
-  virtual nsresult QueryInterface(/* const nsIID & uuid, void **result */) = 0; //SWT-20130918
-  virtual nsresult AddRef(void) = 0; //SWT-20130918
-  virtual nsresult Release(void) = 0; //SWT-20130918
-  
-  /**
-   * Compile and execute a script.
-   *
-   * @param aScript a string representing the script to be executed
-   * @param aScopeObject a script object for the scope to execute in.
-   * @param aOptions an options object. You probably want to at least set
-   *                 filename and line number. The principal is computed
-   *                 internally, though 'originPrincipals' may be passed.
-   * @param aCoerceToString if the return value is not JSVAL_VOID, convert it
-   *                        to a string before returning.
-   * @param aRetValue the result of executing the script.  Pass null if you
-   *                  don't care about the result.  Note that asking for a
-   *                  result will deoptimize your script somewhat in many cases.
-   */
-  virtual nsresult EvaluateString(/* const nsAString& aScript, //SWT-20130918
-                                  JS::Handle<JSObject*> aScopeObject,
-                                  JS::CompileOptions& aOptions,
-                                  bool aCoerceToString,
-                                  JS::Value* aRetValue */) = 0; //SWT-20130918
-
-  /**
-   * Compile a script.
-   *
-   * @param aText a PRUnichar buffer containing script source
-   * @param aTextLength number of characters in aText
-   * @param aPrincipal the principal that produced the script
-   * @param aURL the URL or filename for error messages
-   * @param aLineNo the starting line number of the script for error messages
-   * @param aVersion the script language version to use when executing
-   * @param aScriptObject an executable object that's the result of compiling
-   *                      the script.
-   * @param aSaveSource force the source code to be saved by the JS engine in memory
-   *
-   * @return NS_OK if the script source was valid and got compiled.
-   *
-   **/
-  virtual nsresult CompileScript(/* const PRUnichar* aText, //SWT-20130918
-                                 int32_t aTextLength,
-                                 nsIPrincipal* aPrincipal,
-                                 const char* aURL,
-                                 uint32_t aLineNo,
-                                 uint32_t aVersion,
-                                 JS::MutableHandle<JSScript*> aScriptObject,
-                                 bool aSaveSource = false */) = 0; //SWT-20130918
-
-  /**
-   * Execute a precompiled script object.
-   *
-   * @param aScriptObject an object representing the script to be executed
-   * @param aScopeObject an object telling the scope in which to execute,
-   *                     or nullptr to use a default scope
-   * @param aRetValue the result of executing the script, may be null in
-   *                  which case no result string is computed
-   * @param aIsUndefined true if the result of executing the script is the
-   *                     undefined value, may be null for "don't care"
-   *
-   * @return NS_OK if the script was valid and got executed
-   *
-   */
-  virtual nsresult ExecuteScript(/* JSScript* aScriptObject, //SWT-20130918
-                                 JSObject* aScopeObject */) = 0; //SWT-20130918
-
-  /**
-   * Bind an already-compiled event handler function to the given
-   * target.  Scripting languages with static scoping must re-bind the
-   * scope chain for aHandler to begin (after the activation scope for
-   * aHandler itself, typically) with aTarget's scope.
-   *
-   * The result of the bind operation is a new handler object, with
-   * principals now set and scope set as above.  This is returned in
-   * aBoundHandler.  When this function is called, aBoundHandler is
-   * expected to not be holding an object.
-   *
-   * @param aTarget an object telling the scope in which to bind the compiled
-   *        event handler function.  The context will presumably associate
-   *        this nsISupports with a native script object.
-   * @param aScope the scope in which the script object for aTarget should be
-   *        looked for.
-   * @param aHandler the function object to bind, created by an earlier call to
-   *        CompileEventHandler
-   * @param aBoundHandler [out] the result of the bind operation.
-   * @return NS_OK if the function was successfully bound
-   */
-  virtual nsresult BindCompiledEventHandler(/* nsISupports* aTarget, //SWT-20130918
-                                            JS::Handle<JSObject*> aScope,
-                                            JS::Handle<JSObject*> aHandler,
-                                            JS::MutableHandle<JSObject*> aBoundHandler */) = 0; //SWT-20130918
-
-  /**
-   * Return the global object.
-   *
-   **/
-  virtual nsIScriptGlobalObject *GetGlobalObject() = 0;
-
-  /**
-   * Return the native script context
-   *
-   **/
-  virtual /* JSContext* */ void* GetNativeContext() = 0; //SWT-20130918
-
-  /**
-   * Return the native global object for this context.
-   *
-   **/
-  virtual /* JSObject* */ void* GetNativeGlobal() = 0; //SWT-20130918
-
-  /**
-   * Initialize the context generally. Does not create a global object.
-   **/
-  virtual nsresult InitContext() = 0;
-
-  /**
-   * Check to see if context is as yet intialized. Used to prevent
-   * reentrancy issues during the initialization process.
-   *
-   * @return true if initialized, false if not
-   *
-   */
-  virtual bool IsContextInitialized() = 0;
-
-  /**
-   * For garbage collected systems, do a synchronous collection pass.
-   * May be a no-op on other systems
-   *
-   * @return NS_OK if the method is successful
-   */
-  virtual void GC(/* JS::gcreason::Reason aReason */) = 0; //SWT-20130918
-
-  /**
-   * Inform the context that a script was evaluated.
-   * A GC may be done if "necessary."
-   * This call is necessary if script evaluation is done
-   * without using the EvaluateScript method.
-   * @param aTerminated If true then do script termination handling. Within DOM
-   *     this will always be true, but outside  callers (such as xpconnect) who
-   *     may do script evaluations nested inside inside DOM script evaluations
-   *     can pass false to avoid premature termination handling.
-   * @return NS_OK if the method is successful
-   */
-  virtual void ScriptEvaluated(bool aTerminated) = 0;
-
-  virtual nsresult Serialize(/* nsIObjectOutputStream* aStream, //SWT-20130918
-                             JS::Handle<JSScript*> aScriptObject */) = 0; //SWT-20130918
-  
-  /* Deserialize a script from a stream.
-   */
-  virtual nsresult Deserialize(/* nsIObjectInputStream* aStream, //SWT-20130918
-                               JS::MutableHandle<JSScript*> aResult */) = 0; //SWT-20130918
-
-  /**
-   * Called to disable/enable script execution in this context.
-   */
-  virtual bool GetScriptsEnabled() = 0;
-  virtual void SetScriptsEnabled(bool aEnabled, bool aFireTimeouts) = 0;
-
-  // SetProperty is suspect and jst believes should not be needed.  Currenly
-  // used only for "arguments".
-  virtual nsresult SetProperty(/* JS::Handle<JSObject*> aTarget, //SWT-20130918
-                               const char* aPropName, nsISupports* aVal */) = 0; //SWT-20130918
-  /** 
-   * Called to set/get information if the script context is
-   * currently processing a script tag
-   */
-  virtual bool GetProcessingScriptTag() = 0;
-  virtual void SetProcessingScriptTag(bool aResult) = 0;
-
-  /**
-   * Called to find out if this script context might be executing script.
-   */
-  virtual bool GetExecutingScript() = 0;
-
-  /**
-   * Initialize DOM classes on aGlobalObj, always call
-   * WillInitializeContext() before calling InitContext(), and always
-   * call DidInitializeContext() when a context is fully
-   * (successfully) initialized.
-   */
-  virtual nsresult InitClasses(/* JS::Handle<JSObject*> aGlobalObj */) = 0; //SWT-20130918
-
-  /**
-   * Tell the context we're about to be reinitialize it.
-   */
-  virtual void WillInitializeContext() = 0;
-
-  /**
-   * Tell the context we're done reinitializing it.
-   */
-  virtual void DidInitializeContext() = 0;
-
-  virtual void EnterModalState() = 0;
-  virtual void LeaveModalState() = 0;
-};
-
-// NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptContext, NS_ISCRIPTCONTEXT_IID) //SWT-20130918
-
-#endif // nsIScriptContext_h__
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h
deleted file mode 100644
index c382e69eba..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=80: */
-/* ***** 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 of 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 ***** */
-
-/*
- * This file is derived from the Original Code provided by mozilla.org,
- * whose Initial Developer is Netscape Communications Corporation.  Changes
- * to the original file were made by SWT on April 7, 2009 and are marked
- * with trailing comment "//SWT-20090407".
- */
-
-#ifndef nsIScriptGlobalObject_h__
-#define nsIScriptGlobalObject_h__
-
-#include "nsISupports.h"
-//#include "nsEvent.h" //SWT-20090407
-#include "nsIProgrammingLanguage.h"
-
-class nsIScriptContext;
-class nsIDOMDocument;
-class nsIDOMEvent;
-class nsPresContext;
-class nsIScriptGlobalObjectOwner;
-class nsIArray;
-class nsScriptErrorEvent;
-class nsIScriptGlobalObject;
-//enum nsEventStatus; //SWT-20090407
-struct JSObject; // until we finally remove GetGlobalJSObject...
-
-// Some helpers for working with integer "script type IDs", and specifically
-// for working with arrays of such objects. For example, it is common for
-// implementations supporting multiple script languages to keep each
-// language's nsIScriptContext in an array indexed by the language ID.
-
-// Implementation note: We always ignore nsIProgrammingLanguage::UNKNOWN and
-// nsIProgrammingLanguage::CPLUSPLUS - this gives javascript slot 0.  An
-// attempted micro-optimization tried to avoid us going all the way to 
-// nsIProgrammingLanguage::MAX; however:
-// * Someone is reportedly working on a PHP impl - that has value 9
-// * nsGenericElement therefore allows 4 bits for the value.
-// So there is no good reason for us to be more restrictive again...
-
-#define NS_STID_FIRST nsIProgrammingLanguage::JAVASCRIPT
-// like nsGenericElement, only 4 bits worth is valid...
-#define NS_STID_LAST (nsIProgrammingLanguage::MAX > 0x000FU ? \
-                      0x000FU : nsIProgrammingLanguage::MAX)
-
-// Use to declare the array size
-#define NS_STID_ARRAY_UBOUND (NS_STID_LAST-NS_STID_FIRST+1)
-
-// Is a language ID valid?
-#define NS_STID_VALID(langID) (langID >= NS_STID_FIRST && langID <= NS_STID_LAST)
-
-// Return an index for a given ID.
-#define NS_STID_INDEX(langID) (langID-NS_STID_FIRST)
-
-// Create a 'for' loop iterating over all possible language IDs (*not* indexes)
-#define NS_STID_FOR_ID(varName) \
-          for (varName=NS_STID_FIRST;varName<=NS_STID_LAST;varName++)
-
-// Create a 'for' loop iterating over all indexes (when you don't need to know
-// what language it is)
-#define NS_STID_FOR_INDEX(varName) \
-          for (varName=0;varName<=NS_STID_INDEX(NS_STID_LAST);varName++)
-
-// A helper function for nsIScriptGlobalObject implementations to use
-// when handling a script error.  Generally called by the global when a context
-// notifies it of an error via nsIScriptGlobalObject::HandleScriptError.
-// Returns PR_TRUE if HandleDOMEvent was actually called, in which case
-// aStatus will be filled in with the status.
-//PRBool //SWT-20090407
-//NS_HandleScriptError(nsIScriptGlobalObject *aScriptGlobal, //SWT-20090407
-//                     nsScriptErrorEvent *aErrorEvent, //SWT-20090407
-//                     nsEventStatus *aStatus); //SWT-20090407
-
-
-#define NS_ISCRIPTGLOBALOBJECT_IID \
-{ /* {6afecd40-0b9a-4cfd-8c42-0f645cd91829} */ \
-  0x6afecd40, 0x0b9a, 0x4cfd, \
-  { 0x8c, 0x42, 0x0f, 0x64, 0x5c, 0xd9, 0x18, 0x29 } }
-
-/**
-+  * The global object which keeps a script context for each supported script
-+  * language. This often used to store per-window global state.
- */
-
-class nsIScriptGlobalObject : public nsISupports
-{
-public:
-//NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTGLOBALOBJECT_IID) //SWT-20090407
-
-  /**
-   * Ensure that the script global object is initialized for working with the
-   * specified script language ID.  This will set up the nsIScriptContext
-   * and 'script global' for that language, allowing these to be fetched
-   * and manipulated.
-   * @return NS_OK if successful; error conditions include that the language
-   * has not been registered, as well as 'normal' errors, such as
-   * out-of-memory
-   */
-  virtual nsresult EnsureScriptEnvironment(PRUint32 aLangID) = 0;
-  /**
-   * Get a script context (WITHOUT added reference) for the specified language.
-   */
-  virtual nsIScriptContext *GetScriptContext(PRUint32 lang) = 0;
-  
-  /**
-   * Get the opaque "global" object for the specified lang.
-   */
-  virtual void *GetScriptGlobal(PRUint32 lang) = 0;
-
-  // Set/GetContext deprecated methods - use GetScriptContext/Global
-  virtual JSObject *GetGlobalJSObject() {
-        return (JSObject *)GetScriptGlobal(nsIProgrammingLanguage::JAVASCRIPT);
-  }
-
-  virtual nsIScriptContext *GetContext() {
-        return GetScriptContext(nsIProgrammingLanguage::JAVASCRIPT);
-  }
-
-  /**
-   * Set a new language context for this global.  The native global for the
-   * context is created by the context's GetNativeGlobal() method.
-   */
-
-  virtual nsresult SetScriptContext(PRUint32 lang, nsIScriptContext *aContext) = 0;
-
-  /**
-   * Called when the global script for a language is finalized, typically as
-   * part of its GC process.  By the time this call is made, the
-   * nsIScriptContext for the language has probably already been removed.
-   * After this call, the passed object is dead - which should generally be the
-   * same object the global is using for a global for that language.
-   */
-
-  virtual void OnFinalize(PRUint32 aLangID, void *aScriptGlobal) = 0;
-
-  /**
-   * Called to enable/disable scripts.
-   */
-  virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts) = 0;
-
-  /** Set a new arguments object for this window. This will be set on
-   * the window right away (if there's an existing document) and it
-   * will also be installed on the window when the next document is
-   * loaded.  Each language impl is responsible for converting to
-   * an array of args as appropriate for that language.
-   */
-  virtual nsresult SetNewArguments(nsIArray *aArguments) = 0;
-
-  /** Handle a script error.  Generally called by a script context.
-   */
-//virtual nsresult HandleScriptError(nsScriptErrorEvent *aErrorEvent, //SWT-20090407
-//                                   nsEventStatus *aEventStatus) { //SWT-20090407
-//  return NS_HandleScriptError(this, aErrorEvent, aEventStatus); //SWT-20090407
-//} //SWT-20090407
-};
-
-//NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptGlobalObject, //SWT-20090407
-//                              NS_ISCRIPTGLOBALOBJECT_IID) //SWT-20090407
-
-#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject_24.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject_24.h
deleted file mode 100644
index 4e26b0a64f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject_24.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This file is derived from the Original Code provided by mozilla.org,
- * whose Initial Developer is Netscape Communications Corporation.  Changes
- * to the original file were made by SWT on September 18, 2013 and are marked
- * with trailing comment "//SWT-20130918".
- */
- 
-#ifndef nsIScriptGlobalObject_h__
-#define nsIScriptGlobalObject_h__
-
-//#include "nsISupports.h" //SWT-20130918
-//#include "nsEvent.h" //SWT-20130918
-#include "nsIGlobalObject_24.h"  //SWT-20130918
-
-class nsIScriptContext;
-class nsScriptErrorEvent;
-class nsIScriptGlobalObject;
-class JSObject;
-
-// A helper function for nsIScriptGlobalObject implementations to use
-// when handling a script error.  Generally called by the global when a context
-// notifies it of an error via nsIScriptGlobalObject::HandleScriptError.
-// Returns true if HandleDOMEvent was actually called, in which case
-// aStatus will be filled in with the status.
-//bool //SWT-20130918
-//NS_HandleScriptError(nsIScriptGlobalObject *aScriptGlobal, //SWT-20130918
-//                     nsScriptErrorEvent *aErrorEvent, //SWT-20130918
-//                     nsEventStatus *aStatus); //SWT-20130918
-
-#define NS_ISCRIPTGLOBALOBJECT_IID \
-{ 0xde24b30a, 0x12c6, 0x4e5f, \
-  { 0xa8, 0x5e, 0x90, 0xcd, 0xfb, 0x6c, 0x54, 0x51 } }
-
-#define nsresult int //SWT-20130918
-
-/**
- * The global object which keeps a script context for each supported script
- * language. This often used to store per-window global state.
- * This is a heavyweight interface implemented only by DOM globals, and
- * it might go away some time in the future.
- */
-
-class nsIScriptGlobalObject : public nsIGlobalObject
-{
-public:
-//  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTGLOBALOBJECT_IID) //SWT-20130918
-
-  /**
-   * Ensure that the script global object is initialized for working with the
-   * specified script language ID.  This will set up the nsIScriptContext
-   * and 'script global' for that language, allowing these to be fetched
-   * and manipulated.
-   * @return NS_OK if successful; error conditions include that the language
-   * has not been registered, as well as 'normal' errors, such as
-   * out-of-memory
-   */
-  virtual nsresult EnsureScriptEnvironment() = 0;
-  /**
-   * Get a script context (WITHOUT added reference) for the specified language.
-   */
-  virtual nsIScriptContext *GetScriptContext() = 0;
-
-  nsIScriptContext* GetContext() {
-    return GetScriptContext();
-  }
-
-  /**
-   * Called when the global script for a language is finalized, typically as
-   * part of its GC process.  By the time this call is made, the
-   * nsIScriptContext for the language has probably already been removed.
-   * After this call, the passed object is dead - which should generally be the
-   * same object the global is using for a global for that language.
-   */
-  virtual void OnFinalize(JSObject* aObject) = 0;
-
-  /**
-   * Called to enable/disable scripts.
-   */
-  virtual void SetScriptsEnabled(bool aEnabled, bool aFireTimeouts) = 0;
-
-  /**
-   * Handle a script error.  Generally called by a script context.
-   */
-//  virtual nsresult HandleScriptError(nsScriptErrorEvent *aErrorEvent, //SWT-20130918
-//                                     nsEventStatus *aEventStatus) { //SWT-20130918
-//    NS_ENSURE_STATE(NS_HandleScriptError(this, aErrorEvent, aEventStatus)); //SWT-20130918
-//    return NS_OK; //SWT-20130918
-//  } //SWT-20130918
-
-  virtual bool IsBlackForCC() { return false; }
-};
-
-//NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptGlobalObject,  //SWT-20130918
-//                              NS_ISCRIPTGLOBALOBJECT_IID)  //SWT-20130918
-
-#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/swt_xpcom.rc b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/swt_xpcom.rc
deleted file mode 100644
index f5598d4d32..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/swt_xpcom.rc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 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
- *******************************************************************************/
- 
-#include "windows.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION SWT_COMMA_VERSION
- PRODUCTVERSION 0,0,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40000L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Eclipse Foundation\0"
-            VALUE "FileDescription", "SWT for Windows native library\0"
-            VALUE "FileVersion", SWT_FILE_VERSION
-            VALUE "InternalName", "SWT\0"
-            VALUE "LegalCopyright", "Copyright (c) 2000, 2006 IBM Corp.  All Rights Reserved.\0"
-            VALUE "OriginalFilename", SWT_ORG_FILENAME
-            VALUE "ProductName", "Standard Widget Toolkit\0"
-            VALUE "ProductVersion", "0,0,0,0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
deleted file mode 100644
index aef9ac18e7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
+++ /dev/null
@@ -1,7215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#include "swt.h"
-#include "xpcom_structs.h"
-#include "xpcom_stats.h"
-
-#ifndef XPCOM_NATIVE
-#define XPCOM_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOM_##func
-#endif
-
-#if (!defined(NO__1Call__I) && !defined(JNI64)) || (!defined(NO__1Call__J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__I)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__I)(JNIEnv *env, jclass that, jintLong arg0)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__J)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__J)(JNIEnv *env, jclass that, jintLong arg0)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1Call__I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1Call__J_FUNC);
-#endif
-	rc = (jint)((jint (*)())arg0)();
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1Call__I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1Call__J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1Call__IIII) && !defined(JNI64)) || (!defined(NO__1Call__JJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1Call__IIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1Call__JJJJ_FUNC);
-#endif
-	rc = (jint)((SWT_XREInitEmbedding2)arg0)((nsIFile *)arg1, (nsIFile *)arg2, (nsIDirectoryServiceProvider *)arg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1Call__IIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1Call__JJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1Call__IIIIII) && !defined(JNI64)) || (!defined(NO__1Call__JJJJJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1Call__IIIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1Call__JJJJJI_FUNC);
-#endif
-	rc = (jint)((SWT_XREInitEmbedding)arg0)((nsILocalFile *)arg1, (nsILocalFile *)arg2, (nsIDirectoryServiceProvider *)arg3, (nsStaticModuleInfo const *)arg4, arg5);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1Call__IIIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1Call__JJJJJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1Call__III_3BII_3I) && !defined(JNI64)) || (!defined(NO__1Call__JJJ_3BII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__III_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__III_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
-#else
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__JJJ_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__JJJ_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint *lparg6=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1Call__III_3BII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1Call__JJJ_3BII_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jintLong)((nsWriteSegmentFun)arg0)((nsIInputStream *)arg1, (void *)arg2, (const char *)lparg3, arg4, arg5, (PRUint32 *)lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1Call__III_3BII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1Call__JJJ_3BII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO__1NS_1GetComponentManager
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetComponentManager)(JNIEnv *env, jclass that, jintLongArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetComponentManager)
-	(JNIEnv *env, jclass that, jintLongArray arg0)
-{
-	jintLong *lparg0=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1NS_1GetComponentManager_FUNC);
-	if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)NS_GetComponentManager((nsIComponentManager**)lparg0);
-fail:
-	if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1NS_1GetComponentManager_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1NS_1GetServiceManager
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetServiceManager)(JNIEnv *env, jclass that, jintLongArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetServiceManager)
-	(JNIEnv *env, jclass that, jintLongArray arg0)
-{
-	jintLong *lparg0=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1NS_1GetServiceManager_FUNC);
-	if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)NS_GetServiceManager((nsIServiceManager**)lparg0);
-fail:
-	if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1NS_1GetServiceManager_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1NS_1InitXPCOM2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1InitXPCOM2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1InitXPCOM2)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1NS_1InitXPCOM2_FUNC);
-	rc = (jint)NS_InitXPCOM2((nsIServiceManager **)arg0, (nsIFile *)arg1, (nsIDirectoryServiceProvider *)arg2);
-	XPCOM_NATIVE_EXIT(env, that, _1NS_1InitXPCOM2_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1NS_1NewLocalFile
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1NewLocalFile)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1NewLocalFile)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
-{
-	jintLong *lparg2=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1NS_1NewLocalFile_FUNC);
-	if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsILocalFile**)lparg2);
-fail:
-	if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1NS_1NewLocalFile_FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong))(*(jintLong **)arg1)[arg0])(arg1);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIB) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJB) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIB)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyte arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIB)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyte arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJB)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyte arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJB)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyte arg2)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIB_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJB_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte))(*(jintLong **)arg1)[arg0])(arg1, arg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIB_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJB_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IID) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJD) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IID)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jdouble arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IID)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jdouble arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJD)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jdouble arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJD)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jdouble arg2)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IID_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJD_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jdouble))(*(jintLong **)arg1)[arg0])(arg1, arg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IID_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJD_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIF) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJF) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIF_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJF_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jfloat))(*(jintLong **)arg1)[arg0])(arg1, arg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIF_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJF_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIFF_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJFF_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIFF_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2, jfloat arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIFF_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2, jfloat arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJFF_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2, jfloat arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJFF_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2, jfloat arg3, jintArray arg4)
-#endif
-{
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIFF_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJFF_3I_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jfloat, jfloat, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIFF_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJFF_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIFF_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJFF_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIFF_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2, jfloat arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIFF_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2, jfloat arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJFF_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2, jfloat arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJFF_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2, jfloat arg3, jlongArray arg4)
-#endif
-{
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIFF_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJFF_3J_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jfloat, jfloat, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIFF_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJFF_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIIIIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIIIIIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIIIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIIIIIII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIIIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIIIIIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIIIIIIIIIIISI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIIIIIIIIIISI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIIIIIIIIISI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIIIIIIIIIISI_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIIIIIIIIISI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIIIIIIIIIISI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIIIIIIIIIIISIFS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIIIIIIIIIISIFS) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIIIIIISIFS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16, jfloat arg17, jshort arg18);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIIIIIISIFS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16, jfloat arg17, jshort arg18)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIIIIIISIFS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16, jfloat arg17, jshort arg18);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIIIIIISIFS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16, jfloat arg17, jshort arg18)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIIIIIIIIISIFS_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIIIIIIIIIISIFS_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint, jfloat, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIIIIIIIIISIFS_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIIIIIIIIIISIFS_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIIIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIIII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9)
-#endif
-{
-	jint *lparg9=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIIII_3I_FUNC);
-#endif
-	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, lparg9);
-fail:
-	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIIII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIIII_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIII_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
-#endif
-{
-	jchar *lparg8=NULL;
-	jint *lparg9=NULL;
-	jint *lparg10=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIII_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIII_3C_3I_3I_FUNC);
-#endif
-	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
-fail:
-	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
-	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
-	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIII_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIII_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
-#endif
-{
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIII_3I_FUNC);
-#endif
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIIIJII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIJII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIJII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIJII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIJII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIJII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIII_3CIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3CIIIII_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
-#endif
-{
-	jchar *lparg6=NULL;
-	jint *lparg12=NULL;
-	jint *lparg13=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3CIIIII_3I_3I_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg12) if ((lparg12 = env->GetIntArrayElements(arg12, NULL)) == NULL) goto fail;
-	if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jint, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
-fail:
-	if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
-	if (arg12 && lparg12) env->ReleaseIntArrayElements(arg12, lparg12, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3CIIIII_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIII_3C_3BIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3C_3BIIIII_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
-#endif
-{
-	jchar *lparg6=NULL;
-	jbyte *lparg7=NULL;
-	jint *lparg13=NULL;
-	jint *lparg14=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
-	if (arg14) if ((lparg14 = env->GetIntArrayElements(arg14, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
-fail:
-	if (arg14 && lparg14) env->ReleaseIntArrayElements(arg14, lparg14, 0);
-	if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
-	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIII_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-#endif
-{
-	jchar *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3C_3I_3I_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
-fail:
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
-#endif
-{
-	jint *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3I_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
-#endif
-{
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3I_3I_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIII_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-#endif
-{
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3I_3I_3I_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
-fail:
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIII_3B_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII_3B_3BI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7)
-#endif
-{
-	jbyte *lparg5=NULL;
-	jbyte *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3B_3BI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_3B_3BI_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jbyte *, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, arg7);
-fail:
-	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3B_3BI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_3B_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIII_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
-#endif
-{
-	jchar *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_3C_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
-#endif
-{
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_3I_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIII_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7)
-#endif
-{
-	jint *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_3I_3I_3I_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIJJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIJJJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIIS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIS) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jshort arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jshort arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jshort arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jshort arg4)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIS_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIS_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIS_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIS_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4)
-#endif
-{
-	jbyte *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3B_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3BI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5)
-#endif
-{
-	jbyte *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3BI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3BI_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
-fail:
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3BI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3BII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3BII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3BII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3BII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6)
-#endif
-{
-	jbyte *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3BII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3BII_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6);
-fail:
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3BII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3BII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3B_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5)
-#endif
-{
-	jbyte *lparg4=NULL;
-	jbyte *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3B_3B_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3B_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4)
-#endif
-{
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3C_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3CIJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3CIJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
-#endif
-{
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3CIJI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3CIJI_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jint, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3CIJI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3CIJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3CJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3CJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
-#endif
-{
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3CJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3CJJJ_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3CJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3CJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3C_3CI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3C_3CI_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
-#endif
-{
-	jchar *lparg4=NULL;
-	jchar *lparg5=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3C_3CI_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3C_3CI_3I_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jchar *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3C_3CI_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3C_3CI_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
-#endif
-{
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3I_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
-#endif
-{
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3I_3I_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIII_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
-#endif
-{
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3J_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIIJJJJJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIJJJJJJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9)
-#endif
-{
-	jlong *lparg9=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIJJJJJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIJJJJJJ_3J_FUNC);
-#endif
-	if (arg9) if ((lparg9 = env->GetLongArrayElements(arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jlong, jlong, jlong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, lparg9);
-fail:
-	if (arg9 && lparg9) env->ReleaseLongArrayElements(arg9, lparg9, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIJJJJJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIJJJJJJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
-#endif
-{
-	nsID _arg3, *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, nsID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6)
-#endif
-{
-	nsID _arg3, *lparg3=NULL;
-	jint *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, nsID *, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4)
-#endif
-{
-	nsID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3B_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3BI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3BI_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3BI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3BI_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BI_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3BI_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BI_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3BI_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3BS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3BS) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jshort arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jshort arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jshort arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jshort arg4)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BS_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3BS_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BS_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3BS_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3B_3B_3BI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3B_3B_3BI_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jbyte *lparg5=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3B_3BI_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3B_3B_3BI_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jbyte *, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3B_3BI_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3B_3B_3BI_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3B_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3B_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3B_3C_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3B_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3B_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3B_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3B_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3B_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3)
-#endif
-{
-	jchar *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3CI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3CI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4)
-#endif
-{
-	jchar *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3CI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3CI_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3CI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3CI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jchar *lparg6=NULL;
-	jchar *lparg7=NULL;
-	jchar *lparg8=NULL;
-	jchar *lparg9=NULL;
-	jint *lparg10=NULL;
-	jint *lparg11=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
-	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
-	if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
-fail:
-	if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
-	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
-	if (arg9 && lparg9) env->ReleaseCharArrayElements(arg9, lparg9, 0);
-	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseCharArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3CI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3CI_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
-fail:
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3C_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3C_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jchar *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3C_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3C_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jchar *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3C_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3C_3I_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3I_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint *lparg5=NULL;
-	jchar *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
-fail:
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint *lparg6=NULL;
-	jchar *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint *lparg9=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *, jint *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
-fail:
-	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseCharArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jintArray arg4)
-#endif
-{
-	jchar *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
-#endif
-{
-	jint *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3II) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3II) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
-#endif
-{
-	jint *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3II_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3II_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3II_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3II_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3IJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3IJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jlong arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jlong arg4)
-#endif
-{
-	jint *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3IJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3IJ_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3IJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3IJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-#endif
-{
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3I_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3I_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
-#endif
-{
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3I_3I_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3I_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3I_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3I_3I_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5)
-#endif
-{
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3I_3I_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3I_3I_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3)
-#endif
-{
-	jlong *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__III_3S) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3S) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jshortArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jshortArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jshortArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jshortArray arg3)
-#endif
-{
-	jshort *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3S_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3S_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetShortArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jshort *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseShortArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3S_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3S_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJI_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIIIIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIIIII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9)
-#endif
-{
-	jint *lparg9=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIIIII_3I_FUNC);
-#endif
-	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jint, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, lparg9);
-fail:
-	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIIIII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIIIII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIIJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIJI_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIIJIIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIJIIIIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJIIIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIJIIIIII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJIIIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIJIIIIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIIJIIIIIIIIISJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIJIIIIIIIIISJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIJIIIIIIIIISJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIJIIIIIIIIISJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIIJIIIIIIIIISJFS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIJIIIIIIIIISJFS) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIIIIIISJFS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16, jfloat arg17, jshort arg18);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIIIIIISJFS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16, jfloat arg17, jshort arg18)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIIIIIISJFS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16, jfloat arg17, jshort arg18);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIIIIIISJFS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16, jfloat arg17, jshort arg18)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJIIIIIIIIISJFS_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIJIIIIIIIIISJFS_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong, jfloat, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJIIIIIIIIISJFS_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIJIIIIIIIIISJFS_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIIJ_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIJ_3I_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
-#endif
-{
-	jint *lparg6=NULL;
-	jlong *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJ_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIJ_3I_3J_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJ_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIJ_3I_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5)
-#endif
-{
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJII_3I_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIJII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIJII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIJII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIJII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIJI_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIJI_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jlongArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jlongArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jlongArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jlongArray arg6)
-#endif
-{
-	jlong *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJI_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIJI_3J_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJI_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIJI_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIJJ_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIJJ_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-#endif
-{
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJJ_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIJJ_3I_3I_3I_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong, jlong, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
-fail:
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJJ_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIJJ_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJIJ_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIJ_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7)
-#endif
-{
-	jint *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJ_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIJ_3I_3I_3I_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJ_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIJ_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJI_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJI_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4)
-#endif
-{
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJI_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJI_3J_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJI_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJI_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJI_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJI_3J_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4, jlongArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4, jlongArray arg5)
-#endif
-{
-	jlong *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJI_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJI_3J_3J_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJI_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJI_3J_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJI_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJIIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJIIII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJIIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJII_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJII_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6)
-#endif
-{
-	jlong *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJII_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJII_3J_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJII_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJII_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJIJ_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJIJ_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-#endif
-{
-	jchar *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJIJ_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJIJ_3C_3I_3I_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jlong, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
-fail:
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJIJ_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJIJ_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJI_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJI_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
-#endif
-{
-	jchar *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJI_3C_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJI_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJI_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
-#endif
-{
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJI_3I_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJI_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJI_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJI_3CJJIJI_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJI_3CJJIJI_3J_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
-#endif
-{
-	jchar *lparg6=NULL;
-	jlong *lparg12=NULL;
-	jlong *lparg13=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg12) if ((lparg12 = env->GetLongArrayElements(arg12, NULL)) == NULL) goto fail;
-	if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint, jchar *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
-fail:
-	if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
-	if (arg12 && lparg12) env->ReleaseLongArrayElements(arg12, lparg12, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
-#endif
-{
-	jchar *lparg6=NULL;
-	jbyte *lparg7=NULL;
-	jlong *lparg13=NULL;
-	jlong *lparg14=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
-	if (arg14) if ((lparg14 = env->GetLongArrayElements(arg14, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint, jchar *, jbyte *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
-fail:
-	if (arg14 && lparg14) env->ReleaseLongArrayElements(arg14, lparg14, 0);
-	if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
-	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJJIJ_3C_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJIJ_3C_3I_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
-#endif
-{
-	jchar *lparg8=NULL;
-	jint *lparg9=NULL;
-	jlong *lparg10=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJIJ_3C_3I_3J_FUNC);
-#endif
-	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-	if (arg10) if ((lparg10 = env->GetLongArrayElements(arg10, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jint, jlong, jchar *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
-fail:
-	if (arg10 && lparg10) env->ReleaseLongArrayElements(arg10, lparg10, 0);
-	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
-	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJIJ_3C_3I_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJJJJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7)
-#endif
-{
-	jlong *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJJ_3J_FUNC);
-#endif
-	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlongArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlongArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlongArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlongArray arg6)
-#endif
-{
-	jlong *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJ_3J_FUNC);
-#endif
-	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJ_3B_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJ_3B_3BJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7)
-#endif
-{
-	jbyte *lparg5=NULL;
-	jbyte *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3B_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJ_3B_3BJ_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jbyte *, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, arg7);
-fail:
-	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3B_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJ_3B_3BJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJ_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJ_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5)
-#endif
-{
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJ_3I_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJ_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5)
-#endif
-{
-	jlong *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJ_3J_FUNC);
-#endif
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJS) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jshort arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jshort arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jshort arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jshort arg4)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJS_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJS_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJS_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJS_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4)
-#endif
-{
-	jbyte *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3B_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3BJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5)
-#endif
-{
-	jbyte *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3BJ_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
-fail:
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3BJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3BJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3BJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6)
-#endif
-{
-	jbyte *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3BJI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3BJI_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6);
-fail:
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3BJI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3BJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3B_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5)
-#endif
-{
-	jbyte *lparg4=NULL;
-	jbyte *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3B_3B_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3B_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3CIJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3CIJI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
-#endif
-{
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3CIJI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3CIJI_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jint, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3CIJI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3CIJI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3CJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3CJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
-#endif
-{
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3CJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3CJJJ_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3CJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3CJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3C_3CI_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3C_3CI_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
-#endif
-{
-	jchar *lparg4=NULL;
-	jchar *lparg5=NULL;
-	jlong *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3C_3CI_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3C_3CI_3J_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jchar *, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
-	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3C_3CI_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3C_3CI_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4)
-#endif
-{
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3I_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5)
-#endif
-{
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3I_3I_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4)
-#endif
-{
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3J_FUNC);
-#endif
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3)
-#endif
-{
-	nsID _arg3, *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, nsID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6)
-#endif
-{
-	nsID _arg3, *lparg3=NULL;
-	jlong *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, nsID *, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4)
-#endif
-{
-	nsID _arg3, *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3B_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3BI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3BI_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3BJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3BJ_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3BJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3BJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3BJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jlong *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3BJ_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3BJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3BS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3BS) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jshort arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jshort arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jshort arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jshort arg4)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BS_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3BS_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BS_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3BS_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3B_3B_3BJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3B_3B_3BJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jbyte *lparg5=NULL;
-	jlong *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3B_3B_3BJ_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jbyte *, jbyte *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
-	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3B_3B_3BJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3B_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3B_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3B_3C_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3B_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3CI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3CI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4)
-#endif
-{
-	jchar *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3CI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3CI_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3CI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3CI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jchar *lparg6=NULL;
-	jchar *lparg7=NULL;
-	jchar *lparg8=NULL;
-	jchar *lparg9=NULL;
-	jint *lparg10=NULL;
-	jint *lparg11=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
-	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
-	if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
-fail:
-	if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
-	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
-	if (arg9 && lparg9) env->ReleaseCharArrayElements(arg9, lparg9, 0);
-	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseCharArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3CI_3J_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3CI_3J_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jlong *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint, jlong *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
-fail:
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3C_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3C_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jchar *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3C_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3C_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jchar *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3C_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3J_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jchar *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
-fail:
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
-#endif
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jlong *lparg6=NULL;
-	jchar *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint *lparg9=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *, jlong *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
-fail:
-	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
-	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseCharArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3C_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jlongArray arg4)
-#endif
-{
-	jchar *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
-#endif
-{
-	jint *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3)
-#endif
-{
-	jlong *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3J_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIJ_3S) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3S) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jshortArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jshortArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jshortArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jshortArray arg3)
-#endif
-{
-	jshort *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3S_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3S_FUNC);
-#endif
-	if (arg3) if ((lparg3 = env->GetShortArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jshort *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseShortArrayElements(arg3, lparg3, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3S_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3S_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	nsID _arg4, *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	nsID _arg4, *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	nsID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	nsID _arg3, *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
-fail:
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jbyte *lparg6=NULL;
-	jbyte *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jint, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
-fail:
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jbyte *lparg6=NULL;
-	jbyte *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jlong, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3)
-#endif
-{
-	nsID _arg2, *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IIS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJS) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIS_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJS_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIS_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJS_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IISIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJSIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jint arg3, jint arg4, jint arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJSIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJSIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jint arg3, jint arg4, jint arg5)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IISIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJSIII_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IISIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJSIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__IISJIJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJSJIJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJSJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJSJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IISJIJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJSJIJ_FUNC);
-#endif
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort, jlong, jint, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IISJIJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJSJIJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
-fail:
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BI_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BII_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BII_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BII_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BII_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BIJ_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BIJ_3J_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jlong *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BIJ_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BIJ_3J_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jlong, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
-fail:
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BIJ_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BIJ_3J_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
-#endif
-{
-	jbyte *lparg2=NULL;
-	nsID _arg4, *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BI_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BI_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BI_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BI_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BI_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BI_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BI_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BI_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BI_3J_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jlong *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BI_3J_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BI_3J_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BJ_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
-#endif
-{
-	jbyte *lparg2=NULL;
-	nsID _arg4, *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BJ_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BJ_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jintArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJ_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BJ_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJ_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BJ_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	nsID _arg3, *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	nsID _arg3, *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	nsID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	nsID _arg3, *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3BS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BS) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jshort arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jshort arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jshort arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jshort arg3)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BS_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BS_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jshort))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BS_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BS_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3BI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3BI_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3BI_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
-fail:
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3BI_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3B_3BII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B_3BII_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3BII_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_3BII_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jbyte *, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3BII_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_3BII_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3B_3BII_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B_3BII_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jlong *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3BII_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_3BII_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jbyte *, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
-	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3BII_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_3BII_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3B_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3B_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3I_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3I_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3I_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3B_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3J_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3J_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3J_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
-#endif
-{
-	jchar *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3C_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
-fail:
-	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3CIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3CIIII) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-#endif
-{
-	jchar *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CIIII_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3CIIII_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
-fail:
-	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CIIII_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3CIIII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3CIJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3CIJJJ) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
-#endif
-{
-	jchar *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CIJJJ_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3CIJJJ_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
-fail:
-	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CIJJJ_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3CIJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3CI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3CI_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4)
-#endif
-{
-	jchar *lparg2=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CI_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3CI_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CI_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3CI_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3CJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3CJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
-#endif
-{
-	jchar *lparg2=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3CJ_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CJ_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3CJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3C_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3C_3C) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
-#endif
-{
-	jchar *lparg2=NULL;
-	jchar *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3C_3C_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3C_3C_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3C_3C_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3C_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3F) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3F) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2)
-#endif
-{
-	jfloat *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3F_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3F_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jfloat *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
-fail:
-	if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3F_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3F_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
-#endif
-{
-	jint *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
-fail:
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3)
-#endif
-{
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-#endif
-{
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-#endif
-{
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3I_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3I_3I_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3I_3I_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
-#endif
-{
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3I_3I_3I_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3I_3I_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3)
-#endif
-{
-	jint *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3I_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3J_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
-#endif
-{
-	jint *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3J_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3J_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3I_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3J_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
-#endif
-{
-	jint *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3J_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3J_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2)
-#endif
-{
-	jlong *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
-fail:
-	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3J_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3)
-#endif
-{
-	jlong *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3J_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3J_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3J_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3J_3J_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
-#endif
-{
-	jlong *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3J_3J_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3J_3J_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3J_3J_3J_3J_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3J_3J_3J_3J_3J_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7)
-#endif
-{
-	jlong *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jlong *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3J_3J_3J_3J_3J_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *, jlong *, jlong *, jlong *, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5, lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3J_3J_3J_3J_3J_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3S) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3S) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2)
-#endif
-{
-	jshort *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3S_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3S_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
-fail:
-	if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3S_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3S_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3SI_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3SI_3I_3I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5)
-#endif
-{
-	jshort *lparg2=NULL;
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3SI_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3SI_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort *, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3SI_3I_3I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3SI_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1VtblCall__II_3SJ_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3SJ_3I_3J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5)
-#else
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5)
-#endif
-{
-	jshort *lparg2=NULL;
-	jint *lparg4=NULL;
-	jlong *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3SJ_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3SJ_3I_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort *, jlong, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3SJ_3I_3J_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3SJ_3I_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO__1XPCOMGlueLoadXULFunctions
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueLoadXULFunctions)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueLoadXULFunctions)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueLoadXULFunctions_FUNC);
-	rc = (jint)XPCOMGlueLoadXULFunctions((const nsDynamicFunctionLoad *)arg0);
-	XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueLoadXULFunctions_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XPCOMGlueShutdown
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueShutdown)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueShutdown)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueShutdown_FUNC);
-	rc = (jint)XPCOMGlueShutdown();
-	XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueShutdown_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XPCOMGlueStartup
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueStartup)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueStartup_FUNC);
-	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)XPCOMGlueStartup((const char *)lparg0);
-fail:
-	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueStartup_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsEmbedCString_1Length
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1Length)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1Length)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1Length_FUNC);
-	rc = (jint)((nsEmbedCString *)arg0)->Length();
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1Length_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsEmbedCString_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedCString_1delete)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedCString_1delete)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1delete_FUNC);
-	delete (nsEmbedCString *)arg0;
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1delete_FUNC);
-}
-#endif
-
-#ifndef NO__1nsEmbedCString_1get
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1get)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1get)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1get_FUNC);
-	rc = (jintLong)((nsEmbedCString *)arg0)->get();
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1get_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsEmbedCString_1new__
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new___FUNC);
-	rc = (jintLong)new nsEmbedCString();
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new___FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1nsEmbedCString_1new__II) && !defined(JNI64)) || (!defined(NO__1nsEmbedCString_1new__JI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-#else
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__JI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__JI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-#endif
-{
-	jintLong rc = 0;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new__II_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new__JI_FUNC);
-#endif
-	rc = (jintLong)new nsEmbedCString((const char *)arg0, arg1);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new__II_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new__JI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsEmbedCString_1new___3BI
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new___3BI)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new___3BI_FUNC);
-	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)new nsEmbedCString((const char *)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new___3BI_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsEmbedString_1Length
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1Length)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1Length)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1Length_FUNC);
-	rc = (jint)((nsEmbedString *)arg0)->Length();
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1Length_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsEmbedString_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedString_1delete)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedString_1delete)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1delete_FUNC);
-	delete (nsEmbedString *)arg0;
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1delete_FUNC);
-}
-#endif
-
-#ifndef NO__1nsEmbedString_1get
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1get)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1get)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1get_FUNC);
-	rc = (jintLong)((nsEmbedString *)arg0)->get();
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1get_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsEmbedString_1new__
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1new__)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1new___FUNC);
-	rc = (jintLong)new nsEmbedString();
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1new___FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsEmbedString_1new___3C
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1new___3C)
-	(JNIEnv *env, jclass that, jcharArray arg0)
-{
-	jchar *lparg0=NULL;
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1new___3C_FUNC);
-	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)new nsEmbedString((PRUnichar *)lparg0);
-fail:
-	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1new___3C_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsID_1Equals
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsID_1Equals)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsID_1Equals)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsID_1Equals_FUNC);
-	rc = (jint)((nsID *)arg0)->Equals(*(nsID *)arg1);
-	XPCOM_NATIVE_EXIT(env, that, _1nsID_1Equals_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsID_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsID_1delete)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsID_1delete)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	XPCOM_NATIVE_ENTER(env, that, _1nsID_1delete_FUNC);
-	delete (nsID *)arg0;
-	XPCOM_NATIVE_EXIT(env, that, _1nsID_1delete_FUNC);
-}
-#endif
-
-#ifndef NO__1nsID_1new
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsID_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsID_1new)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsID_1new_FUNC);
-	rc = (jintLong)new nsID();
-	XPCOM_NATIVE_EXIT(env, that, _1nsID_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsIMemory_1Alloc
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIMemory_1Alloc)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIMemory_1Alloc)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsIMemory_1Alloc_FUNC);
-	rc = (jintLong)((nsIMemory *)arg0)->Alloc((size_t)arg1);
-	XPCOM_NATIVE_EXIT(env, that, _1nsIMemory_1Alloc_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsIMemory_1Realloc
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIMemory_1Realloc)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIMemory_1Realloc)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsIMemory_1Realloc_FUNC);
-	rc = (jintLong)((nsIMemory *)arg0)->Realloc((void *)arg1, (size_t)arg2);
-	XPCOM_NATIVE_EXIT(env, that, _1nsIMemory_1Realloc_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsIScriptContext_1GetNativeContext
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptContext_1GetNativeContext)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptContext_1GetNativeContext)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsIScriptContext_1GetNativeContext_FUNC);
-	rc = (jintLong)((nsIScriptContext *)arg0)->GetNativeContext();
-	XPCOM_NATIVE_EXIT(env, that, _1nsIScriptContext_1GetNativeContext_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsIScriptGlobalObject_1EnsureScriptEnvironment
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1EnsureScriptEnvironment)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1EnsureScriptEnvironment)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC);
-	rc = (jint)((nsIScriptGlobalObject *)arg0)->EnsureScriptEnvironment(arg1);
-	XPCOM_NATIVE_EXIT(env, that, _1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1nsIScriptGlobalObject_1GetScriptContext
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptContext)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptContext)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1nsIScriptGlobalObject_1GetScriptContext_FUNC);
-	rc = (jintLong)((nsIScriptGlobalObject *)arg0)->GetScriptContext(arg1);
-	XPCOM_NATIVE_EXIT(env, that, _1nsIScriptGlobalObject_1GetScriptContext_FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#else
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#endif
-{
-	nsDynamicFunctionLoad _arg1, *lparg1=NULL;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J_FUNC);
-#endif
-	if (arg1) if ((lparg1 = getnsDynamicFunctionLoadFields(env, arg1, &_arg1)) == NULL) goto fail;
-	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
-fail:
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-#else
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-#endif
-{
-	nsID _arg1, *lparg1=NULL;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#endif
-	if (arg1) if ((lparg1 = getnsIDFields(env, arg1, &_arg1)) == NULL) goto fail;
-	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
-fail:
-	if (arg1 && lparg1) setnsIDFields(env, arg1, lparg1);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI) && defined(JNI64))
-#ifndef JNI64
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#else
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#endif
-{
-	nsID _arg0, *lparg0=NULL;
-#ifndef JNI64
-	XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
-#else
-	XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC);
-#endif
-	if (arg0) if ((lparg0 = getnsIDFields(env, arg0, &_arg0)) == NULL) goto fail;
-	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
-fail:
-	if (arg0 && lparg0) setnsIDFields(env, arg0, lparg0);
-#ifndef JNI64
-	XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
-#else
-	XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC);
-#endif
-}
-#endif
-
-#ifndef NO_nsDynamicFunctionLoad_1sizeof
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsDynamicFunctionLoad_1sizeof)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsDynamicFunctionLoad_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsDynamicFunctionLoad_1sizeof_FUNC);
-	rc = (jint)nsDynamicFunctionLoad_sizeof();
-	XPCOM_NATIVE_EXIT(env, that, nsDynamicFunctionLoad_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h
deleted file mode 100644
index b139ad3980..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2013 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
- *******************************************************************************/
-  
-#ifndef INC_xpcom_H
-#define INC_xpcom_H
-
-#define NDEBUG
-#define XPCOM_GLUE 1
-
-#include "nsXPCOM.h"
-#include "nsEmbedString.h"
-#include "nsIInputStream.h"
-#include "nsIMemory.h"
-#include "nsISupportsUtils.h"
-#include "nsXPCOMGlue.h"
-#include "xpcom_custom.h"
-
-#ifndef nsIScriptContext_h__
-#include "nsIScriptContext.h"
-#include "nsIScriptGlobalObject.h"
-#endif /* nsIScriptContext_h__ */
-
-#define XPCOM_LOAD_FUNCTION LOAD_FUNCTION
-
-#ifdef _WIN32
-#if !(defined(__i386__) || defined(_M_IX86) || defined(_X86_))
-#define nsStaticModuleInfo void /* define on 64-bit win32 due to use of XULRunner 10 SDK */
-#endif
-#define STDMETHODCALLTYPE __stdcall
-#define NO__1NS_1InitXPCOM2
-#else /* _WIN32 */
-#define STDMETHODCALLTYPE
-#ifdef __APPLE__
-#define NO__1NS_1InitXPCOM2
-#endif /* __APPLE__ */
-#endif /* _WIN32 */
-
-#define SWT_XREInitEmbedding2 nsresult (*)(nsIFile *,nsIFile *,nsIDirectoryServiceProvider *)
-#define SWT_XREInitEmbedding nsresult (*)(nsILocalFile *,nsILocalFile *,nsIDirectoryServiceProvider *,nsStaticModuleInfo const *,PRUint32)
-
-#endif /* INC_xpcom_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
deleted file mode 100644
index 24dc5840c3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2013 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
- *******************************************************************************/
-
-#include "swt.h"
-#include "xpcom_structs.h"
-#include "xpcom_stats.h"
-
-extern "C" {
-
-#define XPCOM_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOM_##func
-
-#ifndef NO_strlen_1PRUnichar
-JNIEXPORT jint JNICALL XPCOM_NATIVE(strlen_1PRUnichar)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc;
-	XPCOM_NATIVE_ENTER(env, that, strlen_1PRUnichar_FUNC);
-	{
-	const PRUnichar* lparg0 = NULL;
-	if (arg0) lparg0 = (const PRUnichar *)arg0;
-	PRUint32 len = 0;
-	if (lparg0 != NULL)	while (*lparg0++ != 0) len++;
-	rc = (jint)len;
-	}
-	XPCOM_NATIVE_EXIT(env, that, strlen_1PRUnichar_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1JS_1DefineFunction
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1JS_1DefineFunction)
-	(JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0, jintLong arg1, jbyteArray arg2, jintLong arg3, jint arg4, jint arg5)
-{
-	jbyte *lpmozillaPath=NULL;
-	jbyte *lparg2=NULL;
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1JS_1DefineFunction_FUNC);
-	if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)JS_DefineFunction(arg0, arg1, lparg2, arg3, arg4, arg5);
-*/
-	{
-	
-#ifdef _WIN32
-		static int initialized = 0;
-		static FARPROC fp = NULL;
-		if (!initialized) {
-			HMODULE hm = LoadLibrary((const char *)lpmozillaPath);
-			if (hm) {
-				fp = GetProcAddress(hm, "JS_DefineFunction");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jintLong)((jintLong (*)(jintLong, jintLong, jbyte *, jintLong, jint, jint))fp)(arg0, arg1, lparg2, arg3, arg4, arg5);
-		}
-#else
-#define CALLING_CONVENTION
-		static int initialized = 0;
-		static void *fp = NULL;
-		if (!initialized) {
-			void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY);
-			if (handle) {
-				fp = dlsym(handle, "JS_DefineFunction");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jbyte *, jintLong, jint, jint))fp)(arg0, arg1, lparg2, arg3, arg4, arg5);
-		}
-#endif /* _WIN32 */
-	}
-fail:
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1JS_1DefineFunction_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1JS_1EvaluateUCScriptForPrincipals
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScriptForPrincipals)
-	(JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0, jintLong arg1, jintLong arg2, jcharArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLongArray arg7)
-{
-	jbyte *lpmozillaPath=NULL;
-	jchar *lparg3=NULL;
-	jbyte *lparg5=NULL;
-	jintLong *lparg7=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1JS_1EvaluateUCScriptForPrincipals_FUNC);
-	if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetIntLongArrayElements(arg7, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)JS_EvaluateUCScriptForPrincipals(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
-*/
-	{
-	
-#ifdef _WIN32
-		static int initialized = 0;
-		static FARPROC fp = NULL;
-		if (!initialized) {
-			HMODULE hm = LoadLibrary((const char *)lpmozillaPath);
-			if (hm) {
-				fp = GetProcAddress(hm, "JS_EvaluateUCScriptForPrincipals");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jint)((jint (*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
-		}
-#else
-#define CALLING_CONVENTION
-		static int initialized = 0;
-		static void *fp = NULL;
-		if (!initialized) {
-			void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY);
-			if (handle) {
-				fp = dlsym(handle, "JS_EvaluateUCScriptForPrincipals");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
-		}
-#endif /* _WIN32 */
-	}
-fail:
-	if (arg7 && lparg7) env->ReleaseIntLongArrayElements(arg7, lparg7, 0);
-	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1JS_1EvaluateUCScriptForPrincipals_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1JS_1EvaluateUCScriptForPrincipals191
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScriptForPrincipals191)
-	(JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0, jintLong arg1, jintLong arg2, jcharArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLong arg7)
-{
-	jbyte *lpmozillaPath=NULL;
-	jchar *lparg3=NULL;
-	jbyte *lparg5=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1JS_1EvaluateUCScriptForPrincipals191_FUNC);
-	if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)JS_EvaluateUCScriptForPrincipals(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, arg7);
-*/
-	{
-	
-#ifdef _WIN32
-		static int initialized = 0;
-		static FARPROC fp = NULL;
-		if (!initialized) {
-			HMODULE hm = LoadLibrary((const char *)lpmozillaPath);
-			if (hm) {
-				fp = GetProcAddress(hm, "JS_EvaluateUCScriptForPrincipals");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jint)((jint (*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, arg7);
-		}
-#else
-#define CALLING_CONVENTION
-		static int initialized = 0;
-		static void *fp = NULL;
-		if (!initialized) {
-			void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY);
-			if (handle) {
-				fp = dlsym(handle, "JS_EvaluateUCScriptForPrincipals");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, arg7);
-		}
-#endif /* _WIN32 */
-	}
-fail:
-	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
-	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1JS_1EvaluateUCScriptForPrincipals191_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1JS_1GetGlobalObject
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1JS_1GetGlobalObject)
-	(JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0)
-{
-	jbyte *lpmozillaPath=NULL;
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1JS_1GetGlobalObject_FUNC);
-	if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)JS_GetGlobalObject(arg0);
-*/
-	{
-	
-#ifdef _WIN32
-		static int initialized = 0;
-		static FARPROC fp = NULL;
-		if (!initialized) {
-			HMODULE hm = LoadLibrary((const char *)lpmozillaPath);
-			if (hm) {
-				fp = GetProcAddress(hm, "JS_GetGlobalObject");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jintLong)((jintLong (*)(jintLong))fp)(arg0);
-		}
-#else
-#define CALLING_CONVENTION
-		static int initialized = 0;
-		static void *fp = NULL;
-		if (!initialized) {
-			void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY);
-			if (handle) {
-				fp = dlsym(handle, "JS_GetGlobalObject");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-#endif /* _WIN32 */
-	}
-fail:
-	if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1JS_1GetGlobalObject_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1JS_1NewObject
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1JS_1NewObject)
-	(JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-{
-	jbyte *lpmozillaPath=NULL;
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1JS_1NewObject_FUNC);
-	if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)JS_NewObject(arg0, arg1, arg2, arg3);
-*/
-	{
-	
-#ifdef _WIN32
-		static int initialized = 0;
-		static FARPROC fp = NULL;
-		if (!initialized) {
-			HMODULE hm = LoadLibrary((const char *)lpmozillaPath);
-			if (hm) {
-				fp = GetProcAddress(hm, "JS_NewObject");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3);
-		}
-#else
-#define CALLING_CONVENTION
-		static int initialized = 0;
-		static void *fp = NULL;
-		if (!initialized) {
-			void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY);
-			if (handle) {
-				fp = dlsym(handle, "JS_NewObject");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3);
-		}
-#endif /* _WIN32 */
-	}
-fail:
-	if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1JS_1NewObject_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CALLBACK_1JSNative
-extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(CALLBACK_1JSNative)(JNIEnv *env, jclass that, jintLong arg0);
-static jintLong CALLBACK_1JSNative;
-static jintLong proc_CALLBACK_1JSNative(jintLong arg0, jint arg1, jintLong arg2) {
-	return ((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))CALLBACK_1JSNative)(arg0, arg1, arg2);
-}
-static jintLong CALLBACK_JSNative(jintLong func) {
-	CALLBACK_1JSNative = func;
-	return (jintLong)proc_CALLBACK_1JSNative;
-}
-JNIEXPORT jintLong JNICALL XPCOM_NATIVE(CALLBACK_1JSNative)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, CALLBACK_1JSNative_FUNC);
-	rc = (jintLong)CALLBACK_JSNative(arg0);
-	XPCOM_NATIVE_EXIT(env, that, CALLBACK_1JSNative_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1NS_1Free
-JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1Free)
-	(JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0)
-{
-	jbyte *lpmozillaPath=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, _1NS_1Free_FUNC);
-	if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail;
-/*
-	NS_Free((void*)arg0);
-*/
-	{
-	
-#ifdef _WIN32
-		static int initialized = 0;
-		static FARPROC fp = NULL;
-		if (!initialized) {
-			HMODULE hm = LoadLibrary((const char *)lpmozillaPath);
-			if (hm) {
-				fp = GetProcAddress(hm, "NS_Free");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			((jint (*)(void *))fp)((void *)arg0);
-			rc = 1;
-		}
-#else
-#define CALLING_CONVENTION
-		static int initialized = 0;
-		static void *fp = NULL;
-		if (!initialized) {
-			void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY);
-			if (handle) {
-				fp = dlsym(handle, "NS_Free");
-			}
-			initialized = 1;
-		}
-		if (fp) {
-			((jint (CALLING_CONVENTION*)(void *))fp)((void *)arg0);
-			rc = 1;
-		}
-#endif /* _WIN32 */
-	}
-fail:
-	if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0);
-	XPCOM_NATIVE_EXIT(env, that, _1NS_1Free_FUNC);
-	return rc;
-}
-#endif
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.h
deleted file mode 100644
index 0830913be9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 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
- *******************************************************************************/
-
-#ifdef _WIN32
-#include <windows.h>
-#define XP_WIN
-#else
-#include <dlfcn.h>
-#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
deleted file mode 100755
index b9b64c0030..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
+++ /dev/null
@@ -1,1183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#include "swt.h"
-#include "xpcom_stats.h"
-
-#ifdef NATIVE_STATS
-
-char * XPCOM_nativeFunctionNames[] = {
-	"CALLBACK_1GetScriptableFlags24",
-	"CALLBACK_1JSNative",
-#ifndef JNI64
-	"_1Call__I",
-#else
-	"_1Call__J",
-#endif
-#ifndef JNI64
-	"_1Call__IIII",
-#else
-	"_1Call__JJJJ",
-#endif
-#ifndef JNI64
-	"_1Call__IIIIII",
-#else
-	"_1Call__JJJJJI",
-#endif
-#ifndef JNI64
-	"_1Call__III_3BII_3I",
-#else
-	"_1Call__JJJ_3BII_3I",
-#endif
-	"_1JS_1DefineFunction",
-	"_1JS_1DefineFunction24",
-	"_1JS_1EvaluateUCScriptForPrincipals",
-	"_1JS_1EvaluateUCScriptForPrincipals191",
-	"_1JS_1EvaluateUCScriptForPrincipals24",
-	"_1JS_1GetGlobalForScopeChain24",
-	"_1JS_1GetGlobalObject",
-	"_1JS_1NewObject",
-	"_1NS_1Free",
-	"_1NS_1GetComponentManager",
-	"_1NS_1GetServiceManager",
-	"_1NS_1InitXPCOM2",
-	"_1NS_1NewLocalFile",
-#ifndef JNI64
-	"_1VtblCall__II",
-#else
-	"_1VtblCall__IJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIB",
-#else
-	"_1VtblCall__IJB",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IID",
-#else
-	"_1VtblCall__IJD",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIF",
-#else
-	"_1VtblCall__IJF",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIFF_3I",
-#else
-	"_1VtblCall__IJFF_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIFF_3J",
-#else
-	"_1VtblCall__IJFF_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III",
-#else
-	"_1VtblCall__IJI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII",
-#else
-	"_1VtblCall__IJII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIII",
-#else
-	"_1VtblCall__IJIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIII",
-#else
-	"_1VtblCall__IJIIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIII",
-#else
-	"_1VtblCall__IJIIIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIIII",
-#else
-	"_1VtblCall__IJIIIIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIIIIIIII",
-#else
-	"_1VtblCall__IJIIIIIIIIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIIIIIIIIIIISI",
-#else
-	"_1VtblCall__IJIIIIIIIIIIIIISI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIIIIIIIIIIISIFS",
-#else
-	"_1VtblCall__IJIIIIIIIIIIIIISIFS",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIIIII_3I",
-#else
-	"_1VtblCall__IJIIIIIII_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIIII_3C_3I_3I",
-#else
-	"_1VtblCall__IJIIIIII_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIII_3I",
-#else
-	"_1VtblCall__IJIIIII_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIIIJII",
-#else
-	"_1VtblCall__IJIIIIJII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIII_3CIIIII_3I_3I",
-#else
-	"_1VtblCall__IJIIII_3CIIIII_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIII_3C_3BIIIII_3I_3I",
-#else
-	"_1VtblCall__IJIIII_3C_3BIIIII_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIII_3C_3I_3I",
-#else
-	"_1VtblCall__IJIIII_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIII_3I",
-#else
-	"_1VtblCall__IJIIII_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIII_3I_3I",
-#else
-	"_1VtblCall__IJIIII_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIII_3I_3I_3I",
-#else
-	"_1VtblCall__IJIIII_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIII_3B_3BI",
-#else
-	"_1VtblCall__IJIII_3B_3BI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIII_3C",
-#else
-	"_1VtblCall__IJIII_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIII_3I",
-#else
-	"_1VtblCall__IJIII_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIII_3I_3I_3I",
-#else
-	"_1VtblCall__IJIII_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIJJJJ",
-#else
-	"_1VtblCall__IJIIJJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIIS",
-#else
-	"_1VtblCall__IJIIS",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3B",
-#else
-	"_1VtblCall__IJII_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3BI",
-#else
-	"_1VtblCall__IJII_3BI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3BII",
-#else
-	"_1VtblCall__IJII_3BII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3B_3B",
-#else
-	"_1VtblCall__IJII_3B_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3C",
-#else
-	"_1VtblCall__IJII_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3CIJI",
-#else
-	"_1VtblCall__IJII_3CIJI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3CJJJ",
-#else
-	"_1VtblCall__IJII_3CJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3C_3CI_3I",
-#else
-	"_1VtblCall__IJII_3C_3CI_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3I",
-#else
-	"_1VtblCall__IJII_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3I_3I",
-#else
-	"_1VtblCall__IJII_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIII_3J",
-#else
-	"_1VtblCall__IJII_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIJ",
-#else
-	"_1VtblCall__IJIJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIJJ",
-#else
-	"_1VtblCall__IJIJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIIJJJJJJ_3J",
-#else
-	"_1VtblCall__IJIJJJJJJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2",
-#else
-	"_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I",
-#else
-	"_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#else
-	"_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3B",
-#else
-	"_1VtblCall__IJI_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3BI",
-#else
-	"_1VtblCall__IJI_3BI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3BI_3I",
-#else
-	"_1VtblCall__IJI_3BI_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3BS",
-#else
-	"_1VtblCall__IJI_3BS",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3B_3B_3BI_3I",
-#else
-	"_1VtblCall__IJI_3B_3B_3BI_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3B_3C",
-#else
-	"_1VtblCall__IJI_3B_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3B_3I",
-#else
-	"_1VtblCall__IJI_3B_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C",
-#else
-	"_1VtblCall__IJI_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3CI",
-#else
-	"_1VtblCall__IJI_3CI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3C",
-#else
-	"_1VtblCall__IJI_3C_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I",
-#else
-	"_1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3CI_3I_3I_3I",
-#else
-	"_1VtblCall__IJI_3C_3CI_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3C_3C_3I",
-#else
-	"_1VtblCall__IJI_3C_3C_3C_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3C_3C_3I_3I",
-#else
-	"_1VtblCall__IJI_3C_3C_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3C_3I",
-#else
-	"_1VtblCall__IJI_3C_3C_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3C_3I_3C_3I_3I",
-#else
-	"_1VtblCall__IJI_3C_3C_3I_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I",
-#else
-	"_1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3C_3I",
-#else
-	"_1VtblCall__IJI_3C_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3I",
-#else
-	"_1VtblCall__IJI_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3II",
-#else
-	"_1VtblCall__IJI_3II",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3IJ",
-#else
-	"_1VtblCall__IJI_3IJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3I_3I_3I",
-#else
-	"_1VtblCall__IJI_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3I_3I_3I_3I",
-#else
-	"_1VtblCall__IJI_3I_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3I_3I_3J",
-#else
-	"_1VtblCall__IJI_3I_3I_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3J",
-#else
-	"_1VtblCall__IJI_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__III_3S",
-#else
-	"_1VtblCall__IJI_3S",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ",
-#else
-	"_1VtblCall__IJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJI",
-#else
-	"_1VtblCall__IJJI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJII",
-#else
-	"_1VtblCall__IJJII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIIIIII_3I",
-#else
-	"_1VtblCall__IJJIIIIII_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIIJI",
-#else
-	"_1VtblCall__IJJIIJI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIIJIIIIII",
-#else
-	"_1VtblCall__IJJIIJIIIIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIIJIIIIIIIIISJ",
-#else
-	"_1VtblCall__IJJIIJIIIIIIIIISJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIIJIIIIIIIIISJFS",
-#else
-	"_1VtblCall__IJJIIJIIIIIIIIISJFS",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIIJ_3I_3J",
-#else
-	"_1VtblCall__IJJIIJ_3I_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJII_3I",
-#else
-	"_1VtblCall__IJJII_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIJII",
-#else
-	"_1VtblCall__IJJIJII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIJI_3J",
-#else
-	"_1VtblCall__IJJIJI_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIJJ_3I_3I_3I",
-#else
-	"_1VtblCall__IJJIJJ_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJIJ_3I_3I_3I",
-#else
-	"_1VtblCall__IJJIJ_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJI_3J",
-#else
-	"_1VtblCall__IJJI_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJI_3J_3J",
-#else
-	"_1VtblCall__IJJI_3J_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ",
-#else
-	"_1VtblCall__IJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJI",
-#else
-	"_1VtblCall__IJJJI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJII",
-#else
-	"_1VtblCall__IJJJII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJIIII",
-#else
-	"_1VtblCall__IJJJIIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJII_3J",
-#else
-	"_1VtblCall__IJJJII_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJIJ_3C_3I_3I",
-#else
-	"_1VtblCall__IJJJIJ_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJI_3C",
-#else
-	"_1VtblCall__IJJJI_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJI_3I",
-#else
-	"_1VtblCall__IJJJI_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJ",
-#else
-	"_1VtblCall__IJJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJI",
-#else
-	"_1VtblCall__IJJJJI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJI_3CJJIJI_3J_3J",
-#else
-	"_1VtblCall__IJJJJI_3CJJIJI_3J_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J",
-#else
-	"_1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJJ",
-#else
-	"_1VtblCall__IJJJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJJIJ_3C_3I_3J",
-#else
-	"_1VtblCall__IJJJJJIJ_3C_3I_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJJJ",
-#else
-	"_1VtblCall__IJJJJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJJJJ",
-#else
-	"_1VtblCall__IJJJJJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJJJJJ",
-#else
-	"_1VtblCall__IJJJJJJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJJJ_3J",
-#else
-	"_1VtblCall__IJJJJJJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJJ_3J",
-#else
-	"_1VtblCall__IJJJJJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJ_3B_3BJ",
-#else
-	"_1VtblCall__IJJJJ_3B_3BJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJ_3I",
-#else
-	"_1VtblCall__IJJJJ_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJJ_3J",
-#else
-	"_1VtblCall__IJJJJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJS",
-#else
-	"_1VtblCall__IJJJS",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3B",
-#else
-	"_1VtblCall__IJJJ_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3BJ",
-#else
-	"_1VtblCall__IJJJ_3BJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3BJI",
-#else
-	"_1VtblCall__IJJJ_3BJI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3B_3B",
-#else
-	"_1VtblCall__IJJJ_3B_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3CIJI",
-#else
-	"_1VtblCall__IJJJ_3CIJI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3CJJJ",
-#else
-	"_1VtblCall__IJJJ_3CJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3C_3CI_3J",
-#else
-	"_1VtblCall__IJJJ_3C_3CI_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3I",
-#else
-	"_1VtblCall__IJJJ_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3I_3I",
-#else
-	"_1VtblCall__IJJJ_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJJ_3J",
-#else
-	"_1VtblCall__IJJJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2",
-#else
-	"_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J",
-#else
-	"_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#else
-	"_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3B",
-#else
-	"_1VtblCall__IJJ_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3BI",
-#else
-	"_1VtblCall__IJJ_3BI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3BJ",
-#else
-	"_1VtblCall__IJJ_3BJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3BJ_3J",
-#else
-	"_1VtblCall__IJJ_3BJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3BS",
-#else
-	"_1VtblCall__IJJ_3BS",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3B_3B_3BJ_3J",
-#else
-	"_1VtblCall__IJJ_3B_3B_3BJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3B_3C",
-#else
-	"_1VtblCall__IJJ_3B_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3CI",
-#else
-	"_1VtblCall__IJJ_3CI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3C",
-#else
-	"_1VtblCall__IJJ_3C_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I",
-#else
-	"_1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3CI_3J_3I_3I",
-#else
-	"_1VtblCall__IJJ_3C_3CI_3J_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3C_3C_3I",
-#else
-	"_1VtblCall__IJJ_3C_3C_3C_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3C_3C_3I_3I",
-#else
-	"_1VtblCall__IJJ_3C_3C_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3C_3I",
-#else
-	"_1VtblCall__IJJ_3C_3C_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3C_3J",
-#else
-	"_1VtblCall__IJJ_3C_3C_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I",
-#else
-	"_1VtblCall__IJJ_3C_3C_3J_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I",
-#else
-	"_1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3C_3J",
-#else
-	"_1VtblCall__IJJ_3C_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3I",
-#else
-	"_1VtblCall__IJJ_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3J",
-#else
-	"_1VtblCall__IJJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIJ_3S",
-#else
-	"_1VtblCall__IJJ_3S",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#else
-	"_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IIS",
-#else
-	"_1VtblCall__IJS",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IISIII",
-#else
-	"_1VtblCall__IJSIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__IISJIJ",
-#else
-	"_1VtblCall__IJSJIJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B",
-#else
-	"_1VtblCall__IJ_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BI",
-#else
-	"_1VtblCall__IJ_3BI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BII_3I_3I",
-#else
-	"_1VtblCall__IJ_3BII_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BIJ_3J_3I",
-#else
-	"_1VtblCall__IJ_3BIJ_3J_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#else
-	"_1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BI_3I",
-#else
-	"_1VtblCall__IJ_3BI_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BI_3I_3I",
-#else
-	"_1VtblCall__IJ_3BI_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BI_3J_3I",
-#else
-	"_1VtblCall__IJ_3BI_3J_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BJ",
-#else
-	"_1VtblCall__IJ_3BJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#else
-	"_1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BJ_3I",
-#else
-	"_1VtblCall__IJ_3BJ_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
-#else
-	"_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
-#else
-	"_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#else
-	"_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#else
-	"_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3BS",
-#else
-	"_1VtblCall__IJ_3BS",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3B",
-#else
-	"_1VtblCall__IJ_3B_3B",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3BI",
-#else
-	"_1VtblCall__IJ_3B_3BI",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3B_3BII_3I",
-#else
-	"_1VtblCall__IJ_3B_3B_3BII_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3B_3BII_3J",
-#else
-	"_1VtblCall__IJ_3B_3B_3BII_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3B_3I",
-#else
-	"_1VtblCall__IJ_3B_3B_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3B_3J",
-#else
-	"_1VtblCall__IJ_3B_3B_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3I",
-#else
-	"_1VtblCall__IJ_3B_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3I_3I",
-#else
-	"_1VtblCall__IJ_3B_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3I_3J",
-#else
-	"_1VtblCall__IJ_3B_3I_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3J",
-#else
-	"_1VtblCall__IJ_3B_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3B_3J_3I",
-#else
-	"_1VtblCall__IJ_3B_3J_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3C",
-#else
-	"_1VtblCall__IJ_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3CIIII",
-#else
-	"_1VtblCall__IJ_3CIIII",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3CIJJJ",
-#else
-	"_1VtblCall__IJ_3CIJJJ",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3CI_3I",
-#else
-	"_1VtblCall__IJ_3CI_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3CJ_3J",
-#else
-	"_1VtblCall__IJ_3CJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3C_3C",
-#else
-	"_1VtblCall__IJ_3C_3C",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3F",
-#else
-	"_1VtblCall__IJ_3F",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3I",
-#else
-	"_1VtblCall__IJ_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3I_3I",
-#else
-	"_1VtblCall__IJ_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3I_3I_3I",
-#else
-	"_1VtblCall__IJ_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3I_3I_3I_3I",
-#else
-	"_1VtblCall__IJ_3I_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3I_3I_3I_3I_3I_3I",
-#else
-	"_1VtblCall__IJ_3I_3I_3I_3I_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3I_3J",
-#else
-	"_1VtblCall__IJ_3I_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3I_3J_3I",
-#else
-	"_1VtblCall__IJ_3I_3J_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3I_3J_3J",
-#else
-	"_1VtblCall__IJ_3I_3J_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3J",
-#else
-	"_1VtblCall__IJ_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3J_3J",
-#else
-	"_1VtblCall__IJ_3J_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3J_3J_3J",
-#else
-	"_1VtblCall__IJ_3J_3J_3J",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3J_3J_3J_3J_3J_3I",
-#else
-	"_1VtblCall__IJ_3J_3J_3J_3J_3J_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3S",
-#else
-	"_1VtblCall__IJ_3S",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3SI_3I_3I",
-#else
-	"_1VtblCall__IJ_3SI_3I_3I",
-#endif
-#ifndef JNI64
-	"_1VtblCall__II_3SJ_3I_3J",
-#else
-	"_1VtblCall__IJ_3SJ_3I_3J",
-#endif
-	"_1XPCOMGlueLoadXULFunctions",
-	"_1XPCOMGlueShutdown",
-	"_1XPCOMGlueStartup",
-	"_1nsEmbedCString_1Length",
-	"_1nsEmbedCString_1delete",
-	"_1nsEmbedCString_1get",
-	"_1nsEmbedCString_1new__",
-#ifndef JNI64
-	"_1nsEmbedCString_1new__II",
-#else
-	"_1nsEmbedCString_1new__JI",
-#endif
-	"_1nsEmbedCString_1new___3BI",
-	"_1nsEmbedString_1Length",
-	"_1nsEmbedString_1delete",
-	"_1nsEmbedString_1get",
-	"_1nsEmbedString_1new__",
-	"_1nsEmbedString_1new___3C",
-	"_1nsID_1Equals",
-	"_1nsID_1delete",
-	"_1nsID_1new",
-	"_1nsIMemory_1Alloc",
-	"_1nsIMemory_1Realloc",
-	"_1nsIScriptContext24_1GetNativeContext",
-	"_1nsIScriptContext_1GetNativeContext",
-	"_1nsIScriptGlobalObject24_1EnsureScriptEnvironment",
-	"_1nsIScriptGlobalObject24_1GetGlobalJSObject",
-	"_1nsIScriptGlobalObject24_1GetScriptContext",
-	"_1nsIScriptGlobalObject_1EnsureScriptEnvironment",
-	"_1nsIScriptGlobalObject_1GetScriptContext",
-#ifndef JNI64
-	"memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I",
-#else
-	"memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J",
-#endif
-#ifndef JNI64
-	"memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I",
-#else
-	"memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I",
-#endif
-#ifndef JNI64
-	"memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II",
-#else
-	"memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI",
-#endif
-	"nsDynamicFunctionLoad_1sizeof",
-	"strlen_1PRUnichar",
-};
-#define NATIVE_FUNCTION_COUNT sizeof(XPCOM_nativeFunctionNames) / sizeof(char*)
-int XPCOM_nativeFunctionCount = NATIVE_FUNCTION_COUNT;
-int XPCOM_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT];
-
-#define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
-
-JNIEXPORT jint JNICALL STATS_NATIVE(XPCOM_1GetFunctionCount)
-	(JNIEnv *env, jclass that)
-{
-	return XPCOM_nativeFunctionCount;
-}
-
-JNIEXPORT jstring JNICALL STATS_NATIVE(XPCOM_1GetFunctionName)
-	(JNIEnv *env, jclass that, jint index)
-{
-	return env->NewStringUTF(XPCOM_nativeFunctionNames[index]);
-}
-
-JNIEXPORT jint JNICALL STATS_NATIVE(XPCOM_1GetFunctionCallCount)
-	(JNIEnv *env, jclass that, jint index)
-{
-	return XPCOM_nativeFunctionCallCount[index];
-}
-
-#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
deleted file mode 100755
index 3fc86e86c4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
+++ /dev/null
@@ -1,1168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#ifdef NATIVE_STATS
-extern int XPCOM_nativeFunctionCount;
-extern int XPCOM_nativeFunctionCallCount[];
-extern char* XPCOM_nativeFunctionNames[];
-#define XPCOM_NATIVE_ENTER(env, that, func) XPCOM_nativeFunctionCallCount[func]++;
-#define XPCOM_NATIVE_EXIT(env, that, func) 
-#else
-#ifndef XPCOM_NATIVE_ENTER
-#define XPCOM_NATIVE_ENTER(env, that, func) 
-#endif
-#ifndef XPCOM_NATIVE_EXIT
-#define XPCOM_NATIVE_EXIT(env, that, func) 
-#endif
-#endif
-
-typedef enum {
-	CALLBACK_1GetScriptableFlags24_FUNC,
-	CALLBACK_1JSNative_FUNC,
-#ifndef JNI64
-	_1Call__I_FUNC,
-#else
-	_1Call__J_FUNC,
-#endif
-#ifndef JNI64
-	_1Call__IIII_FUNC,
-#else
-	_1Call__JJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1Call__IIIIII_FUNC,
-#else
-	_1Call__JJJJJI_FUNC,
-#endif
-#ifndef JNI64
-	_1Call__III_3BII_3I_FUNC,
-#else
-	_1Call__JJJ_3BII_3I_FUNC,
-#endif
-	_1JS_1DefineFunction_FUNC,
-	_1JS_1DefineFunction24_FUNC,
-	_1JS_1EvaluateUCScriptForPrincipals_FUNC,
-	_1JS_1EvaluateUCScriptForPrincipals191_FUNC,
-	_1JS_1EvaluateUCScriptForPrincipals24_FUNC,
-	_1JS_1GetGlobalForScopeChain24_FUNC,
-	_1JS_1GetGlobalObject_FUNC,
-	_1JS_1NewObject_FUNC,
-	_1NS_1Free_FUNC,
-	_1NS_1GetComponentManager_FUNC,
-	_1NS_1GetServiceManager_FUNC,
-	_1NS_1InitXPCOM2_FUNC,
-	_1NS_1NewLocalFile_FUNC,
-#ifndef JNI64
-	_1VtblCall__II_FUNC,
-#else
-	_1VtblCall__IJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIB_FUNC,
-#else
-	_1VtblCall__IJB_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IID_FUNC,
-#else
-	_1VtblCall__IJD_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIF_FUNC,
-#else
-	_1VtblCall__IJF_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIFF_3I_FUNC,
-#else
-	_1VtblCall__IJFF_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIFF_3J_FUNC,
-#else
-	_1VtblCall__IJFF_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_FUNC,
-#else
-	_1VtblCall__IJI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_FUNC,
-#else
-	_1VtblCall__IJII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIII_FUNC,
-#else
-	_1VtblCall__IJIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIII_FUNC,
-#else
-	_1VtblCall__IJIIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIII_FUNC,
-#else
-	_1VtblCall__IJIIIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIIII_FUNC,
-#else
-	_1VtblCall__IJIIIIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIIIIIIII_FUNC,
-#else
-	_1VtblCall__IJIIIIIIIIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIIIIIIIIIIISI_FUNC,
-#else
-	_1VtblCall__IJIIIIIIIIIIIIISI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIIIIIIIIIIISIFS_FUNC,
-#else
-	_1VtblCall__IJIIIIIIIIIIIIISIFS_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIIIII_3I_FUNC,
-#else
-	_1VtblCall__IJIIIIIII_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIIII_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJIIIIII_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIII_3I_FUNC,
-#else
-	_1VtblCall__IJIIIII_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIIIJII_FUNC,
-#else
-	_1VtblCall__IJIIIIJII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC,
-#else
-	_1VtblCall__IJIIII_3CIIIII_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC,
-#else
-	_1VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIII_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJIIII_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIII_3I_FUNC,
-#else
-	_1VtblCall__IJIIII_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIII_3I_3I_FUNC,
-#else
-	_1VtblCall__IJIIII_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIII_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJIIII_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIII_3B_3BI_FUNC,
-#else
-	_1VtblCall__IJIII_3B_3BI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIII_3C_FUNC,
-#else
-	_1VtblCall__IJIII_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIII_3I_FUNC,
-#else
-	_1VtblCall__IJIII_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIII_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJIII_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIJJJJ_FUNC,
-#else
-	_1VtblCall__IJIIJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIIS_FUNC,
-#else
-	_1VtblCall__IJIIS_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3B_FUNC,
-#else
-	_1VtblCall__IJII_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3BI_FUNC,
-#else
-	_1VtblCall__IJII_3BI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3BII_FUNC,
-#else
-	_1VtblCall__IJII_3BII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3B_3B_FUNC,
-#else
-	_1VtblCall__IJII_3B_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3C_FUNC,
-#else
-	_1VtblCall__IJII_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3CIJI_FUNC,
-#else
-	_1VtblCall__IJII_3CIJI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3CJJJ_FUNC,
-#else
-	_1VtblCall__IJII_3CJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3C_3CI_3I_FUNC,
-#else
-	_1VtblCall__IJII_3C_3CI_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3I_FUNC,
-#else
-	_1VtblCall__IJII_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3I_3I_FUNC,
-#else
-	_1VtblCall__IJII_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIII_3J_FUNC,
-#else
-	_1VtblCall__IJII_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIJ_FUNC,
-#else
-	_1VtblCall__IJIJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIJJ_FUNC,
-#else
-	_1VtblCall__IJIJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIIJJJJJJ_3J_FUNC,
-#else
-	_1VtblCall__IJIJJJJJJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-#else
-	_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC,
-#else
-	_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#else
-	_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3B_FUNC,
-#else
-	_1VtblCall__IJI_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3BI_FUNC,
-#else
-	_1VtblCall__IJI_3BI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3BI_3I_FUNC,
-#else
-	_1VtblCall__IJI_3BI_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3BS_FUNC,
-#else
-	_1VtblCall__IJI_3BS_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3B_3B_3BI_3I_FUNC,
-#else
-	_1VtblCall__IJI_3B_3B_3BI_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3B_3C_FUNC,
-#else
-	_1VtblCall__IJI_3B_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3B_3I_FUNC,
-#else
-	_1VtblCall__IJI_3B_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_FUNC,
-#else
-	_1VtblCall__IJI_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3CI_FUNC,
-#else
-	_1VtblCall__IJI_3CI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3C_FUNC,
-#else
-	_1VtblCall__IJI_3C_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3CI_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3C_3C_3I_FUNC,
-#else
-	_1VtblCall__IJI_3C_3C_3C_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3C_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJI_3C_3C_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3C_3I_FUNC,
-#else
-	_1VtblCall__IJI_3C_3C_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3C_3I_FUNC,
-#else
-	_1VtblCall__IJI_3C_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3I_FUNC,
-#else
-	_1VtblCall__IJI_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3II_FUNC,
-#else
-	_1VtblCall__IJI_3II_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3IJ_FUNC,
-#else
-	_1VtblCall__IJI_3IJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJI_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3I_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJI_3I_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3I_3I_3J_FUNC,
-#else
-	_1VtblCall__IJI_3I_3I_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3J_FUNC,
-#else
-	_1VtblCall__IJI_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__III_3S_FUNC,
-#else
-	_1VtblCall__IJI_3S_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_FUNC,
-#else
-	_1VtblCall__IJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJI_FUNC,
-#else
-	_1VtblCall__IJJI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJII_FUNC,
-#else
-	_1VtblCall__IJJII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIIIIII_3I_FUNC,
-#else
-	_1VtblCall__IJJIIIIII_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIIJI_FUNC,
-#else
-	_1VtblCall__IJJIIJI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIIJIIIIII_FUNC,
-#else
-	_1VtblCall__IJJIIJIIIIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIIJIIIIIIIIISJ_FUNC,
-#else
-	_1VtblCall__IJJIIJIIIIIIIIISJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIIJIIIIIIIIISJFS_FUNC,
-#else
-	_1VtblCall__IJJIIJIIIIIIIIISJFS_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIIJ_3I_3J_FUNC,
-#else
-	_1VtblCall__IJJIIJ_3I_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJII_3I_FUNC,
-#else
-	_1VtblCall__IJJII_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIJII_FUNC,
-#else
-	_1VtblCall__IJJIJII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIJI_3J_FUNC,
-#else
-	_1VtblCall__IJJIJI_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIJJ_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJIJJ_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJIJ_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJIJ_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJI_3J_FUNC,
-#else
-	_1VtblCall__IJJI_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJI_3J_3J_FUNC,
-#else
-	_1VtblCall__IJJI_3J_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_FUNC,
-#else
-	_1VtblCall__IJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJI_FUNC,
-#else
-	_1VtblCall__IJJJI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJII_FUNC,
-#else
-	_1VtblCall__IJJJII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJIIII_FUNC,
-#else
-	_1VtblCall__IJJJIIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJII_3J_FUNC,
-#else
-	_1VtblCall__IJJJII_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJIJ_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJJIJ_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJI_3C_FUNC,
-#else
-	_1VtblCall__IJJJI_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJI_3I_FUNC,
-#else
-	_1VtblCall__IJJJI_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJ_FUNC,
-#else
-	_1VtblCall__IJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJI_FUNC,
-#else
-	_1VtblCall__IJJJJI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC,
-#else
-	_1VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC,
-#else
-	_1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJJ_FUNC,
-#else
-	_1VtblCall__IJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC,
-#else
-	_1VtblCall__IJJJJJIJ_3C_3I_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJJJ_FUNC,
-#else
-	_1VtblCall__IJJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJJJJ_FUNC,
-#else
-	_1VtblCall__IJJJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJJJJJ_FUNC,
-#else
-	_1VtblCall__IJJJJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJJJ_3J_FUNC,
-#else
-	_1VtblCall__IJJJJJJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJJ_3J_FUNC,
-#else
-	_1VtblCall__IJJJJJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJ_3B_3BJ_FUNC,
-#else
-	_1VtblCall__IJJJJ_3B_3BJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJ_3I_FUNC,
-#else
-	_1VtblCall__IJJJJ_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJJ_3J_FUNC,
-#else
-	_1VtblCall__IJJJJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJS_FUNC,
-#else
-	_1VtblCall__IJJJS_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3B_FUNC,
-#else
-	_1VtblCall__IJJJ_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3BJ_FUNC,
-#else
-	_1VtblCall__IJJJ_3BJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3BJI_FUNC,
-#else
-	_1VtblCall__IJJJ_3BJI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3B_3B_FUNC,
-#else
-	_1VtblCall__IJJJ_3B_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3CIJI_FUNC,
-#else
-	_1VtblCall__IJJJ_3CIJI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3CJJJ_FUNC,
-#else
-	_1VtblCall__IJJJ_3CJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3C_3CI_3J_FUNC,
-#else
-	_1VtblCall__IJJJ_3C_3CI_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3I_FUNC,
-#else
-	_1VtblCall__IJJJ_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJJ_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJJ_3J_FUNC,
-#else
-	_1VtblCall__IJJJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-#else
-	_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC,
-#else
-	_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#else
-	_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3B_FUNC,
-#else
-	_1VtblCall__IJJ_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3BI_FUNC,
-#else
-	_1VtblCall__IJJ_3BI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3BJ_FUNC,
-#else
-	_1VtblCall__IJJ_3BJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3BJ_3J_FUNC,
-#else
-	_1VtblCall__IJJ_3BJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3BS_FUNC,
-#else
-	_1VtblCall__IJJ_3BS_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC,
-#else
-	_1VtblCall__IJJ_3B_3B_3BJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3B_3C_FUNC,
-#else
-	_1VtblCall__IJJ_3B_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3CI_FUNC,
-#else
-	_1VtblCall__IJJ_3CI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3C_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3C_3C_3I_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3C_3C_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3C_3I_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3C_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3C_3J_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3C_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3C_3J_FUNC,
-#else
-	_1VtblCall__IJJ_3C_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3I_FUNC,
-#else
-	_1VtblCall__IJJ_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3J_FUNC,
-#else
-	_1VtblCall__IJJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIJ_3S_FUNC,
-#else
-	_1VtblCall__IJJ_3S_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#else
-	_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IIS_FUNC,
-#else
-	_1VtblCall__IJS_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IISIII_FUNC,
-#else
-	_1VtblCall__IJSIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__IISJIJ_FUNC,
-#else
-	_1VtblCall__IJSJIJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_FUNC,
-#else
-	_1VtblCall__IJ_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BI_FUNC,
-#else
-	_1VtblCall__IJ_3BI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BII_3I_3I_FUNC,
-#else
-	_1VtblCall__IJ_3BII_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BIJ_3J_3I_FUNC,
-#else
-	_1VtblCall__IJ_3BIJ_3J_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#else
-	_1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BI_3I_FUNC,
-#else
-	_1VtblCall__IJ_3BI_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BI_3I_3I_FUNC,
-#else
-	_1VtblCall__IJ_3BI_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BI_3J_3I_FUNC,
-#else
-	_1VtblCall__IJ_3BI_3J_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BJ_FUNC,
-#else
-	_1VtblCall__IJ_3BJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#else
-	_1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BJ_3I_FUNC,
-#else
-	_1VtblCall__IJ_3BJ_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-#else
-	_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-#else
-	_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#else
-	_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#else
-	_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3BS_FUNC,
-#else
-	_1VtblCall__IJ_3BS_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3B_FUNC,
-#else
-	_1VtblCall__IJ_3B_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3BI_FUNC,
-#else
-	_1VtblCall__IJ_3B_3BI_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3B_3BII_3I_FUNC,
-#else
-	_1VtblCall__IJ_3B_3B_3BII_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3B_3BII_3J_FUNC,
-#else
-	_1VtblCall__IJ_3B_3B_3BII_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3B_3I_FUNC,
-#else
-	_1VtblCall__IJ_3B_3B_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3B_3J_FUNC,
-#else
-	_1VtblCall__IJ_3B_3B_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3I_FUNC,
-#else
-	_1VtblCall__IJ_3B_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3I_3I_FUNC,
-#else
-	_1VtblCall__IJ_3B_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3I_3J_FUNC,
-#else
-	_1VtblCall__IJ_3B_3I_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3J_FUNC,
-#else
-	_1VtblCall__IJ_3B_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3B_3J_3I_FUNC,
-#else
-	_1VtblCall__IJ_3B_3J_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3C_FUNC,
-#else
-	_1VtblCall__IJ_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3CIIII_FUNC,
-#else
-	_1VtblCall__IJ_3CIIII_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3CIJJJ_FUNC,
-#else
-	_1VtblCall__IJ_3CIJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3CI_3I_FUNC,
-#else
-	_1VtblCall__IJ_3CI_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3CJ_3J_FUNC,
-#else
-	_1VtblCall__IJ_3CJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3C_3C_FUNC,
-#else
-	_1VtblCall__IJ_3C_3C_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3F_FUNC,
-#else
-	_1VtblCall__IJ_3F_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3I_FUNC,
-#else
-	_1VtblCall__IJ_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3I_3I_FUNC,
-#else
-	_1VtblCall__IJ_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJ_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3I_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJ_3I_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC,
-#else
-	_1VtblCall__IJ_3I_3I_3I_3I_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3I_3J_FUNC,
-#else
-	_1VtblCall__IJ_3I_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3I_3J_3I_FUNC,
-#else
-	_1VtblCall__IJ_3I_3J_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3I_3J_3J_FUNC,
-#else
-	_1VtblCall__IJ_3I_3J_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3J_FUNC,
-#else
-	_1VtblCall__IJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3J_3J_FUNC,
-#else
-	_1VtblCall__IJ_3J_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3J_3J_3J_FUNC,
-#else
-	_1VtblCall__IJ_3J_3J_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC,
-#else
-	_1VtblCall__IJ_3J_3J_3J_3J_3J_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3S_FUNC,
-#else
-	_1VtblCall__IJ_3S_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3SI_3I_3I_FUNC,
-#else
-	_1VtblCall__IJ_3SI_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	_1VtblCall__II_3SJ_3I_3J_FUNC,
-#else
-	_1VtblCall__IJ_3SJ_3I_3J_FUNC,
-#endif
-	_1XPCOMGlueLoadXULFunctions_FUNC,
-	_1XPCOMGlueShutdown_FUNC,
-	_1XPCOMGlueStartup_FUNC,
-	_1nsEmbedCString_1Length_FUNC,
-	_1nsEmbedCString_1delete_FUNC,
-	_1nsEmbedCString_1get_FUNC,
-	_1nsEmbedCString_1new___FUNC,
-#ifndef JNI64
-	_1nsEmbedCString_1new__II_FUNC,
-#else
-	_1nsEmbedCString_1new__JI_FUNC,
-#endif
-	_1nsEmbedCString_1new___3BI_FUNC,
-	_1nsEmbedString_1Length_FUNC,
-	_1nsEmbedString_1delete_FUNC,
-	_1nsEmbedString_1get_FUNC,
-	_1nsEmbedString_1new___FUNC,
-	_1nsEmbedString_1new___3C_FUNC,
-	_1nsID_1Equals_FUNC,
-	_1nsID_1delete_FUNC,
-	_1nsID_1new_FUNC,
-	_1nsIMemory_1Alloc_FUNC,
-	_1nsIMemory_1Realloc_FUNC,
-	_1nsIScriptContext24_1GetNativeContext_FUNC,
-	_1nsIScriptContext_1GetNativeContext_FUNC,
-	_1nsIScriptGlobalObject24_1EnsureScriptEnvironment_FUNC,
-	_1nsIScriptGlobalObject24_1GetGlobalJSObject_FUNC,
-	_1nsIScriptGlobalObject24_1GetScriptContext_FUNC,
-	_1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC,
-	_1nsIScriptGlobalObject_1GetScriptContext_FUNC,
-#ifndef JNI64
-	memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC,
-#else
-	memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J_FUNC,
-#endif
-#ifndef JNI64
-	memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-#else
-	memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-#endif
-#ifndef JNI64
-	memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC,
-#else
-	memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC,
-#endif
-	nsDynamicFunctionLoad_1sizeof_FUNC,
-	strlen_1PRUnichar_FUNC,
-} XPCOM_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.cpp
deleted file mode 100644
index 6f848f88a7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#include "swt.h"
-#include "xpcom_structs.h"
-
-#ifndef NO_nsDynamicFunctionLoad
-typedef struct nsDynamicFunctionLoad_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID functionName, function;
-} nsDynamicFunctionLoad_FID_CACHE;
-
-nsDynamicFunctionLoad_FID_CACHE nsDynamicFunctionLoadFc;
-
-void cachensDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject)
-{
-	if (nsDynamicFunctionLoadFc.cached) return;
-	nsDynamicFunctionLoadFc.clazz = env->GetObjectClass(lpObject);
-	nsDynamicFunctionLoadFc.functionName = env->GetFieldID(nsDynamicFunctionLoadFc.clazz, "functionName", I_J);
-	nsDynamicFunctionLoadFc.function = env->GetFieldID(nsDynamicFunctionLoadFc.clazz, "function", I_J);
-	nsDynamicFunctionLoadFc.cached = 1;
-}
-
-nsDynamicFunctionLoad *getnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct)
-{
-	if (!nsDynamicFunctionLoadFc.cached) cachensDynamicFunctionLoadFields(env, lpObject);
-	lpStruct->functionName = (const char *)env->GetIntLongField(lpObject, nsDynamicFunctionLoadFc.functionName);
-	lpStruct->function = (NSFuncPtr  *)env->GetIntLongField(lpObject, nsDynamicFunctionLoadFc.function);
-	return lpStruct;
-}
-
-void setnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct)
-{
-	if (!nsDynamicFunctionLoadFc.cached) cachensDynamicFunctionLoadFields(env, lpObject);
-	env->SetIntLongField(lpObject, nsDynamicFunctionLoadFc.functionName, (jintLong)lpStruct->functionName);
-	env->SetIntLongField(lpObject, nsDynamicFunctionLoadFc.function, (jintLong)lpStruct->function);
-}
-#endif
-
-#ifndef NO_nsID
-typedef struct nsID_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID m0, m1, m2, m3;
-} nsID_FID_CACHE;
-
-nsID_FID_CACHE nsIDFc;
-
-void cachensIDFields(JNIEnv *env, jobject lpObject)
-{
-	if (nsIDFc.cached) return;
-	nsIDFc.clazz = env->GetObjectClass(lpObject);
-	nsIDFc.m0 = env->GetFieldID(nsIDFc.clazz, "m0", "I");
-	nsIDFc.m1 = env->GetFieldID(nsIDFc.clazz, "m1", "S");
-	nsIDFc.m2 = env->GetFieldID(nsIDFc.clazz, "m2", "S");
-	nsIDFc.m3 = env->GetFieldID(nsIDFc.clazz, "m3", "[B");
-	nsIDFc.cached = 1;
-}
-
-nsID *getnsIDFields(JNIEnv *env, jobject lpObject, nsID *lpStruct)
-{
-	if (!nsIDFc.cached) cachensIDFields(env, lpObject);
-	lpStruct->m0 = env->GetIntField(lpObject, nsIDFc.m0);
-	lpStruct->m1 = env->GetShortField(lpObject, nsIDFc.m1);
-	lpStruct->m2 = env->GetShortField(lpObject, nsIDFc.m2);
-	{
-	jbyteArray lpObject1 = (jbyteArray)env->GetObjectField(lpObject, nsIDFc.m3);
-	env->GetByteArrayRegion(lpObject1, 0, sizeof(lpStruct->m3), (jbyte *)lpStruct->m3);
-	}
-	return lpStruct;
-}
-
-void setnsIDFields(JNIEnv *env, jobject lpObject, nsID *lpStruct)
-{
-	if (!nsIDFc.cached) cachensIDFields(env, lpObject);
-	env->SetIntField(lpObject, nsIDFc.m0, (jint)lpStruct->m0);
-	env->SetShortField(lpObject, nsIDFc.m1, (jshort)lpStruct->m1);
-	env->SetShortField(lpObject, nsIDFc.m2, (jshort)lpStruct->m2);
-	{
-	jbyteArray lpObject1 = (jbyteArray)env->GetObjectField(lpObject, nsIDFc.m3);
-	env->SetByteArrayRegion(lpObject1, 0, sizeof(lpStruct->m3), (jbyte *)lpStruct->m3);
-	}
-}
-#endif
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.h
deleted file mode 100644
index d8322bbcb4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#include "xpcom.h"
-
-#ifndef NO_nsDynamicFunctionLoad
-void cachensDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject);
-nsDynamicFunctionLoad *getnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct);
-void setnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct);
-#define nsDynamicFunctionLoad_sizeof() sizeof(nsDynamicFunctionLoad)
-#else
-#define cachensDynamicFunctionLoadFields(a,b)
-#define getnsDynamicFunctionLoadFields(a,b,c) NULL
-#define setnsDynamicFunctionLoadFields(a,b,c)
-#define nsDynamicFunctionLoad_sizeof() 0
-#endif
-
-#ifndef NO_nsID
-void cachensIDFields(JNIEnv *env, jobject lpObject);
-nsID *getnsIDFields(JNIEnv *env, jobject lpObject, nsID *lpStruct);
-void setnsIDFields(JNIEnv *env, jobject lpObject, nsID *lpStruct);
-#define nsID_sizeof() sizeof(nsID)
-#else
-#define cachensIDFields(a,b)
-#define getnsIDFields(a,b,c) NULL
-#define setnsIDFields(a,b,c)
-#define nsID_sizeof() 0
-#endif
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp
deleted file mode 100644
index fef02a69c1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#include "swt.h"
-#include "xpcominit_structs.h"
-#include "xpcominit_stats.h"
-
-#ifndef XPCOMInit_NATIVE
-#define XPCOMInit_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_init_XPCOMInit_##func
-#endif
-
-#ifndef NO_GREProperty_1sizeof
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREProperty_1sizeof)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREProperty_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOMInit_NATIVE_ENTER(env, that, GREProperty_1sizeof_FUNC);
-	rc = (jint)GREProperty_sizeof();
-	XPCOMInit_NATIVE_EXIT(env, that, GREProperty_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GREVersionRange_1sizeof
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREVersionRange_1sizeof)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREVersionRange_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOMInit_NATIVE_ENTER(env, that, GREVersionRange_1sizeof_FUNC);
-	rc = (jint)GREVersionRange_sizeof();
-	XPCOMInit_NATIVE_EXIT(env, that, GREVersionRange_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1GRE_1GetGREPathWithProperties
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jobject arg2, jint arg3, jintLong arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1GRE_1GetGREPathWithProperties)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jobject arg2, jint arg3, jintLong arg4, jint arg5)
-{
-	GREVersionRange _arg0, *lparg0=NULL;
-	GREProperty _arg2, *lparg2=NULL;
-	jint rc = 0;
-	XPCOMInit_NATIVE_ENTER(env, that, _1GRE_1GetGREPathWithProperties_FUNC);
-	if (arg0) if ((lparg0 = getGREVersionRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = getGREPropertyFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)GRE_GetGREPathWithProperties((const GREVersionRange *)lparg0, arg1, (const GREProperty *)lparg2, arg3, (char *)arg4, arg5);
-fail:
-	if (arg2 && lparg2) setGREPropertyFields(env, arg2, lparg2);
-	if (arg0 && lparg0) setGREVersionRangeFields(env, arg0, lparg0);
-	XPCOMInit_NATIVE_EXIT(env, that, _1GRE_1GetGREPathWithProperties_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XPCOMGlueShutdown
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueShutdown)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueShutdown)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOMInit_NATIVE_ENTER(env, that, _1XPCOMGlueShutdown_FUNC);
-	rc = (jint)XPCOMGlueShutdown();
-	XPCOMInit_NATIVE_EXIT(env, that, _1XPCOMGlueShutdown_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XPCOMGlueStartup
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueStartup)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	XPCOMInit_NATIVE_ENTER(env, that, _1XPCOMGlueStartup_FUNC);
-	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)XPCOMGlueStartup((const char *)lparg0);
-fail:
-	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
-	XPCOMInit_NATIVE_EXIT(env, that, _1XPCOMGlueStartup_FUNC);
-	return rc;
-}
-#endif
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h
deleted file mode 100644
index 445117f40c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/
-  
-#ifndef INC_xpcominit_H
-#define INC_xpcominit_H
-
-#define NDEBUG
-
-#define XPCOM_GLUE 1
-#include "nsXPCOMGlue.h"
-
-#ifdef _WIN32
-#define STDMETHODCALLTYPE __stdcall
-#else
-#define STDMETHODCALLTYPE
-#endif
-
-#endif /* INC_xpcominit_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp
deleted file mode 100644
index 3e9a2f895b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#include "swt.h"
-#include "xpcominit_stats.h"
-
-#ifdef NATIVE_STATS
-
-char * XPCOMInit_nativeFunctionNames[] = {
-	"GREProperty_1sizeof",
-	"GREVersionRange_1sizeof",
-	"_1GRE_1GetGREPathWithProperties",
-	"_1XPCOMGlueShutdown",
-	"_1XPCOMGlueStartup",
-};
-#define NATIVE_FUNCTION_COUNT sizeof(XPCOMInit_nativeFunctionNames) / sizeof(char*)
-int XPCOMInit_nativeFunctionCount = NATIVE_FUNCTION_COUNT;
-int XPCOMInit_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT];
-
-#define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
-
-JNIEXPORT jint JNICALL STATS_NATIVE(XPCOMInit_1GetFunctionCount)
-	(JNIEnv *env, jclass that)
-{
-	return XPCOMInit_nativeFunctionCount;
-}
-
-JNIEXPORT jstring JNICALL STATS_NATIVE(XPCOMInit_1GetFunctionName)
-	(JNIEnv *env, jclass that, jint index)
-{
-	return env->NewStringUTF(XPCOMInit_nativeFunctionNames[index]);
-}
-
-JNIEXPORT jint JNICALL STATS_NATIVE(XPCOMInit_1GetFunctionCallCount)
-	(JNIEnv *env, jclass that, jint index)
-{
-	return XPCOMInit_nativeFunctionCallCount[index];
-}
-
-#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.h
deleted file mode 100644
index 0f4497a9e4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#ifdef NATIVE_STATS
-extern int XPCOMInit_nativeFunctionCount;
-extern int XPCOMInit_nativeFunctionCallCount[];
-extern char* XPCOMInit_nativeFunctionNames[];
-#define XPCOMInit_NATIVE_ENTER(env, that, func) XPCOMInit_nativeFunctionCallCount[func]++;
-#define XPCOMInit_NATIVE_EXIT(env, that, func) 
-#else
-#ifndef XPCOMInit_NATIVE_ENTER
-#define XPCOMInit_NATIVE_ENTER(env, that, func) 
-#endif
-#ifndef XPCOMInit_NATIVE_EXIT
-#define XPCOMInit_NATIVE_EXIT(env, that, func) 
-#endif
-#endif
-
-typedef enum {
-	GREProperty_1sizeof_FUNC,
-	GREVersionRange_1sizeof_FUNC,
-	_1GRE_1GetGREPathWithProperties_FUNC,
-	_1XPCOMGlueShutdown_FUNC,
-	_1XPCOMGlueStartup_FUNC,
-} XPCOMInit_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp
deleted file mode 100644
index 7a51a28cd5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#include "swt.h"
-#include "xpcominit_structs.h"
-
-#ifndef NO_GREProperty
-typedef struct GREProperty_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID property, value;
-} GREProperty_FID_CACHE;
-
-GREProperty_FID_CACHE GREPropertyFc;
-
-void cacheGREPropertyFields(JNIEnv *env, jobject lpObject)
-{
-	if (GREPropertyFc.cached) return;
-	GREPropertyFc.clazz = env->GetObjectClass(lpObject);
-	GREPropertyFc.property = env->GetFieldID(GREPropertyFc.clazz, "property", I_J);
-	GREPropertyFc.value = env->GetFieldID(GREPropertyFc.clazz, "value", I_J);
-	GREPropertyFc.cached = 1;
-}
-
-GREProperty *getGREPropertyFields(JNIEnv *env, jobject lpObject, GREProperty *lpStruct)
-{
-	if (!GREPropertyFc.cached) cacheGREPropertyFields(env, lpObject);
-	lpStruct->property = (const char *)env->GetIntLongField(lpObject, GREPropertyFc.property);
-	lpStruct->value = (const char *)env->GetIntLongField(lpObject, GREPropertyFc.value);
-	return lpStruct;
-}
-
-void setGREPropertyFields(JNIEnv *env, jobject lpObject, GREProperty *lpStruct)
-{
-	if (!GREPropertyFc.cached) cacheGREPropertyFields(env, lpObject);
-	env->SetIntLongField(lpObject, GREPropertyFc.property, (jintLong)lpStruct->property);
-	env->SetIntLongField(lpObject, GREPropertyFc.value, (jintLong)lpStruct->value);
-}
-#endif
-
-#ifndef NO_GREVersionRange
-typedef struct GREVersionRange_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID lower, lowerInclusive, upper, upperInclusive;
-} GREVersionRange_FID_CACHE;
-
-GREVersionRange_FID_CACHE GREVersionRangeFc;
-
-void cacheGREVersionRangeFields(JNIEnv *env, jobject lpObject)
-{
-	if (GREVersionRangeFc.cached) return;
-	GREVersionRangeFc.clazz = env->GetObjectClass(lpObject);
-	GREVersionRangeFc.lower = env->GetFieldID(GREVersionRangeFc.clazz, "lower", I_J);
-	GREVersionRangeFc.lowerInclusive = env->GetFieldID(GREVersionRangeFc.clazz, "lowerInclusive", "Z");
-	GREVersionRangeFc.upper = env->GetFieldID(GREVersionRangeFc.clazz, "upper", I_J);
-	GREVersionRangeFc.upperInclusive = env->GetFieldID(GREVersionRangeFc.clazz, "upperInclusive", "Z");
-	GREVersionRangeFc.cached = 1;
-}
-
-GREVersionRange *getGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct)
-{
-	if (!GREVersionRangeFc.cached) cacheGREVersionRangeFields(env, lpObject);
-	lpStruct->lower = (const char *)env->GetIntLongField(lpObject, GREVersionRangeFc.lower);
-	lpStruct->lowerInclusive = env->GetBooleanField(lpObject, GREVersionRangeFc.lowerInclusive);
-	lpStruct->upper = (const char *)env->GetIntLongField(lpObject, GREVersionRangeFc.upper);
-	lpStruct->upperInclusive = env->GetBooleanField(lpObject, GREVersionRangeFc.upperInclusive);
-	return lpStruct;
-}
-
-void setGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct)
-{
-	if (!GREVersionRangeFc.cached) cacheGREVersionRangeFields(env, lpObject);
-	env->SetIntLongField(lpObject, GREVersionRangeFc.lower, (jintLong)lpStruct->lower);
-	env->SetBooleanField(lpObject, GREVersionRangeFc.lowerInclusive, (jboolean)lpStruct->lowerInclusive);
-	env->SetIntLongField(lpObject, GREVersionRangeFc.upper, (jintLong)lpStruct->upper);
-	env->SetBooleanField(lpObject, GREVersionRangeFc.upperInclusive, (jboolean)lpStruct->upperInclusive);
-}
-#endif
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.h
deleted file mode 100644
index 074b8b1c19..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2016 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
- *******************************************************************************/
-
-/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
-/* DO NOT EDIT - your changes will be lost. */
-
-#include "xpcominit.h"
-
-#ifndef NO_GREProperty
-void cacheGREPropertyFields(JNIEnv *env, jobject lpObject);
-GREProperty *getGREPropertyFields(JNIEnv *env, jobject lpObject, GREProperty *lpStruct);
-void setGREPropertyFields(JNIEnv *env, jobject lpObject, GREProperty *lpStruct);
-#define GREProperty_sizeof() sizeof(GREProperty)
-#else
-#define cacheGREPropertyFields(a,b)
-#define getGREPropertyFields(a,b,c) NULL
-#define setGREPropertyFields(a,b,c)
-#define GREProperty_sizeof() 0
-#endif
-
-#ifndef NO_GREVersionRange
-void cacheGREVersionRangeFields(JNIEnv *env, jobject lpObject);
-GREVersionRange *getGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct);
-void setGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct);
-#define GREVersionRange_sizeof() sizeof(GREVersionRange)
-#else
-#define cacheGREVersionRangeFields(a,b)
-#define getGREVersionRangeFields(a,b,c) NULL
-#define setGREVersionRangeFields(a,b,c)
-#define GREVersionRange_sizeof() 0
-#endif
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
deleted file mode 100644
index 35c8866f15..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-
-class AppFileLocProvider {
-	XPCOMObject supports;
-	XPCOMObject directoryServiceProvider;
-	XPCOMObject directoryServiceProvider2;
-	int refCount = 0;
-	String mozillaPath, profilePath, cacheParentPath;
-	String[] pluginDirs;
-	boolean isXULRunner;
-
-	static final String SEPARATOR_OS = System.getProperty ("file.separator"); //$NON-NLS-1$
-	static final String CHROME_DIR = "chrome"; //$NON-NLS-1$
-	static final String COMPONENTS_DIR = "components"; //$NON-NLS-1$
-	static final String HISTORY_FILE = "history.dat"; //$NON-NLS-1$
-	static final String LOCALSTORE_FILE = "localstore.rdf"; //$NON-NLS-1$
-	static final String MIMETYPES_FILE = "mimeTypes.rdf"; //$NON-NLS-1$
-	static final String MOZILLA_PLUGIN_PATH = "MOZ_PLUGIN_PATH"; //$NON-NLS-1$
-	static final String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
-	static final String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
-	static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
-
-	static boolean IsSparc;
-	static {
-		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
-		String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
-		IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-AppFileLocProvider (String mozillaPath, String profilePath, String cacheParentPath, boolean isXULRunner) {
-	this.mozillaPath = mozillaPath + SEPARATOR_OS;
-	this.profilePath = profilePath + SEPARATOR_OS;
-	this.cacheParentPath = cacheParentPath;
-	this.isXULRunner = isXULRunner;
-	if (!Compatibility.fileExists (profilePath, "")) { //$NON-NLS-1$
-		long /*int*/[] result = new long /*int*/[1];
-		nsEmbedString pathString = new nsEmbedString (profilePath);
-		int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-		pathString.dispose ();
-
-		nsILocalFile file = new nsILocalFile (result [0]);
-		rc = file.Create (nsILocalFile.DIRECTORY_TYPE, 0700);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		file.Release ();
-	}
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	directoryServiceProvider = new XPCOMObject (new int[] {2, 0, 0, 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 getFile (args[0], args[1], args[2]);}
-	};
-
-	directoryServiceProvider2 = new XPCOMObject (new int[] {2, 0, 0, 3, 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 getFile (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return getFiles (args[0], args[1]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (directoryServiceProvider != null) {
-		directoryServiceProvider.dispose ();
-		directoryServiceProvider = null;
-	}
-	if (directoryServiceProvider2 != null) {
-		directoryServiceProvider2.dispose ();
-		directoryServiceProvider2 = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return directoryServiceProvider.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IDIRECTORYSERVICEPROVIDER_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IDIRECTORYSERVICEPROVIDER2_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider2.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIDirectoryServiceProvider2 */
-
-int getFiles (long /*int*/ prop, long /*int*/ _retval) {
-	int size = XPCOM.strlen (prop);
-	byte[] bytes = new byte[size];
-	XPCOM.memmove (bytes, prop, size);
-	String propertyName = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-	String[] propertyValues = null;
-
-	if (propertyName.equals (XPCOM.NS_APP_PLUGINS_DIR_LIST)) {
-		if (pluginDirs == null) {
-			int index = 0;
-			/* set the first value(s) to the MOZ_PLUGIN_PATH environment variable value if it's defined */
-			long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, MOZILLA_PLUGIN_PATH, true));
-			if (ptr != 0) {
-				int length = C.strlen (ptr);
-				byte[] buffer = new byte[length];
-				C.memmove (buffer, ptr, length);
-				String value = new String (MozillaDelegate.mbcsToWcs (null, buffer));
-				if (value.length () > 0) {
-					String separator = System.getProperty ("path.separator"); // $NON-NLS-1$
-					List<String> segments = new ArrayList<> ();
-					int start, end = -1;
-					do {
-						start = end + 1;
-						end = value.indexOf (separator, start);
-						String segment;
-						if (end == -1) {
-							segment = value.substring (start);
-						} else {
-							segment = value.substring (start, end);
-						}
-						if (segment.length () > 0) segments.add (segment);
-					} while (end != -1);
-					int segmentsSize = segments.size ();
-					pluginDirs = new String [segmentsSize + (IsSparc ? 1 : 2)];
-					for (index = 0; index < segmentsSize; index++) {
-						pluginDirs[index] = segments.get (index);
-					}
-				}
-			}
-			if (pluginDirs == null) {
-				pluginDirs = new String[IsSparc ? 1 : 2];
-			}
-
-			/* set the next value to the GRE path + "plugins" */
-
-			/*
-			* Bug on Solaris SPARC.  Attempting to start the java plug-in fails with an
-			* error indicating that PR_NewMonitor could not be found.  This is a well-
-			* known problem that many other apps have also encountered, with no
-			* resolution other than to remove this plug-in.  The Browser workaround is
-			* to not add the directory containing this plug-in to the plug-in search path.
-			*/
-			if (!IsSparc) {
-				pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
-			}
-
-			/* set the next value to the home directory + "/.mozilla/plugins" */
-			pluginDirs[index++] = System.getProperty("user.home") + SEPARATOR_OS + USER_PLUGINS_DIR;
-		}
-		propertyValues = pluginDirs;
-	}
-
-	XPCOM.memmove(_retval, new long /*int*/[] {0}, C.PTR_SIZEOF);
-	if (propertyValues != null) {
-		long /*int*/[] result = new long /*int*/[1];
-		nsISupports[] files = new nsISupports [propertyValues.length];
-		int index = 0;
-		for (int i = 0; i < propertyValues.length; i++) {
-			nsEmbedString pathString = new nsEmbedString (propertyValues[i]);
-			int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-			if (rc != XPCOM.NS_ERROR_FILE_UNRECOGNIZED_PATH) {
-				/* value appears to be a valid pathname */
-				if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-				if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-
-				nsILocalFile localFile = new nsILocalFile (result[0]);
-				result[0] = 0;
-				rc = localFile.QueryInterface (IIDStore.GetIID (nsIFile.class), result);
-				if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-				if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-				localFile.Release ();
-
-				nsIFile file = new nsIFile (result[0]);
-				files[index++] = file;
-			}
-			pathString.dispose ();
-			result[0] = 0;
-		}
-
-		if (index < propertyValues.length) {
-			/* there were some invalid values so remove the trailing empty array slots */
-			nsISupports[] temp = new nsISupports [index];
-			System.arraycopy (files, 0, temp, 0, index);
-			files = temp;
-		}
-
-		SimpleEnumerator enumerator = new SimpleEnumerator (files);
-		enumerator.AddRef ();
-		XPCOM.memmove (_retval, new long /*int*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF);
-		return XPCOM.NS_OK;
-	}
-
-	return XPCOM.NS_ERROR_FAILURE;
-}
-
-/* nsIDirectoryServiceProvider implementation */
-
-int getFile(long /*int*/ prop, long /*int*/ persistent, long /*int*/ _retval) {
-	int size = XPCOM.strlen (prop);
-	byte[] bytes = new byte[size];
-	XPCOM.memmove (bytes, prop, size);
-	String propertyName = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-	String propertyValue = null;
-
-	if (propertyName.equals (XPCOM.NS_APP_HISTORY_50_FILE)) {
-		propertyValue = profilePath + HISTORY_FILE;
-	} else if (propertyName.equals (XPCOM.NS_APP_USER_MIMETYPES_50_FILE)) {
-		propertyValue = profilePath + MIMETYPES_FILE;
-	} else if (propertyName.equals (XPCOM.NS_APP_PREFS_50_FILE)) {
-		propertyValue = profilePath + PREFERENCES_FILE;
-	} else if (propertyName.equals (XPCOM.NS_APP_PREFS_50_DIR)) {
-		propertyValue = profilePath;
-	} else if (propertyName.equals (XPCOM.NS_APP_USER_CHROME_DIR)) {
-		propertyValue = profilePath + CHROME_DIR;
-	} else if (propertyName.equals (XPCOM.NS_APP_USER_PROFILE_50_DIR)) {
-		propertyValue = profilePath;
-	} else if (propertyName.equals (XPCOM.NS_APP_LOCALSTORE_50_FILE)) {
-		propertyValue = profilePath + LOCALSTORE_FILE;
-	} else if (propertyName.equals (XPCOM.NS_APP_CACHE_PARENT_DIR)) {
-		propertyValue = cacheParentPath;
-	} else if (propertyName.equals (XPCOM.NS_OS_HOME_DIR)) {
-		propertyValue = System.getProperty("user.home");	//$NON-NLS-1$
-	} else if (propertyName.equals (XPCOM.NS_OS_TEMP_DIR)) {
-		propertyValue = System.getProperty("java.io.tmpdir");	//$NON-NLS-1$
-	} else if (propertyName.equals (XPCOM.NS_GRE_DIR)) {
-		propertyValue = mozillaPath;
-	} else if (propertyName.equals (XPCOM.NS_GRE_COMPONENT_DIR)) {
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24, false)) {
-			propertyValue = mozillaPath + COMPONENTS_DIR;
-		} else {
-			propertyValue = profilePath + 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)) {
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24, false)) {
-			propertyValue = profilePath + COMPONENTS_DIR;
-		} else {
-			propertyValue = mozillaPath + COMPONENTS_DIR;
-		}
-	} else if (propertyName.equals (XPCOM.NS_XPCOM_CURRENT_PROCESS_DIR)) {
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24, false)) {
-			propertyValue = profilePath;
-		} else {
-			propertyValue = mozillaPath;
-		}
-	} else if (propertyName.equals (XPCOM.NS_APP_PREF_DEFAULTS_50_DIR)) {
-		/*
-		* Answering a value for this property causes problems in Mozilla versions
-		* < 1.7.  Unfortunately this property is queried early enough in the
-		* Browser creation process that the Mozilla version being used is not
-		* yet determined.  However it is known if XULRunner is being used or not.
-		*
-		* For now answer a value for this property iff XULRunner is the GRE.
-		* If the range of Mozilla versions supported by the Browser is changed
-		* in the future to be >= 1.7 then this value can always be answered.
-		*/
-		if (isXULRunner) propertyValue = profilePath;
-	}
-
-	XPCOM.memmove (persistent, new boolean[] {true});
-	XPCOM.memmove (_retval, new long /*int*/[] {0}, C.PTR_SIZEOF);
-	if (propertyValue != null && propertyValue.length () > 0) {
-		long /*int*/[] result = new long /*int*/[1];
-		nsEmbedString pathString = new nsEmbedString (propertyValue);
-		int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-		pathString.dispose ();
-
-		nsILocalFile localFile = new nsILocalFile (result [0]);
-		result[0] = 0;
-	    rc = localFile.QueryInterface (IIDStore.GetIID (nsIFile.class), result);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-		XPCOM.memmove (_retval, new long /*int*/[] {result[0]}, C.PTR_SIZEOF);
-		localFile.Release ();
-		return XPCOM.NS_OK;
-	}
-
-	return XPCOM.NS_ERROR_FAILURE;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
deleted file mode 100644
index fbf1237932..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class implements the nsIDownload interface for mozilla
- * versions 1.4 - 1.7.x.  For mozilla version 1.8.x this interface
- * is implemented by class nsIDownload_1_8.  Later versions of
- * mozilla do not need to call this interface.
- */
-class Download {
-	XPCOMObject supports;
-	XPCOMObject download;
-	XPCOMObject progressDialog;
-	XPCOMObject webProgressListener;
-	nsIHelperAppLauncher helperAppLauncher;
-	int refCount = 0;
-
-	Shell shell;
-	Label status;
-	Button cancel;
-
-Download () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	download = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 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 Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
-		@Override
-		public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
-		@Override
-		public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
-		@Override
-		public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
-	};
-
-	progressDialog = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
-		@Override
-		public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
-		@Override
-		public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
-		@Override
-		public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
-		@Override
-		public long /*int*/ method16 (long /*int*/[] args) {return Open (args[0]);}
-		@Override
-		public long /*int*/ method17 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-		@Override
-		public long /*int*/ method18 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method19 (long /*int*/[] args) {return GetDialog (args[0]);}
-		@Override
-		public long /*int*/ method20 (long /*int*/[] args) {return SetDialog (args[0]);}
-	};
-
-	webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (download != null) {
-		download.dispose ();
-		download = null;
-	}
-	if (progressDialog != null) {
-		progressDialog.dispose ();
-		progressDialog = null;
-	}
-	if (webProgressListener != null) {
-		webProgressListener.dispose ();
-		webProgressListener = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return progressDialog.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IDOWNLOAD_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
-		AddRef();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IPROGRESSDIALOG_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
-		AddRef();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIWebProgressListener.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIDownload */
-
-/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
-int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aPersist) {
-	nsIURI source = new nsIURI (aSource);
-	long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
-	int rc = source.GetHost (aSpec);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	int length = XPCOM.nsEmbedCString_Length (aSpec);
-	long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-	byte[] dest = new byte[length];
-	XPCOM.memmove (dest, buffer, length);
-	XPCOM.nsEmbedCString_delete (aSpec);
-	String url = new String (dest);
-
-	/*
-	* As of mozilla 1.7 the second argument of the nsIDownload interface's
-	* Init function changed from nsILocalFile to nsIURI.  Detect which of
-	* these interfaces the second argument implements and act accordingly.
-	*/
-	String filename = null;
-	nsISupports supports = new nsISupports (aTarget);
-	long /*int*/[] result = new long /*int*/[1];
-	rc = supports.QueryInterface (IIDStore.GetIID (nsIURI.class), result);
-	if (rc == XPCOM.NS_OK) {	/* >= 1.7 */
-		nsIURI target = new nsIURI (result[0]);
-		result[0] = 0;
-		long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
-		rc = target.GetPath (aPath);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		length = XPCOM.nsEmbedCString_Length (aPath);
-		buffer = XPCOM.nsEmbedCString_get (aPath);
-		dest = new byte[length];
-		XPCOM.memmove (dest, buffer, length);
-		XPCOM.nsEmbedCString_delete (aPath);
-		filename = new String (dest);
-		int separator = filename.lastIndexOf (System.getProperty ("file.separator"));	//$NON-NLS-1$
-		filename = filename.substring (separator + 1);
-		target.Release ();
-	} else {	/* < 1.7 */
-		nsILocalFile target = new nsILocalFile (aTarget);
-		nsEmbedString aNativeTarget = new nsEmbedString ();
-		rc = target.GetLeafName (aNativeTarget.getAddress());
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		filename = aNativeTarget.toString ();
-		aNativeTarget.dispose ();
-	}
-
-	Listener listener = event -> {
-		if (event.widget == cancel) {
-			shell.close ();
-		}
-		if (helperAppLauncher != null) {
-			helperAppLauncher.Cancel ();
-			helperAppLauncher.Release ();
-		}
-		shell = null;
-		helperAppLauncher = null;
-	};
-	shell = new Shell (SWT.DIALOG_TRIM);
-	String msg = Compatibility.getMessage ("SWT_Download_File", new Object[] {filename}); //$NON-NLS-1$
-	shell.setText (msg);
-	GridLayout gridLayout = new GridLayout ();
-	gridLayout.marginHeight = 15;
-	gridLayout.marginWidth = 15;
-	gridLayout.verticalSpacing = 20;
-	shell.setLayout(gridLayout);
-	msg = Compatibility.getMessage ("SWT_Download_Location", new Object[] {filename, url}); //$NON-NLS-1$
-	new Label (shell, SWT.WRAP).setText (msg);
-	status = new Label (shell, SWT.WRAP);
-	msg = Compatibility.getMessage ("SWT_Download_Started"); //$NON-NLS-1$
-	status.setText (msg);
-	GridData data = new GridData ();
-	data.grabExcessHorizontalSpace = true;
-	data.grabExcessVerticalSpace = true;
-	status.setLayoutData (data);
-
-	cancel = new Button (shell, SWT.PUSH);
-	cancel.setText (SWT.getMessage ("SWT_Cancel")); //$NON-NLS-1$
-	data = new GridData ();
-	data.horizontalAlignment = GridData.CENTER;
-	cancel.setLayoutData (data);
-	cancel.addListener (SWT.Selection, listener);
-	shell.addListener (SWT.Close, listener);
-	shell.pack ();
-	shell.open ();
-	return XPCOM.NS_OK;
-}
-
-int GetSource (long /*int*/ aSource) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetTarget (long /*int*/ aTarget) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetPersist (long /*int*/ aPersist) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetPercentComplete (long /*int*/ aPercentComplete) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDisplayName (long /*int*/ aDisplayName) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetDisplayName (long /*int*/ aDisplayName) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetStartTime (long /*int*/ aStartTime) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetMIMEInfo (long /*int*/ aMIMEInfo) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetListener (long /*int*/ aListener) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetListener (long /*int*/ aListener) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetObserver (long /*int*/ aObserver) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetObserver (long /*int*/ aObserver) {
-	if (aObserver != 0) {
-		nsISupports supports = new nsISupports (aObserver);
-		long /*int*/[] result = new long /*int*/[1];
-		int rc = supports.QueryInterface (IIDStore.GetIID (nsIHelperAppLauncher.class), result);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-		helperAppLauncher = new nsIHelperAppLauncher (result[0]);
-	}
-	return XPCOM.NS_OK;
-}
-
-/* nsIProgressDialog */
-int Open (long /*int*/ aParent) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDialog (long /*int*/ aDialog) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetDialog (long /*int*/ aDialog) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIWebProgressListener */
-
-int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
-	if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
-		if (helperAppLauncher != null) helperAppLauncher.Release ();
-		helperAppLauncher = null;
-		if (shell != null && !shell.isDisposed ()) shell.dispose ();
-		shell = null;
-	}
-	return XPCOM.NS_OK;
-}
-
-int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
-	int currentKBytes = aCurTotalProgress / 1024;
-	int totalKBytes = aMaxTotalProgress / 1024;
-	if (shell != null && !shell.isDisposed ()) {
-		Object[] arguments = {new Integer (currentKBytes), new Integer (totalKBytes)};
-		String statusMsg = Compatibility.getMessage ("SWT_Download_Status", arguments); //$NON-NLS-1$
-		status.setText (statusMsg);
-		shell.layout (true);
-		shell.getDisplay ().update ();
-	}
-	return XPCOM.NS_OK;
-}
-
-int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
-	return XPCOM.NS_OK;
-}
-
-int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
-	return XPCOM.NS_OK;
-}
-
-int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java
deleted file mode 100644
index 6b2774c0ec..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-
-class DownloadFactory {
-	XPCOMObject supports;
-	XPCOMObject factory;
-	int refCount = 0;
-
-DownloadFactory () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 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 CreateInstance (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (factory != null) {
-		factory.dispose ();
-		factory = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return factory.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIFactory */
-
-int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
-	Download download = new Download ();
-	download.AddRef ();
-	XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-
-int LockFactory (int lock) {
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java
deleted file mode 100644
index c3c45e9f39..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-
-class DownloadFactory_1_8 {
-	XPCOMObject supports;
-	XPCOMObject factory;
-	int refCount = 0;
-
-DownloadFactory_1_8 () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 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 CreateInstance (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (factory != null) {
-		factory.dispose ();
-		factory = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return factory.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIFactory */
-
-int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
-	Download_1_8 download = new Download_1_8 ();
-	download.AddRef ();
-	XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-
-int LockFactory (int lock) {
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java
deleted file mode 100644
index f5f1fe1540..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class implements the nsIDownload interface for mozilla
- * version 1.8.x.  For mozilla versions 1.4 - 1.7.x this interface
- * is implemented by class nsIDownload.  Mozilla versions later
- * than 1.8.x do not need to call this interface.
- */
-class Download_1_8 {
-	XPCOMObject supports;
-	XPCOMObject download;
-	XPCOMObject progressDialog;
-	XPCOMObject webProgressListener;
-	nsICancelable cancelable;
-	int refCount = 0;
-
-	Shell shell;
-	Label status;
-	Button cancel;
-
-	static final boolean is32 = C.PTR_SIZEOF == 4;
-
-Download_1_8 () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	download = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {
-			if (args.length == 10) {
-				return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
-			} else {
-				return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
-			}
-		}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {
-			if (args.length == 8) {
-				return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
-			} else {
-				return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
-			}
-		}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
-		@Override
-		public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
-		@Override
-		public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
-		@Override
-		public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
-		@Override
-		public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
-		@Override
-		public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
-		@Override
-		public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
-		@Override
-		public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
-	};
-
-	progressDialog = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {
-			if (args.length == 10) {
-				return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
-			} else {
-				return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
-			}
-		}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {
-			if (args.length == 8) {
-				return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
-			} else {
-				return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
-			}
-		}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
-		@Override
-		public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
-		@Override
-		public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
-		@Override
-		public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
-		@Override
-		public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
-		@Override
-		public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
-		@Override
-		public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
-		@Override
-		public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
-		@Override
-		public long /*int*/ method20 (long /*int*/[] args) {return Open (args[0]);}
-		@Override
-		public long /*int*/ method21 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-		@Override
-		public long /*int*/ method22 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method23 (long /*int*/[] args) {return GetObserver (args[0]);}
-		@Override
-		public long /*int*/ method24 (long /*int*/[] args) {return SetObserver (args[0]);}
-		@Override
-		public long /*int*/ method25 (long /*int*/[] args) {return GetDialog (args[0]);}
-		@Override
-		public long /*int*/ method26 (long /*int*/[] args) {return SetDialog (args[0]);}
-	};
-
-	webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-	};
-}
-
-void disposeCOMInterfaces() {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (download != null) {
-		download.dispose ();
-		download = null;
-	}
-	if (progressDialog != null) {
-		progressDialog.dispose ();
-		progressDialog = null;
-	}
-	if (webProgressListener != null) {
-		webProgressListener.dispose ();
-		webProgressListener = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return progressDialog.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IDOWNLOAD_1_8_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
-		AddRef();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IPROGRESSDIALOG_1_8_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
-		AddRef();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIWebProgressListener.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIDownload */
-
-/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
-int Init_32 (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aTempFile, long /*int*/ aCancelable) {
-	long startTime = (startTime2 << 32) + startTime1;
-	return Init (aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
-}
-
-int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {
-	cancelable = new nsICancelable (aCancelable);
-	nsIURI source = new nsIURI (aSource);
-	long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
-	int rc = source.GetHost (aSpec);
-	if (rc != XPCOM.NS_OK) Mozilla.error(rc);
-	int length = XPCOM.nsEmbedCString_Length (aSpec);
-	long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-	byte[] dest = new byte[length];
-	XPCOM.memmove (dest, buffer, length);
-	XPCOM.nsEmbedCString_delete (aSpec);
-	String url = new String (dest);
-
-	nsIURI target = new nsIURI (aTarget);
-	long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
-	rc = target.GetPath (aPath);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	length = XPCOM.nsEmbedCString_Length (aPath);
-	buffer = XPCOM.nsEmbedCString_get (aPath);
-	dest = new byte[length];
-	XPCOM.memmove (dest, buffer, length);
-	XPCOM.nsEmbedCString_delete (aPath);
-	String filename = new String (dest);
-	int separator = filename.lastIndexOf (System.getProperty ("file.separator"));	//$NON-NLS-1$
-	filename = filename.substring (separator + 1);
-
-	Listener listener = event -> {
-		if (event.widget == cancel) {
-			shell.close ();
-		}
-		if (cancelable != null) {
-			int rc1 = cancelable.Cancel (XPCOM.NS_BINDING_ABORTED);
-			if (rc1 != XPCOM.NS_OK) Mozilla.error (rc1);
-		}
-		shell = null;
-		cancelable = null;
-	};
-	shell = new Shell (SWT.DIALOG_TRIM);
-	String msg = Compatibility.getMessage ("SWT_Download_File", new Object[] {filename}); //$NON-NLS-1$
-	shell.setText (msg);
-	GridLayout gridLayout = new GridLayout ();
-	gridLayout.marginHeight = 15;
-	gridLayout.marginWidth = 15;
-	gridLayout.verticalSpacing = 20;
-	shell.setLayout (gridLayout);
-	msg = Compatibility.getMessage ("SWT_Download_Location", new Object[] {filename, url}); //$NON-NLS-1$
-	new Label (shell, SWT.WRAP).setText (msg);
-	status = new Label (shell, SWT.WRAP);
-	msg = Compatibility.getMessage ("SWT_Download_Started"); //$NON-NLS-1$
-	status.setText (msg);
-	GridData data = new GridData ();
-	data.grabExcessHorizontalSpace = true;
-	data.grabExcessVerticalSpace = true;
-	status.setLayoutData (data);
-
-	cancel = new Button (shell, SWT.PUSH);
-	cancel.setText (SWT.getMessage ("SWT_Cancel")); //$NON-NLS-1$
-	data = new GridData ();
-	data.horizontalAlignment = GridData.CENTER;
-	cancel.setLayoutData (data);
-	cancel.addListener (SWT.Selection, listener);
-	shell.addListener (SWT.Close, listener);
-	shell.pack ();
-	shell.open ();
-	return XPCOM.NS_OK;
-}
-
-int GetAmountTransferred (long /*int*/ arg0) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetCancelable (long /*int*/ arg0) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDisplayName (long /*int*/ aDisplayName) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetMIMEInfo (long /*int*/ aMIMEInfo) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetPercentComplete (long /*int*/ aPercentComplete) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetSize (long /*int*/ arg0) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetSource (long /*int*/ aSource) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetStartTime (long /*int*/ aStartTime) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetTarget (long /*int*/ aTarget) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetTargetFile (long /*int*/ arg0) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIProgressDialog */
-int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDialog (long /*int*/ aDialog) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetObserver (long /*int*/ aObserver) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int Open (long /*int*/ aParent) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetDialog (long /*int*/ aDialog) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetObserver (long /*int*/ aObserver) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIWebProgressListener */
-
-int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
-	return XPCOM.NS_OK;
-}
-
-int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
-	return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
-}
-
-/* Note. The last 4 args in the original interface are defined as PRInt64. These each translate into two java ints. */
-int OnProgressChange64_32 (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aCurSelfProgress1, long /*int*/ aCurSelfProgress2, long /*int*/ aMaxSelfProgress1, long /*int*/ aMaxSelfProgress2, long /*int*/ aCurTotalProgress1, long /*int*/ aCurTotalProgress2, long /*int*/ aMaxTotalProgress1, long /*int*/ aMaxTotalProgress2) {
-	long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1;
-	long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1;
-	long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1;
-	long aMaxTotalProgress = (aMaxTotalProgress2 << 32) + aMaxTotalProgress1;
-	return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
-}
-
-int OnProgressChange64 (long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
-	long currentKBytes = aCurTotalProgress / 1024;
-	long totalKBytes = aMaxTotalProgress / 1024;
-	if (shell != null && !shell.isDisposed ()) {
-		Object[] arguments = {new Long (currentKBytes), new Long (totalKBytes)};
-		String statusMsg = Compatibility.getMessage ("SWT_Download_Status", arguments); //$NON-NLS-1$
-		status.setText (statusMsg);
-		shell.layout (true);
-		shell.getDisplay ().update ();
-	}
-	return XPCOM.NS_OK;
-}
-
-int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
-	return XPCOM.NS_OK;
-}
-
-int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
-	if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
-		cancelable = null;
-		if (shell != null && !shell.isDisposed ()) shell.dispose ();
-		shell = null;
-	}
-	return XPCOM.NS_OK;
-}
-
-int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/External.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/External.java
deleted file mode 100644
index f9a2c371c1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/External.java
+++ /dev/null
@@ -1,804 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2015 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
- *     Neil Rashbrook <neil@parkwaycc.co.uk> - Bug 429739
- *     Matthew Painter <matthew.painter@import.io>
- *     Red Hat Inc. - generification
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-
-class External {
-	public static final String EXTERNAL_IID_STR =
-		"ded01d20-ba6f-11dd-ad8b-0800200c9a66"; //$NON-NLS-1$
-
-	public static final nsID EXTERNAL_IID =
-		new nsID(EXTERNAL_IID_STR);
-
-	XPCOMObject supports;
-	XPCOMObject external;
-	XPCOMObject classInfo;
-	XPCOMObject securityCheckedComponent;
-	XPCOMObject scriptObjectOwner;
-	int refCount = 0;
-
-	static final String CALLJAVA = "callJava"; //$NON-NLS-1$
-
-	static Callback CallJavaProc;
-	static {
-		CallJavaProc = new Callback (External.class, CALLJAVA, 3);
-		if (CallJavaProc.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;
-	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;
-		case nsIDataType.VTYPE_EMPTY_ARRAY:
-			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:
-			int[] intResult = new int[1]; /*PRInt32*/
-			rc = variant.GetAsInt32 (intResult);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			return new Double (intResult[0]);
-		case nsIDataType.VTYPE_DOUBLE:
-			long /*int*/ doubleReturn = C.malloc (8);
-			rc = variant.GetAsDouble (doubleReturn);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			double[] doubleResult = new double[1];
-			C.memmove (doubleResult, doubleReturn, 8);
-			C.free (doubleReturn);
-			return new Double (doubleResult[0]);
-		case nsIDataType.VTYPE_WSTRING_SIZE_IS:
-			int[] size = new int[1]; /* PRInt32 */
-			long /*int*/[] wString = new long /*int*/[1];
-			rc = variant.GetAsWStringWithSize (size, wString);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			char[] chars = new char[size[0]];
-			C.memmove (chars, wString[0], size[0] * 2);
-			return new String (chars);
-		case nsIDataType.VTYPE_ARRAY:
-			Object[] arrayReturn = new Object[0];
-			long /*int*/ iid = C.malloc (nsID.sizeof);
-			C.memset (iid, 0, nsID.sizeof);
-			int[] count = new int[1]; /* PRUint32 */
-			short[] currentType = new short[1];
-			long /*int*/[] ptr = new long /*int*/[1];
-			rc = variant.GetAsArray (currentType, iid, count, ptr);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			if (ptr[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-			nsID id = new nsID ();
-			XPCOM.memmove (id, iid, nsID.sizeof);
-			C.free (iid);
-
-			long /*int*/[] result = new long /*int*/[1];
-			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;
-
-			if (id.Equals (IIDStore.GetIID (nsIVariant.class))) {
-				arrayReturn = new Object[count[0]];
-				for (int i = 0; i < count[0]; i++) {
-					long /*int*/[] arrayPtr = new long /*int*/[1];
-					C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);
-					nsISupports supports = new nsISupports (arrayPtr[0]);
-					rc = supports.QueryInterface (id, result);
-					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-					if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-					supports.Release ();
-
-					nsIVariant currentVariant = new nsIVariant (result[0]);
-					result[0] = 0;
-					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-					try {
-						arrayReturn[i] = convertToJava (currentVariant);
-						currentVariant.Release ();
-					} catch (IllegalArgumentException e) {
-						/* invalid argument value type */
-						currentVariant.Release ();
-						memory.Free (ptr[0]);
-						memory.Release ();
-						throw e;
-					}
-				}
-			} else {
-				switch (currentType[0]) {
-					case nsIDataType.VTYPE_DOUBLE:
-						arrayReturn = new Object[count[0]];
-						for (int i = 0; i < count[0]; i++) {
-							double[] doubleValue = new double[1];
-							C.memmove (doubleValue, ptr[0] + i * 8, 8);
-							arrayReturn[i] = new Double (doubleValue[0]);
-						}
-						break;
-					case nsIDataType.VTYPE_BOOL:
-						arrayReturn = new Object[count[0]];
-						for (int i = 0; i < count[0]; i++) {
-							/* mozilla's representation of boolean changed from 4 bytes to 1 byte as of XULRunner 4.x */
-							if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
-								byte[] byteValue = new byte[1];
-								C.memmove (byteValue, ptr[0] + i, 1);
-								arrayReturn[i] = new Boolean (byteValue[0] != 0);
-							} else {
-								int[] boolValue = new int[1]; /* PRUInt32 */
-								C.memmove (boolValue, ptr[0] + i * 4, 4);
-								arrayReturn[i] = new Boolean (boolValue[0] != 0);
-							}
-						}
-						break;
-					case nsIDataType.VTYPE_INT32:
-						arrayReturn = new Object[count[0]];
-						for (int i = 0; i < count[0]; i++) {
-							int[] intValue = new int[1]; /* PRInt32 */
-							C.memmove (intValue, ptr[0] + i * 4, 4);
-							arrayReturn[i] = new Double (intValue[0]);
-						}
-						break;
-					case nsIDataType.VTYPE_WCHAR_STR:
-						arrayReturn = new Object[count[0]];
-						for (int i = 0; i < count[0]; i++) {
-							long /*int*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
-							long /*int*/[] stringPtr = new long /*int*/[1];
-							C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
-							int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
-							char[] dest = new char[length];
-							XPCOM.memmove (dest, stringPtr[0], length * 2);
-							arrayReturn[i] = new String (dest);
-						}
-						break;
-					default:
-						memory.Free (ptr[0]);
-						memory.Release ();
-						SWT.error (SWT.ERROR_INVALID_ARGUMENT);
-				}
-			}
-			memory.Free (ptr[0]);
-			memory.Release ();
-			return arrayReturn;
-	}
-	SWT.error (SWT.ERROR_INVALID_ARGUMENT);
-	return null;
-}
-
-static nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
-	long /*int*/[] result = new long /*int*/[1];
-	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_VARIANT_CONTRACTID, true);
-	int rc = componentManager.CreateInstanceByContractID (aContractID, 0, IIDStore.GetIID (nsIWritableVariant.class), result);
-	nsIWritableVariant variant = new nsIWritableVariant (result[0]);
-	result[0] = 0;
-
-	if (value == null) {
-		rc = variant.SetAsEmpty ();
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		return variant;
-	}
-	if (value instanceof String) {
-		String stringValue = (String)value;
-		int length = stringValue.length ();
-		char[] chars = new char[length];
-		stringValue.getChars (0, length, chars, 0);
-		rc = variant.SetAsWStringWithSize (length, chars);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		return variant;
-	}
-	if (value instanceof Boolean) {
-		Boolean booleanValue = (Boolean)value;
-		rc = variant.SetAsBool (booleanValue.booleanValue () ? 1 : 0);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		return variant;
-	}
-	if (value instanceof Number) {
-		Number numberValue = (Number)value;
-		rc = variant.SetAsDouble (numberValue.doubleValue ());
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		return variant;
-	}
-	if (value instanceof Object[]) {
-		Object[] arrayValue = (Object[])value;
-		int length = arrayValue.length;
-		if (length == 0) {
-			rc = variant.SetAsEmptyArray ();
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		} else {
-			long /*int*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
-			for (int i = 0; i < length; i++) {
-				Object currentObject = arrayValue[i];
-				try {
-					nsIVariant currentVariant = convertToJS (currentObject, componentManager);
-					C.memmove (arrayPtr + C.PTR_SIZEOF * i, new long /*int*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
-				} catch (SWTException e) {
-					/* invalid return value type */
-					C.free (arrayPtr);
-					variant.Release ();
-					/* release the variants that had previously been added to the array */
-					for (int j = 0; j < i; j++) {
-						long /*int*/[] ptr = new long /*int*/[1];
-						C.memmove (ptr, arrayPtr + C.PTR_SIZEOF * j, C.PTR_SIZEOF);
-						new nsISupports (ptr[0]).Release ();
-					}
-					throw e;
-				}
-			}
-			long /*int*/ idPtr = C.malloc (nsID.sizeof);
-			XPCOM.memmove (idPtr, IIDStore.GetIID (nsIVariant.class), nsID.sizeof);
-			rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
-			C.free (idPtr);
-			C.free (arrayPtr);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		}
-		return variant;
-	}
-
-	variant.Release ();
-	SWT.error (SWT.ERROR_INVALID_RETURN_VALUE);
-	return null;
-}
-
-static long /*int*/ invokeFunction (int functionId, long /*int*/ tokenVariant, long /*int*/ args) {
-	Integer key = new Integer (functionId);
-	BrowserFunction function = Mozilla.AllFunctions.get (key);
-	Object returnValue = null;
-
-	if (function != null) {
-		try {
-			nsIVariant variant = new nsIVariant (tokenVariant);
-			Object temp = convertToJava (variant);
-			if (temp instanceof String) {
-				String token = (String)temp;
-				if (token.equals (function.token)) {
-					variant = new nsIVariant (args);
-					temp = convertToJava (variant);
-					if (temp instanceof Object[]) {
-						Object[] arguments = (Object[])temp;
-						try {
-							returnValue = function.function (arguments);
-						} catch (Exception e) {
-							/* exception during function invocation */
-							returnValue = WebBrowser.CreateErrorString (e.getLocalizedMessage ());
-						}
-					}
-				}
-			}
-		} catch (IllegalArgumentException e) {
-			/* invalid argument value type */
-			if (function.isEvaluate) {
-				/* notify the evaluate function so that a java exception can be thrown */
-				function.function (new String[] {WebBrowser.CreateErrorString (new SWTException (SWT.ERROR_INVALID_RETURN_VALUE).getLocalizedMessage ())});
-			}
-			returnValue = WebBrowser.CreateErrorString (e.getLocalizedMessage ());
-		}
-	}
-
-	long /*int*/[] result = new long /*int*/[1];
-	int 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;
-	nsIVariant variant;
-	try {
-		variant = convertToJS (returnValue, componentManager);
-	} catch (SWTException e) {
-		/* invalid return value type */
-		variant = convertToJS (WebBrowser.CreateErrorString (e.getLocalizedMessage ()), componentManager);
-	}
-	componentManager.Release ();
-
-	return variant.getAddress ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	classInfo = new XPCOMObject (new int[] {2, 0, 0, 2, 2, 1, 1, 1, 1, 1, 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 getInterfaces (args[0], args[1]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return getContractID (args[0]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return getClassDescription (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return getClassID (args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return getImplementationLanguage (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return getFlags (args[0]);}
-		@Override
-		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*/ 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 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]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (classInfo != null) {
-		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;
-	}
-}
-
-long /*int*/ getAddress () {
-	return external.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIClassInfo.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);
-		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;
-		}
-	}
-
-	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
-	return XPCOM.NS_ERROR_NO_INTERFACE;
-}
-
-int Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIClassInfo */
-
-int getClassDescription (long /*int*/ _retValue) {
-	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 (_retValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-	memory.Release ();
-
-	return XPCOM.NS_OK;
-}
-
-int getClassID (long /*int*/ _retValue) {
-	return XPCOM.NS_OK;
-}
-
-int getClassIDNoAlloc (long /*int*/ _retValue) {
-	return XPCOM.NS_OK;
-}
-
-int getContractID (long /*int*/ _retValue) {
-	return XPCOM.NS_OK;
-}
-
-int getFlags (long /*int*/ flags) {
-	C.memmove (flags, new int[] {nsIClassInfo.DOM_OBJECT}, 4); /* PRUint32 */
-	return XPCOM.NS_OK;
-}
-
-int getHelperForLanguage (int language, long /*int*/ _retValue) {
-	C.memmove (_retValue, new long /*int*/[] {0}, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-
-int getImplementationLanguage (long /*int*/ _retValue) {
-	C.memmove (_retValue, new int[] {5}, 4); /* nsIProgrammingLanguage.JAVA */ /* PRUint */
-	return XPCOM.NS_OK;
-}
-
-int getInterfaces (long /*int*/ count, long /*int*/ array) {
-	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;
-	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 (3 * C.PTR_SIZEOF);
-	C.memmove (ptrArray, new long /*int*/[] {securityCheckedComponentIID}, 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[] {2}, 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;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java
deleted file mode 100644
index ef74678ca0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-
-class ExternalFactory {
-	XPCOMObject supports;
-	XPCOMObject factory;
-	int refCount = 0;
-
-ExternalFactory () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 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 CreateInstance (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (factory != null) {
-		factory.dispose ();
-		factory = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return factory.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIFactory */
-
-int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
-	External external = new External ();
-	external.AddRef ();
-	XPCOM.memmove (result, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-
-int LockFactory (int lock) {
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java
deleted file mode 100644
index 2385c8e63e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-class FilePicker {
-	XPCOMObject supports;
-	XPCOMObject filePicker;
-
-	int refCount = 0;
-	short mode;
-	long /*int*/ parentHandle;
-	String[] files, masks;
-	String defaultFilename, directory, title;
-
-	static final String SEPARATOR = System.getProperty ("file.separator"); //$NON-NLS-1$
-
-FilePicker () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 Init (args[0], args[1], (short)args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
-		@Override
-		public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
-		@Override
-		public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
-		@Override
-		public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
-		@Override
-		public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
-		@Override
-		public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (filePicker != null) {
-		filePicker.dispose ();
-		filePicker = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return filePicker.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIFilePicker.class))) {
-		XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-Browser getBrowser (long /*int*/ aDOMWindow) {
-	if (aDOMWindow == 0) return null;
-	return Mozilla.getBrowser (aDOMWindow);
-}
-
-/*
- * As of Mozilla 1.8 some of nsIFilePicker's string arguments changed type.  This method
- * answers a java string based on the type of string that is appropriate for the Mozilla
- * version being used.
- */
-String parseAString (long /*int*/ string) {
-	return null;
-}
-
-/* nsIFilePicker */
-
-int Init (long /*int*/ parent, long /*int*/ title, short mode) {
-	parentHandle = parent;
-	this.mode = mode;
-	this.title = parseAString (title);
-	return XPCOM.NS_OK;
-}
-
-int Show (long /*int*/ _retval) {
-	if (mode == nsIFilePicker.modeGetFolder) {
-		/* picking a directory */
-		int result = showDirectoryPicker ();
-		XPCOM.memmove (_retval, new short[] {(short)result}, 2); /* PRInt16 */
-		return XPCOM.NS_OK;
-	}
-
-	/* picking a file */
-	int style = mode == nsIFilePicker.modeSave ? SWT.SAVE : SWT.OPEN;
-	if (mode == nsIFilePicker.modeOpenMultiple) style |= SWT.MULTI;
-	Browser browser = getBrowser (parentHandle);
-	Shell parent = null;
-	if (browser != null) {
-		parent = browser.getShell ();
-	} else {
-		parent = new Shell ();
-	}
-	FileDialog dialog = new FileDialog (parent, style);
-	if (title != null) dialog.setText (title);
-	if (directory != null) dialog.setFilterPath (directory);
-	if (masks != null) dialog.setFilterExtensions (masks);
-	if (defaultFilename != null) dialog.setFileName (defaultFilename);
-	String filename = dialog.open ();
-	files = dialog.getFileNames ();
-	directory = dialog.getFilterPath ();
-	title = defaultFilename = null;
-	masks = null;
-	int result = filename == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;
-	XPCOM.memmove (_retval, new short[] {(short)result}, 2); /* PRInt16 */
-	return XPCOM.NS_OK;
-}
-
-int showDirectoryPicker () {
-	Browser browser = getBrowser (parentHandle);
-	Shell parent = null;
-	if (browser != null) {
-		parent = browser.getShell ();
-	} else {
-		parent = new Shell ();
-	}
-	DirectoryDialog dialog = new DirectoryDialog (parent, SWT.NONE);
-	if (title != null) dialog.setText (title);
-	if (directory != null) dialog.setFilterPath (directory);
-	directory = dialog.open ();
-	title = defaultFilename = null;
-	files = masks = null;
-	return directory == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;
-}
-
-int GetFiles (long /*int*/ aFiles) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetFileURL (long /*int*/ aFileURL) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetFile (long /*int*/ aFile) {
-	String filename = "";	//$NON-NLS-1$
-	if (directory != null) filename += directory + SEPARATOR;
-	if (files != null && files.length > 0) filename += files[0];
-	nsEmbedString path = new nsEmbedString (filename);
-	long /*int*/[] file = new long /*int*/[1];
-	int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
-	path.dispose ();
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (file[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-	XPCOM.memmove (aFile, file, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-
-int SetDisplayDirectory (long /*int*/ aDisplayDirectory) {
-	if (aDisplayDirectory == 0) return XPCOM.NS_OK;
-	nsILocalFile file = new nsILocalFile (aDisplayDirectory);
-	nsEmbedString pathname = new nsEmbedString ();
-	int rc = file.GetPath (pathname.getAddress());
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	directory = pathname.toString ();
-	pathname.dispose ();
-	return XPCOM.NS_OK;
-}
-
-int GetDisplayDirectory (long /*int*/ aDisplayDirectory) {
-	String directoryName = directory != null ? directory : "";	//$NON-NLS-1$
-	nsEmbedString path = new nsEmbedString (directoryName);
-	long /*int*/[] file = new long /*int*/[1];
-	int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
-	path.dispose ();
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (file[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-	XPCOM.memmove (aDisplayDirectory, file, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-
-int SetFilterIndex (int aFilterIndex) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetFilterIndex (long /*int*/ aFilterIndex) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetDefaultExtension (long /*int*/ aDefaultExtension) {
-	/* note that the type of argument 1 changed as of Mozilla 1.8 */
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDefaultExtension (long /*int*/ aDefaultExtension) {
-	/* note that the type of argument 1 changed as of Mozilla 1.8 */
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetDefaultString (long /*int*/ aDefaultString) {
-	defaultFilename = parseAString (aDefaultString);
-	return XPCOM.NS_OK;
-}
-
-int GetDefaultString (long /*int*/ aDefaultString) {
-	/* note that the type of argument 1 changed as of Mozilla 1.8 */
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int AppendFilter (long /*int*/ title, long /*int*/ filter) {
-	/* note that the type of arguments 1 and 2 changed as of Mozilla 1.8 */
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int AppendFilters (int filterMask) {
-	String[] addFilters = null;
-	switch (filterMask) {
-		case nsIFilePicker.filterAll:
-		case nsIFilePicker.filterApps:
-			masks = null;			/* this is equivalent to no filter */
-			break;
-		case nsIFilePicker.filterHTML:
-			addFilters = new String[] {"*.htm;*.html"}; //$NON-NLS-1$
-			break;
-		case nsIFilePicker.filterImages:
-			addFilters = new String[] {"*.gif;*.jpeg;*.jpg;*.png"};	//$NON-NLS-1$
-			break;
-		case nsIFilePicker.filterText:
-			addFilters = new String[] {"*.txt"};	//$NON-NLS-1$
-			break;
-		case nsIFilePicker.filterXML:
-			addFilters = new String[] {"*.xml"};	//$NON-NLS-1$
-			break;
-		case nsIFilePicker.filterXUL:
-			addFilters = new String[] {"*.xul"};	//$NON-NLS-1$
-			break;
-	}
-	if (masks == null) {
-		masks = addFilters;
-	} else {
-		if (addFilters != null) {
-			String[] newFilters = new String[masks.length + addFilters.length];
-			System.arraycopy (masks, 0, newFilters, 0, masks.length);
-			System.arraycopy (addFilters, 0, newFilters, masks.length, addFilters.length);
-			masks = newFilters;
-		}
-	}
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java
deleted file mode 100644
index b0e5e03d6d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-
-class FilePickerFactory {
-	XPCOMObject supports;
-	XPCOMObject factory;
-	int refCount = 0;
-
-FilePickerFactory () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 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 CreateInstance (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (factory != null) {
-		factory.dispose ();
-		factory = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return factory.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIFactory */
-
-int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
-		FilePicker_10 picker = new FilePicker_10 ();
-		picker.AddRef ();
-		XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
-	} else if (Mozilla.IsXULRunner) {
-		FilePicker_1_8 picker = new FilePicker_1_8 ();
-		picker.AddRef ();
-		XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
-	} else {
-		FilePicker picker = new FilePicker ();
-		picker.AddRef ();
-		XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
-	}
-	return XPCOM.NS_OK;
-}
-
-int LockFactory (int lock) {
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_10.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_10.java
deleted file mode 100644
index 47fd33e02c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_10.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.mozilla.*;
-
-class FilePicker_10 extends FilePicker_1_8 {
-
-@Override
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 Init (args[0], args[1], (short)args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
-		@Override
-		public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
-		@Override
-		public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
-		@Override
-		public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
-		@Override
-		public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
-		@Override
-		public long /*int*/ method17 (long /*int*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-		@Override
-		public long /*int*/ method18 (long /*int*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-		@Override
-		public long /*int*/ method19 (long /*int*/[] args) {return Show (args[0]);}
-	};
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_1_8.java
deleted file mode 100644
index e0d309dc2e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_1_8.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2012 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.mozilla.*;
-
-class FilePicker_1_8 extends FilePicker {
-
-@Override
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 Init (args[0], args[1], (short)args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
-		@Override
-		public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
-		@Override
-		public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
-		@Override
-		public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
-		@Override
-		public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
-		@Override
-		public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}
-	};
-}
-
-/*
- * As of Mozilla 1.8 some of nsIFilePicker's string arguments changed type.  This method
- * answers a java string based on the type of string that is appropriate for the Mozilla
- * version being used.
- */
-@Override
-String parseAString (long /*int*/ string) {
-	return new nsEmbedString (string).toString ();
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java
deleted file mode 100644
index 3b1c2a3dba..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class implements the nsIHelperAppLauncherDialog interface for mozilla
- * versions 1.4 - 1.8.x.  For mozilla versions >= 1.9 this interface is
- * implemented by class HelperAppLauncherDialog_1_9.  HelperAppLauncherDialogFactory
- * determines at runtime which of these classes to instantiate.
- */
-class HelperAppLauncherDialog {
-	XPCOMObject supports;
-	XPCOMObject helperAppLauncherDialog;
-	int refCount = 0;
-
-HelperAppLauncherDialog () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) {
-		@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 Show (args[0], args[1], (int)/*64*/args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (helperAppLauncherDialog != null) {
-		helperAppLauncherDialog.dispose ();
-		helperAppLauncherDialog = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return helperAppLauncherDialog.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.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 Release () {
-	refCount--;
-	/*
-	* Note.  This instance lives as long as the download it is binded to.
-	* Its reference count is expected to go down to 0 when the download
-	* has completed or when it has been cancelled. E.g. when the user
-	* cancels the File Dialog, cancels or closes the Download Dialog
-	* and when the Download Dialog goes away after the download is completed.
-	*/
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIHelperAppLauncherDialog */
-
-int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
-	/*
-	 * The interface for nsIHelperAppLauncher changed as of mozilla 1.8.  Query the received
-	 * nsIHelperAppLauncher for the new interface, and if it is not found then fall back to
-	 * the old interface.
-	 */
-	nsISupports supports = new nsISupports (aLauncher);
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = supports.QueryInterface (IIDStore.GetIID (nsIHelperAppLauncher_1_8.class), result);
-	if (rc == XPCOM.NS_OK) {	/* >= 1.8 */
-		nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
-		rc = helperAppLauncher.SaveToDisk (0, 0);
-		helperAppLauncher.Release ();
-		return rc;
-	}
-	nsIHelperAppLauncher helperAppLauncher = new nsIHelperAppLauncher (aLauncher);	/* < 1.8 */
-	return helperAppLauncher.SaveToDisk (0, 0);
-}
-
-int PromptForSaveToFile (long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {
-	long /*int*/ aDefaultFile, aSuggestedFileExtension, _retval;
-	boolean hasLauncher = false;
-
-	/*
-	* The interface for nsIHelperAppLauncherDialog changed as of mozilla 1.5 when an
-	* extra argument was added to the PromptForSaveToFile method (this resulted in all
-	* subsequent arguments shifting right).  The workaround is to provide an XPCOMObject
-	* that fits the newer API, and to use the first argument's type to infer whether
-	* the old or new nsIHelperAppLauncherDialog interface is being used (and by extension
-	* the ordering of the arguments).  In mozilla >= 1.5 the first argument is an
-	* nsIHelperAppLauncher.
-	*/
-	/*
-	 * The interface for nsIHelperAppLauncher changed as of mozilla 1.8, so the first
-	 * argument must be queried for both the old and new nsIHelperAppLauncher interfaces.
-	 */
- 	boolean using_1_8 = false;
-	nsISupports support = new nsISupports (arg0);
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = support.QueryInterface (IIDStore.GetIID (nsIHelperAppLauncher_1_8.class), result);
-	if (rc == XPCOM.NS_OK) {
-		using_1_8 = true;
-		hasLauncher = true;
-		new nsISupports (result[0]).Release ();
-	} else {
-		result[0] = 0;
-		rc = support.QueryInterface (IIDStore.GetIID (nsIHelperAppLauncher.class, MozillaVersion.VERSION_BASE), result);
-		if (rc == XPCOM.NS_OK) {
-			hasLauncher = true;
-			new nsISupports (result[0]).Release ();
-		}
-	}
-	result[0] = 0;
-
-	if (hasLauncher) {	/* >= 1.5 */
-		aDefaultFile = arg2;
-		aSuggestedFileExtension = arg3;
-		_retval = arg4;
-	} else {			/* 1.4 */
-		aDefaultFile = arg1;
-		aSuggestedFileExtension = arg2;
-		_retval = arg3;
-	}
-
-	int length = XPCOM.strlen_PRUnichar (aDefaultFile);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDefaultFile, length * 2);
-	String defaultFile = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aSuggestedFileExtension);
-	dest = new char[length];
-	XPCOM.memmove (dest, aSuggestedFileExtension, length * 2);
-	String suggestedFileExtension = new String (dest);
-
-	Shell shell = new Shell ();
-	FileDialog fileDialog = new FileDialog (shell, SWT.SAVE);
-	fileDialog.setFileName (defaultFile);
-	fileDialog.setFilterExtensions (new String[] {suggestedFileExtension});
-	String name = fileDialog.open ();
-	shell.close ();
-	if (name == null) {
-		if (hasLauncher) {
-			if (using_1_8) {
-				nsIHelperAppLauncher_1_8 launcher = new nsIHelperAppLauncher_1_8 (arg0);
-				rc = launcher.Cancel (XPCOM.NS_BINDING_ABORTED);
-			} else {
-				nsIHelperAppLauncher launcher = new nsIHelperAppLauncher (arg0);
-				rc = launcher.Cancel ();
-			}
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			return XPCOM.NS_OK;
-		}
-		return XPCOM.NS_ERROR_FAILURE;
-	}
-	nsEmbedString path = new nsEmbedString (name);
-	rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
-	path.dispose ();
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-	/* Our own nsIDownload has been registered during the Browser initialization. It will be invoked by Mozilla. */
-	XPCOM.memmove (_retval, result, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
deleted file mode 100644
index 4b788cc2fc..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-
-class HelperAppLauncherDialogFactory {
-	XPCOMObject supports;
-	XPCOMObject factory;
-	int refCount = 0;
-
-HelperAppLauncherDialogFactory () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 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 CreateInstance (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (factory != null) {
-		factory.dispose ();
-		factory = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return factory.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIFactory */
-
-int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
-	if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_9)) {
-		HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog ();
-		helperAppLauncherDialog.AddRef ();
-		XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
-	} else if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)){
-		HelperAppLauncherDialog_1_9 helperAppLauncherDialog = new HelperAppLauncherDialog_1_9 ();
-		helperAppLauncherDialog.AddRef ();
-		XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
-	} else {
-		HelperAppLauncherDialog_10 helperAppLauncherDialog = new HelperAppLauncherDialog_10 ();
-		helperAppLauncherDialog.AddRef ();
-		XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
-	}
-	return XPCOM.NS_OK;
-}
-
-int LockFactory (int lock) {
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java
deleted file mode 100644
index b6b2905385..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class implements the nsIHelperAppLauncherDialog interface for mozilla
- * versions >= 10.  For earlier mozilla versions this interface is implemented
- * by class HelperAppLauncherDialog(_1_9).  HelperAppLauncherDialogFactory
- * determines at runtime which of these classes to instantiate.
- */
-class HelperAppLauncherDialog_10 extends HelperAppLauncherDialog_1_9 {
-	XPCOMObject supports;
-	XPCOMObject helperAppLauncherDialog;
-	int refCount = 0;
-
-HelperAppLauncherDialog_10 () {
-	createCOMInterfaces ();
-}
-
-/* nsIHelperAppLauncherDialog */
-
-@Override
-int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
-	nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
-	return helperAppLauncher.SaveToDisk (0, 0);
-}
-
-@Override
-int PromptForSaveToFile (long /*int*/ aLauncher, long /*int*/ aWindowContext, long /*int*/ aDefaultFileName, long /*int*/ aSuggestedFileExtension, int aForcePrompt, long /*int*/ _retval) {
-	int length = XPCOM.strlen_PRUnichar (aDefaultFileName);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDefaultFileName, length * 2);
-	String defaultFile = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aSuggestedFileExtension);
-	dest = new char[length];
-	XPCOM.memmove (dest, aSuggestedFileExtension, length * 2);
-	String suggestedFileExtension = new String (dest);
-
-	Shell shell = new Shell ();
-	FileDialog fileDialog = new FileDialog (shell, SWT.SAVE);
-	fileDialog.setFileName (defaultFile);
-	fileDialog.setFilterExtensions (new String[] {suggestedFileExtension});
-	String name = fileDialog.open ();
-	shell.close ();
-	if (name == null) {
-		nsICancelable launcher = new nsICancelable (aLauncher);
-		int rc = launcher.Cancel (XPCOM.NS_BINDING_ABORTED);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		return XPCOM.NS_ERROR_FAILURE;
-	}
-	nsEmbedString path = new nsEmbedString (name);
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
-	path.dispose ();
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-	/* Our own nsIDownload has been registered during the Browser initialization. It will be invoked by Mozilla. */
-	XPCOM.memmove (_retval, result, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
deleted file mode 100644
index 1361d6f184..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class implements the nsIHelperAppLauncherDialog interface for mozilla
- * versions 1.9.x.x.  For other mozilla versions this interface is implemented
- * by class HelperAppLauncherDialog(_10).  HelperAppLauncherDialogFactory
- * determines at runtime which of these classes to instantiate.
- */
-class HelperAppLauncherDialog_1_9 {
-	XPCOMObject supports;
-	XPCOMObject helperAppLauncherDialog;
-	int refCount = 0;
-
-HelperAppLauncherDialog_1_9 () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {
-		@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 Show (args[0], args[1], (int)/*64*/args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (helperAppLauncherDialog != null) {
-		helperAppLauncherDialog.dispose ();
-		helperAppLauncherDialog = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return helperAppLauncherDialog.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IHELPERAPPLAUNCHERDIALOG_1_9_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.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 Release () {
-	refCount--;
-	/*
-	* Note.  This instance lives as long as the download it is bound to.
-	* Its reference count is expected to go down to 0 when the download
-	* has completed or when it has been cancelled. E.g. when the user
-	* cancels the File Dialog, cancels or closes the Download Dialog
-	* and when the Download Dialog goes away after the download is completed.
-	*/
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIHelperAppLauncherDialog */
-
-int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
-	nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
-	return helperAppLauncher.SaveToDisk (0, 0);
-}
-
-int PromptForSaveToFile (long /*int*/ aLauncher, long /*int*/ aWindowContext, long /*int*/ aDefaultFileName, long /*int*/ aSuggestedFileExtension, int aForcePrompt, long /*int*/ _retval) {
-	int length = XPCOM.strlen_PRUnichar (aDefaultFileName);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDefaultFileName, length * 2);
-	String defaultFile = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aSuggestedFileExtension);
-	dest = new char[length];
-	XPCOM.memmove (dest, aSuggestedFileExtension, length * 2);
-	String suggestedFileExtension = new String (dest);
-
-	Shell shell = new Shell ();
-	FileDialog fileDialog = new FileDialog (shell, SWT.SAVE);
-	fileDialog.setFileName (defaultFile);
-	fileDialog.setFilterExtensions (new String[] {suggestedFileExtension});
-	String name = fileDialog.open ();
-	shell.close ();
-	if (name == null) {
-		nsIHelperAppLauncher_1_8 launcher = new nsIHelperAppLauncher_1_8 (aLauncher);
-		int rc = launcher.Cancel (XPCOM.NS_BINDING_ABORTED);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		return XPCOM.NS_ERROR_FAILURE;
-	}
-	nsEmbedString path = new nsEmbedString (name);
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
-	path.dispose ();
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-	/* Our own nsIDownload has been registered during the Browser initialization. It will be invoked by Mozilla. */
-	XPCOM.memmove (_retval, result, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java
deleted file mode 100644
index caaeef02a0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-
-class InputStream {
-	XPCOMObject inputStream;
-	int refCount = 0;
-
-	byte[] buffer;
-	int index = 0;
-
-InputStream (byte[] buffer) {
-	this.buffer = buffer;
-	index = 0;
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	inputStream = new XPCOMObject (new int[] {2, 0, 0, 0, 1, 3, 4, 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 Close ();}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return Available (args[0]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return IsNonBlocking (args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (inputStream != null) {
-		inputStream.dispose ();
-		inputStream = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return inputStream.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIInputStream.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIInputStream implementation */
-
-int Close () {
-	buffer = null;
-	index = 0;
-	return XPCOM.NS_OK;
-}
-
-int Available (long /*int*/ _retval) {
-	int available = buffer == null ? 0 : buffer.length - index;
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24))
-		XPCOM.memmove (_retval, new long[] {available}, 8);
-	else
-		XPCOM.memmove (_retval, new int[] {available}, 4);
-	return XPCOM.NS_OK;
-}
-
-int Read(long /*int*/ aBuf, int aCount, long /*int*/ _retval) {
-	int max = Math.min (aCount, buffer == null ? 0 : buffer.length - index);
-	if (max > 0) {
-		byte[] src = new byte[max];
-		System.arraycopy (buffer, index, src, 0, max);
-		XPCOM.memmove (aBuf, src, max);
-		index += max;
-	}
-	XPCOM.memmove(_retval, new int[] {max}, 4);
-	return XPCOM.NS_OK;
-}
-
-int ReadSegments (long /*int*/ aWriter, long /*int*/ aClosure, int aCount, long /*int*/ _retval) {
-	int max = buffer == null ? 0 : buffer.length - index;
-	if (aCount != -1) {
-		max = Math.min (max, aCount);
-	}
-	int cnt = max;
-	while (cnt > 0) {
-		int[] aWriteCount = new int[1];
-		long /*int*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);
-		if (rc != XPCOM.NS_OK) break;
-		index += aWriteCount[0];
-		cnt -= aWriteCount[0];
-	}
-	XPCOM.memmove (_retval, new int[] {max - cnt}, 4);
-	return XPCOM.NS_OK;
-}
-
-int IsNonBlocking (long /*int*/ _retval) {
-	/* blocking */
-	XPCOM.memmove (_retval, new boolean[] {false});
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
deleted file mode 100644
index 397161f745..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+++ /dev/null
@@ -1,5311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *     Neil Rashbrook <neil@parkwaycc.co.uk> - Bug 429739
- *     Matthew Painter <matthew.painter@import.io>
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.nio.charset.*;
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.internal.mozilla.init.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-class Mozilla extends WebBrowser {
-	long /*int*/ embedHandle;
-	nsIWebBrowser webBrowser;
-	Object webBrowserObject;
-	MozillaDelegate delegate;
-
-	/* Interfaces for this Mozilla embedding notification */
-	XPCOMObject supports;
-	XPCOMObject weakReference;
-	XPCOMObject webProgressListener;
-	XPCOMObject webProgressListener_24;
-	XPCOMObject	webBrowserChrome;
-	XPCOMObject webBrowserChromeFocus;
-	XPCOMObject embeddingSiteWindow;
-	XPCOMObject embeddingSiteWindow_24;
-	XPCOMObject interfaceRequestor;
-	XPCOMObject supportsWeakReference;
-	XPCOMObject contextMenuListener;
-	XPCOMObject uriContentListener;
-	XPCOMObject tooltipListener;
-	XPCOMObject domEventListener;
-	XPCOMObject badCertListener;
-
-	int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;
-	int registerFunctionsOnState = 0;
-	int refCount, lastKeyCode, lastCharCode, authCount;
-	long /*int*/ request, badCertRequest;
-	Point location, size;
-	boolean visible, isActive, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText;
-	boolean updateLastNavigateUrl;
-	Shell tip = null;
-	Listener listener;
-	List<LONG> unhookedDOMWindows = new ArrayList<> ();
-	String lastNavigateURL;
-	byte[] htmlBytes;
-
-	static nsIAppShell AppShell;
-	static AppFileLocProvider LocationProvider;
-	static WindowCreator2 WindowCreator;
-	static int BrowserCount, NextJSFunctionIndex = 1;
-	static Map<Integer, BrowserFunction> AllFunctions = new HashMap<> ();
-	static Listener DisplayListener;
-	static boolean Initialized, IsXULRunner, PerformedVersionCheck, XPCOMWasGlued, XPCOMInitWasGlued;
-	static boolean IsGettingSiteWindow;
-	static String MozillaPath;
-	static String oldProxyHostFTP, oldProxyHostHTTP, oldProxyHostSSL;
-	static int oldProxyPortFTP = -1, oldProxyPortHTTP = -1, oldProxyPortSSL = -1, oldProxyType = -1;
-	static byte[] jsLibPathBytes;
-	static byte[] pathBytes_NSFree;
-
-	/* XULRunner detect constants */
-	static final String GCC3 = "-gcc3"; //$NON-NLS-1$
-	static final String GRERANGE_LOWER = "1.8.1.2"; //$NON-NLS-1$
-	static final String GRERANGE_LOWER_FALLBACK = "1.8"; //$NON-NLS-1$
-	static final boolean LowerRangeInclusive = true;
-	static final String GRERANGE_UPPER = "1.9.*"; //$NON-NLS-1$
-	static final boolean UpperRangeInclusive = true;
-	static final String PROPERTY_ABI = "abi"; //$NON-NLS-1$
-
-	static final int MAX_PORT = 65535;
-	static final String DEFAULTVALUE_STRING = "default"; //$NON-NLS-1$
-	static final char SEPARATOR_OS = System.getProperty ("file.separator").charAt (0); //$NON-NLS-1$
-	static final String ABOUT_BLANK = "about:blank"; //$NON-NLS-1$
-	static final String DISPOSE_LISTENER_HOOKED = "org.eclipse.swt.browser.Mozilla.disposeListenerHooked"; //$NON-NLS-1$
-	static final String HEADER_CONTENTLENGTH = "content-length"; //$NON-NLS-1
-	static final String HEADER_CONTENTTYPE = "content-type"; //$NON-NLS-1
-	static final String MIMETYPE_FORMURLENCODED = "application/x-www-form-urlencoded"; //$NON-NLS-1$
-	static final String MOZILLA_FIVE_HOME = "MOZILLA_FIVE_HOME"; //$NON-NLS-1$
-	static final String PREFIX_JAVASCRIPT = "javascript:"; //$NON-NLS-1$
-	static final String PREFERENCE_CHARSET = "intl.charset.default"; //$NON-NLS-1$
-	static final String PREFERENCE_DISABLEOPENDURINGLOAD = "dom.disable_open_during_load"; //$NON-NLS-1$
-	static final String PREFERENCE_DISABLEOPENWINDOWSTATUSHIDE = "dom.disable_window_open_feature.status"; //$NON-NLS-1$
-	static final String PREFERENCE_DISABLEWINDOWSTATUSCHANGE = "dom.disable_window_status_change"; //$NON-NLS-1$
-	static final String PREFERENCE_JAVASCRIPTENABLED = "javascript.enabled"; //$NON-NLS-1$
-	static final String PREFERENCE_LANGUAGES = "intl.accept_languages"; //$NON-NLS-1$
-	static final String PREFERENCE_PROXYHOST_FTP = "network.proxy.ftp"; //$NON-NLS-1$
-	static final String PREFERENCE_PROXYPORT_FTP = "network.proxy.ftp_port"; //$NON-NLS-1$
-	static final String PREFERENCE_PROXYHOST_HTTP = "network.proxy.http"; //$NON-NLS-1$
-	static final String PREFERENCE_PROXYPORT_HTTP = "network.proxy.http_port"; //$NON-NLS-1$
-	static final String PREFERENCE_PROXYHOST_SSL = "network.proxy.ssl"; //$NON-NLS-1$
-	static final String PREFERENCE_PROXYPORT_SSL = "network.proxy.ssl_port"; //$NON-NLS-1$
-	static final String PREFERENCE_PROXYTYPE = "network.proxy.type"; //$NON-NLS-1$
-	static final String PROFILE_AFTER_CHANGE = "profile-after-change"; //$NON-NLS-1$
-	static final String PROFILE_BEFORE_CHANGE = "profile-before-change"; //$NON-NLS-1$
-	static final String PROFILE_DIR = SEPARATOR_OS + "eclipse" + SEPARATOR_OS; //$NON-NLS-1$
-	static final String PROFILE_DO_CHANGE = "profile-do-change"; //$NON-NLS-1$
-	static final String PROPERTY_PROXYPORT = "network.proxy_port"; //$NON-NLS-1$
-	static final String PROPERTY_PROXYHOST = "network.proxy_host"; //$NON-NLS-1$
-	static final String SEPARATOR_LOCALE = "-"; //$NON-NLS-1$
-	static final String SHUTDOWN_PERSIST = "shutdown-persist"; //$NON-NLS-1$
-	static final String STARTUP = "startup"; //$NON-NLS-1$
-	static final String TOKENIZER_LOCALE = ","; //$NON-NLS-1$
-	static final String TRUE = "true"; //$NON-NLS-1$
-	static final String URI_FILEROOT = "file:///"; //$NON-NLS-1$
-	static final String MOZILLA_PROFILE_PATH = "org.eclipse.swt.browser.MOZ_PROFILE_PATH"; //$NON-NLS-1$
-	static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath"; //$NON-NLS-1$
-
-	// TEMPORARY CODE
-	static final String FACTORIES_REGISTERED = "org.eclipse.swt.browser.MozillaFactoriesRegistered"; //$NON-NLS-1$
-	static final String GRE_INITIALIZED = "org.eclipse.swt.browser.XULRunnerInitialized"; //$NON-NLS-1$
-
-	static {
-		DisplayListener = new Listener () {
-			@Override
-			public void handleEvent (Event event) {
-				if (BrowserCount > 0) return; /* another display is still active */
-
-				long /*int*/[] result = new long /*int*/[1];
-				int 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;
-				byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
-				rc = serviceManager.GetServiceByContractID (buffer, IIDStore.GetIID (nsIObserverService.class), result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-				nsIObserverService observerService = new nsIObserverService (result[0]);
-				result[0] = 0;
-				buffer = MozillaDelegate.wcsToMbcs (null, PROFILE_BEFORE_CHANGE, true);
-				int length = SHUTDOWN_PERSIST.length ();
-				char[] chars = new char [length + 1];
-				SHUTDOWN_PERSIST.getChars (0, length, chars, 0);
-				rc = observerService.NotifyObservers (0, buffer, chars);
-				if (rc != XPCOM.NS_OK) error (rc);
-				observerService.Release ();
-
-				if (LocationProvider != null) {
-					String prefsLocation = LocationProvider.profilePath + AppFileLocProvider.PREFERENCES_FILE;
-					nsEmbedString pathString = new nsEmbedString (prefsLocation);
-					rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-					if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-					pathString.dispose ();
-
-					nsILocalFile localFile = new nsILocalFile (result [0]);
-					result[0] = 0;
-					rc = localFile.QueryInterface (IIDStore.GetIID (nsIFile.class), result);
-					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-					if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-					localFile.Release ();
-
-					nsIFile prefFile = new nsIFile (result[0]);
-					result[0] = 0;
-
-					buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFSERVICE_CONTRACTID, true);
-					rc = serviceManager.GetServiceByContractID (buffer, IIDStore.GetIID (nsIPrefService.class), result);
-					if (rc != XPCOM.NS_OK) error (rc);
-					if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-					nsIPrefService prefService = new nsIPrefService (result[0]);
-					result[0] = 0;
-					revertProxySettings (prefService);
-					rc = prefService.SavePrefFile (prefFile.getAddress ());
-					prefService.Release ();
-
-					prefFile.Release ();
-				}
-				serviceManager.Release ();
-
-				if (XPCOMWasGlued) {
-					/*
-					* The following is intentionally commented because it causes subsequent
-					* browser instantiations within the process to fail.  Mozilla does not
-					* support being unloaded and then re-initialized in a process, see
-					* http://www.mail-archive.com/dev-embedding@lists.mozilla.org/msg01732.html .
-					*/
-
-//					int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
-//					/* alloc memory for two structs, the second is empty to signify the end of the list */
-//					long /*int*/ ptr = C.malloc (size * 2);
-//					C.memset (ptr, 0, size * 2);
-//					nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
-//					byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_TermEmbedding", true); //$NON-NLS-1$
-//					functionLoad.functionName = C.malloc (bytes.length);
-//					C.memmove (functionLoad.functionName, bytes, bytes.length);
-//					functionLoad.function = C.malloc (C.PTR_SIZEOF);
-//					C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
-//					XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
-//					XPCOM.XPCOMGlueLoadXULFunctions (ptr);
-//					C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
-//					long /*int*/ functionPtr = result[0];
-//					result[0] = 0;
-//					C.free (functionLoad.function);
-//					C.free (functionLoad.functionName);
-//					C.free (ptr);
-//					XPCOM.Call (functionPtr);
-
-//					XPCOM.XPCOMGlueShutdown ();
-					XPCOMWasGlued = false;
-				}
-				if (XPCOMInitWasGlued) {
-					XPCOMInit.XPCOMGlueShutdown ();
-					XPCOMInitWasGlued = false;
-				}
-				Initialized = PerformedVersionCheck = false;
-			}
-
-			void revertProxySettings (nsIPrefService prefService) {
-				/* the proxy settings are typically not set, so check for this first */
-				boolean hostSet = oldProxyHostFTP != null || oldProxyHostHTTP != null || oldProxyHostSSL != null;
-				if (!hostSet && oldProxyPortFTP == -1 && oldProxyPortHTTP == -1 && oldProxyPortSSL == -1 && oldProxyType == -1) return;
-
-				long /*int*/[] result = new long /*int*/[1];
-				byte[] buffer = new byte[1];
-				int rc = prefService.GetBranch (buffer, result);	/* empty buffer denotes root preference level */
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-				nsIPrefBranch prefBranch = new nsIPrefBranch (result[0]);
-				result[0] = 0;
-
-				if (hostSet) {
-					rc = XPCOM.NS_GetComponentManager (result);
-					if (rc != XPCOM.NS_OK) error (rc);
-					if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-					nsIComponentManager componentManager = new nsIComponentManager (result[0]);
-					result[0] = 0;
-
-					byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-					rc = componentManager.CreateInstanceByContractID (contractID, 0, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-					if (rc != XPCOM.NS_OK) error (rc);
-					if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-					nsIPrefLocalizedString localizedString = new nsIPrefLocalizedString (result[0]);
-					result[0] = 0;
-
-					if (oldProxyHostFTP != null) {
-						buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_FTP, true);
-						if (oldProxyHostFTP.equals (DEFAULTVALUE_STRING)) {
-							rc = prefBranch.ClearUserPref (buffer);
-							if (rc != XPCOM.NS_OK) error (rc);
-						} else {
-							int length = oldProxyHostFTP.length ();
-							char[] charBuffer = new char[length];
-							oldProxyHostFTP.getChars (0, length, charBuffer, 0);
-							rc = localizedString.SetDataWithLength (length, charBuffer);
-							if (rc != XPCOM.NS_OK) error (rc);
-							rc = prefBranch.SetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), localizedString.getAddress ());
-							if (rc != XPCOM.NS_OK) error (rc);
-						}
-					}
-
-					if (oldProxyHostHTTP != null) {
-						buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_HTTP, true);
-						if (oldProxyHostHTTP.equals (DEFAULTVALUE_STRING)) {
-							rc = prefBranch.ClearUserPref (buffer);
-							if (rc != XPCOM.NS_OK) error (rc);
-						} else {
-							int length = oldProxyHostHTTP.length ();
-							char[] charBuffer = new char[length];
-							oldProxyHostHTTP.getChars (0, length, charBuffer, 0);
-							rc = localizedString.SetDataWithLength (length, charBuffer);
-							if (rc != XPCOM.NS_OK) error (rc);
-							rc = prefBranch.SetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), localizedString.getAddress ());
-							if (rc != XPCOM.NS_OK) error (rc);
-						}
-					}
-
-					if (oldProxyHostSSL != null) {
-						buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_SSL, true);
-						if (oldProxyHostSSL.equals (DEFAULTVALUE_STRING)) {
-							rc = prefBranch.ClearUserPref (buffer);
-							if (rc != XPCOM.NS_OK) error (rc);
-						} else {
-							int length = oldProxyHostSSL.length ();
-							char[] charBuffer = new char[length];
-							oldProxyHostSSL.getChars (0, length, charBuffer, 0);
-							rc = localizedString.SetDataWithLength (length, charBuffer);
-							if (rc != XPCOM.NS_OK) error (rc);
-							rc = prefBranch.SetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), localizedString.getAddress ());
-							if (rc != XPCOM.NS_OK) error (rc);
-						}
-					}
-
-					localizedString.Release ();
-					componentManager.Release ();
-				}
-
-				if (oldProxyPortFTP != -1) {
-					buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYPORT_FTP, true);
-					rc = prefBranch.SetIntPref (buffer, oldProxyPortFTP);
-					if (rc != XPCOM.NS_OK) error (rc);
-				}
-				if (oldProxyPortHTTP != -1) {
-					buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYPORT_HTTP, true);
-					rc = prefBranch.SetIntPref (buffer, oldProxyPortHTTP);
-					if (rc != XPCOM.NS_OK) error (rc);
-				}
-				if (oldProxyPortSSL != -1) {
-					buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYPORT_SSL, true);
-					rc = prefBranch.SetIntPref (buffer, oldProxyPortSSL);
-					if (rc != XPCOM.NS_OK) error (rc);
-				}
-				if (oldProxyType != -1) {
-					buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYTYPE, true);
-					rc = prefBranch.SetIntPref (buffer, oldProxyType);
-					if (rc != XPCOM.NS_OK) error (rc);
-				}
-
-				prefBranch.Release ();
-			}
-		};
-
-		MozillaClearSessions = () -> {
-			if (!Initialized) return;
-			long /*int*/[] result = new long /*int*/[1];
-			int 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;
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIEMANAGER_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsICookieManager.class), result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-			serviceManager.Release ();
-
-			nsICookieManager manager = new nsICookieManager (result[0]);
-			result[0] = 0;
-			rc = manager.GetEnumerator (result);
-			if (rc != XPCOM.NS_OK) error (rc);
-
-			nsISimpleEnumerator enumerator = new nsISimpleEnumerator (result[0]);
-			int[] moreElements = new int[1]; /* PRBool */
-			rc = enumerator.HasMoreElements (moreElements);
-			if (rc != XPCOM.NS_OK) error (rc);
-			while (moreElements[0] != 0) {
-				result[0] = 0;
-				rc = enumerator.GetNext (result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				nsICookie cookie = new nsICookie (result[0]);
-				long[] expires = new long[1];
-				rc = cookie.GetExpires (expires);
-				if (expires[0] == 0) {
-					/* indicates a session cookie */
-					long /*int*/ domain = XPCOM.nsEmbedCString_new ();
-					long /*int*/ name = XPCOM.nsEmbedCString_new ();
-					long /*int*/ path = XPCOM.nsEmbedCString_new ();
-					cookie.GetHost (domain);
-					cookie.GetName (name);
-					cookie.GetPath (path);
-					rc = manager.Remove (domain, name, path, 0);
-					XPCOM.nsEmbedCString_delete (domain);
-					XPCOM.nsEmbedCString_delete (name);
-					XPCOM.nsEmbedCString_delete (path);
-					if (rc != XPCOM.NS_OK) error (rc);
-				}
-				cookie.Release ();
-				rc = enumerator.HasMoreElements (moreElements);
-				if (rc != XPCOM.NS_OK) error (rc);
-			}
-			enumerator.Release ();
-			manager.Release ();
-		};
-
-		MozillaGetCookie = () -> {
-			if (!Initialized) return;
-
-			long /*int*/[] result = new long /*int*/[1];
-			int 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 = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, IIDStore.GetIID (nsIIOService.class), result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-			nsIIOService ioService = new nsIIOService (result[0]);
-			result[0] = 0;
-			byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
-			long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
-			rc = ioService.NewURI (aSpec, null, 0, result);
-			XPCOM.nsEmbedCString_delete (aSpec);
-			ioService.Release ();
-			if (rc != XPCOM.NS_OK) {
-				serviceManager.Release ();
-				return;
-			}
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-
-			nsIURI aURI = new nsIURI (result[0]);
-			result[0] = 0;
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsICookieService.class), result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-			nsICookieService cookieService = new nsICookieService (result[0]);
-			result[0] = 0;
-			rc = cookieService.GetCookieString (aURI.getAddress(), 0, result);
-			cookieService.Release ();
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) {
-				aURI.Release ();
-				serviceManager.Release ();
-				return;
-			}
-			long /*int*/ cookieString = result[0];
-			result[0] = 0;
-			aURI.Release ();
-			serviceManager.Release ();
-
-			int length = C.strlen (cookieString);
-			bytes = new byte[length];
-			XPCOM.memmove (bytes, cookieString, length);
-
-			/*
-			 * NS_Free was introduced in mozilla 1.8, prior to this the standard free() call
-			 * was to be used.  Try to free the cookie string with NS_Free first, and if it fails
-			 * then assume that an older mozilla is being used, and use C's free() instead.
-			 */
-			if (pathBytes_NSFree == null) {
-				String mozillaPath = getMozillaPath ();
-				mozillaPath += MozillaDelegate.getLibraryName (mozillaPath) + '\0';
-				pathBytes_NSFree = mozillaPath.getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$
-			}
-			if (!XPCOM.NS_Free (pathBytes_NSFree, cookieString)) {
-				C.free (cookieString);
-			}
-
-			String allCookies = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-			StringTokenizer tokenizer = new StringTokenizer (allCookies, ";"); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens ()) {
-				String cookie = tokenizer.nextToken ();
-				int index = cookie.indexOf ('=');
-				if (index != -1) {
-					String name = cookie.substring (0, index).trim ();
-					if (name.equals (CookieName)) {
-						CookieValue = cookie.substring (index + 1).trim ();
-						return;
-					}
-				}
-			}
-		};
-
-		MozillaSetCookie = () -> {
-			if (!Initialized) return;
-
-			long /*int*/[] result = new long /*int*/[1];
-			int 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 = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, IIDStore.GetIID (nsIIOService.class), result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-			nsIIOService ioService = new nsIIOService (result[0]);
-			result[0] = 0;
-			byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
-			long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
-			rc = ioService.NewURI (aSpec, null, 0, result);
-			XPCOM.nsEmbedCString_delete (aSpec);
-			ioService.Release ();
-			if (rc != XPCOM.NS_OK) {
-				serviceManager.Release ();
-				return;
-			}
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-
-			nsIURI aURI = new nsIURI(result[0]);
-			result[0] = 0;
-			byte[] aCookie = MozillaDelegate.wcsToMbcs (null, CookieValue, true);
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsICookieService.class), result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-			nsICookieService cookieService = new nsICookieService (result[0]);
-			result[0] = 0;
-			rc = cookieService.SetCookieString (aURI.getAddress(), 0, aCookie, 0);
-			cookieService.Release ();
-			aURI.Release ();
-			serviceManager.Release ();
-			CookieResult = rc == 0;
-		};
-	}
-
-static String Arch () {
-	String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
-	if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
-	if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$
-	if (osArch.equals ("IA64N")) return "ia64_32"; //$NON-NLS-1$ $NON-NLS-2$
-	if (osArch.equals ("IA64W")) return "ia64"; //$NON-NLS-1$ $NON-NLS-2$
-	return osArch;
-}
-
-static String OS() {
-	String osName = System.getProperty("os.name"); //$NON-NLS-1$
-	if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$
-	if (osName.equals ("AIX")) return "aix"; //$NON-NLS-1$ $NON-NLS-2$
-	if (osName.equals ("Solaris") || osName.equals ("SunOS")) return "solaris"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
-	if (osName.equals ("HP-UX")) return "hpux"; //$NON-NLS-1$ $NON-NLS-2$
-	if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$
-	if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$
-	return osName;
-}
-
-static void LoadLibraries () {
-	boolean initLoaded = false;
-
-	if (Boolean.getBoolean (GRE_INITIALIZED)) {
-		/*
-		 * Another browser has already initialized xulrunner in this process,
-		 * so just bind to it instead of trying to initialize a new one.
-		 */
-		Initialized = true;
-	}
-
-	MozillaPath = System.getProperty (XULRUNNER_PATH);
-	/*
-	* Browser clients that ship XULRunner in a plug-in must have an opportunity
-	* to set the org.eclipse.swt.browser.XULRunnerPath system property to point
-	* at their XULRunner before the first Mozilla-based Browser is created.  To
-	* facilitate this, reflection is used to reference non-existent class
-	* org.eclipse.swt.browser.XULRunnerInitializer the first time a Mozilla-
-	* based Browser is created.   A client wishing to use this hook can do so
-	* by creating a fragment of org.eclipse.swt that implements this class and
-	* sets the system property in its static initializer.
-	*/
-	if (MozillaPath == null) {
-		try {
-			Class.forName ("org.eclipse.swt.browser.XULRunnerInitializer"); //$NON-NLS-1$
-			MozillaPath = System.getProperty (XULRUNNER_PATH);
-		} catch (ClassNotFoundException e) {
-			/* no fragment is providing this class, which is the typical case */
-		}
-	}
-
-	if (MozillaPath == null) {
-		try {
-			String libName = MozillaDelegate.getSWTInitLibraryName ();
-			Library.loadLibrary (libName);
-			initLoaded = true;
-		} catch (UnsatisfiedLinkError e) {
-			/*
-			* If this library failed to load then do not attempt to detect a
-			* xulrunner to use.  The Browser may still be usable if MOZILLA_FIVE_HOME
-			* points at a GRE.
-			*/
-		}
-	} else {
-		/* ensure that client-supplied path is using correct separators */
-		if (SEPARATOR_OS == '/') {
-			MozillaPath = MozillaPath.replace ('\\', SEPARATOR_OS);
-		} else {
-			MozillaPath = MozillaPath.replace ('/', SEPARATOR_OS);
-		}
-
-		MozillaPath += SEPARATOR_OS;
-		MozillaPath += MozillaDelegate.getLibraryName (MozillaPath);
-		IsXULRunner = true;
-	}
-
-	if (initLoaded) {
-		/* attempt to discover a XULRunner to use as the GRE */
-		MozillaPath = InitDiscoverXULRunner ();
-		IsXULRunner = MozillaPath.length () > 0;
-
-		/*
-		 * Test whether the detected XULRunner can be used as the GRE before loading swt's
-		 * XULRunner library.  If it cannot be used then fall back to attempting to use
-		 * the GRE pointed to by MOZILLA_FIVE_HOME.
-		 *
-		 * One case where this will fail is attempting to use a 64-bit xulrunner while swt
-		 * is running in 32-bit mode, or vice versa.
-		 */
-		if (IsXULRunner) {
-			byte[] bytes = MozillaDelegate.wcsToMbcs (null, MozillaPath, true);
-			int rc = XPCOMInit.XPCOMGlueStartup (bytes);
-			if (rc != XPCOM.NS_OK) {
-				MozillaPath = MozillaPath.substring (0, MozillaPath.lastIndexOf (SEPARATOR_OS));
-				if (Device.DEBUG) System.out.println ("cannot use detected XULRunner: " + MozillaPath); //$NON-NLS-1$
-
-				/* attempt to XPCOMGlueStartup the GRE pointed at by MOZILLA_FIVE_HOME */
-				long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, MOZILLA_FIVE_HOME, true));
-				if (ptr == 0) {
-					IsXULRunner = false;
-				} else {
-					int length = C.strlen (ptr);
-					bytes = new byte[length];
-					C.memmove (bytes, ptr, length);
-					MozillaPath = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-					/*
-					 * Attempting to XPCOMGlueStartup a mozilla-based GRE != xulrunner can
-					 * crash, so don't attempt unless the GRE appears to be xulrunner.
-					 */
-					if (MozillaPath.indexOf ("xulrunner") == -1) { //$NON-NLS-1$
-						IsXULRunner = false;
-					} else {
-						MozillaPath += SEPARATOR_OS;
-						MozillaPath += MozillaDelegate.getLibraryName (MozillaPath);
-						bytes = MozillaDelegate.wcsToMbcs (null, MozillaPath, true);
-						rc = XPCOMInit.XPCOMGlueStartup (bytes);
-						if (rc == XPCOM.NS_OK) {
-							/* ensure that client-supplied path is using correct separators */
-							if (SEPARATOR_OS == '/') {
-								MozillaPath = MozillaPath.replace ('\\', SEPARATOR_OS);
-							} else {
-								MozillaPath = MozillaPath.replace ('/', SEPARATOR_OS);
-							}
-						} else {
-							IsXULRunner = false;
-							MozillaPath = MozillaPath.substring (0, MozillaPath.lastIndexOf (SEPARATOR_OS));
-							if (Device.DEBUG) System.out.println ("failed to start as XULRunner: " + MozillaPath); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-			if (IsXULRunner) {
-				XPCOMInitWasGlued = true;
-			}
-		}
-	}
-}
-
-@Override
-public void create (Composite parent, int style) {
-	delegate = new MozillaDelegate (browser);
-	final Display display = parent.getDisplay ();
-
-	long /*int*/[] result = new long /*int*/[1];
-	if (!Initialized) {
-		LoadLibraries ();
-
-		if (IsXULRunner) {
-			/* load swt's xulrunner library and invoke XPCOMGlueStartup to load xulrunner's dependencies */
-			MozillaPath = initXULRunner (MozillaPath);
-		} else {
-			/*
-			* If style SWT.MOZILLA was specified then this initialization has already
-			* failed, because SWT.MOZILLA-style Browsers must utilize XULRunner.
-			*/
-			if ((style & SWT.MOZILLA) != 0) {
-				browser.dispose ();
-				String errorString = (MozillaPath != null && MozillaPath.length () > 0) ?
-					" [Failed to use detected XULRunner: " + MozillaPath + "]" :
-					" [Could not detect registered XULRunner to use]";	//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				SWT.error (SWT.ERROR_NO_HANDLES, null, errorString);
-			}
-
-			/* load swt's mozilla library */
-			MozillaPath = initMozilla (MozillaPath);
-		}
-
-		if (!Initialized) {
-			/* create LocationProvider, which tells mozilla where to find things on the file system */
-			String profilePath = System.getProperty (MOZILLA_PROFILE_PATH);
-			if (profilePath != null && profilePath.length() > 0) {
-				/* ensure that client-supplied path is using correct separators */
-				if (SEPARATOR_OS == '/') {
-					profilePath = profilePath.replace ('\\', SEPARATOR_OS);
-				} else {
-					profilePath = profilePath.replace ('/', SEPARATOR_OS);
-				}
-			} else {
-				profilePath = MozillaDelegate.getProfilePath ();
-			}
-			String cacheParentPath = MozillaDelegate.getCacheParentPath ();
-			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) */
-			initXPCOM (MozillaPath, IsXULRunner);
-		}
-
-		/* attempt to initialize JavaXPCOM in the detected XULRunner */
-		if (IsXULRunner) initJavaXPCOM (MozillaPath);
-
-		/* get the nsIComponentManager and nsIServiceManager, used throughout initialization */
-		int rc = XPCOM.NS_GetComponentManager (result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-		if (result[0] == 0) {
-			browser.dispose ();
-			error (XPCOM.NS_NOINTERFACE);
-		}
-		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
-		result[0] = 0;
-
-		rc = XPCOM.NS_GetServiceManager (result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-		if (result[0] == 0) {
-			browser.dispose ();
-			error (XPCOM.NS_NOINTERFACE);
-		}
-		nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-		result[0] = 0;
-
-		/* init the event handler if needed */
-		initSpinup (componentManager);
-
-		/*
-		 * Check for the property indicating that factories have already been registered,
-		 * in which case this browser should not overwrite them with its own.
-		 */
-		boolean factoriesRegistered = Boolean.getBoolean (FACTORIES_REGISTERED);
-
-		/* init our WindowCreator, which mozilla uses for the creation of child browsers in external Shells */
-		if (!factoriesRegistered) {
-			initWindowCreator (serviceManager);
-		}
-
-		/* notify mozilla that the profile directory has been changed from its default value */
-		initProfile (serviceManager, IsXULRunner);
-
-		/* init preference values that give desired mozilla behaviours */
-		initPreferences (serviceManager, componentManager);
-
-		/* init our various factories that mozilla can invoke as needed */
-		if (!factoriesRegistered) {
-			initFactories (serviceManager, componentManager, IsXULRunner);
-		}
-
-		serviceManager.Release ();
-		componentManager.Release ();
-
-		/* add cookies that were set by a client before the first Mozilla instance was created */
-		if (MozillaPendingCookies != null) {
-			SetPendingCookies (MozillaPendingCookies);
-		}
-		MozillaPendingCookies = null;
-
-		Initialized = true;
-	}
-
-	BrowserCount++;
-
-	if (display.getData (DISPOSE_LISTENER_HOOKED) == null) {
-		display.setData (DISPOSE_LISTENER_HOOKED, DISPOSE_LISTENER_HOOKED);
-		display.addListener (SWT.Dispose, DisplayListener);
-	}
-
-	/* get the nsIComponentManager, used throughout initialization */
-	int rc = XPCOM.NS_GetComponentManager (result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);
-	}
-	nsIComponentManager componentManager = new nsIComponentManager (result[0]);
-	result[0] = 0;
-
-	/* create the nsIWebBrowser instance */
-	rc = componentManager.CreateInstance (MozillaVersion.CheckVersion(MozillaVersion.VERSION_XR31) ? XPCOM.NS_IWEBBROWSER_31_CID : XPCOM.NS_IWEBBROWSER_CID, 0, IIDStore.GetIID (nsIWebBrowser.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);
-	}
-	webBrowser = new nsIWebBrowser (result[0]);
-	result[0] = 0;
-
-	/* create the instance-based callback interfaces */
-	createCOMInterfaces ();
-	AddRef ();
-
-	/* init the nsIWebBrowser's container and base windows */
-	initWebBrowserWindows ();
-
-	if (!PerformedVersionCheck) {
-		/* The Mozilla version is currently either known to be 24.x or 10.x, or is assumed to be 1.9.2.x */
-		PerformedVersionCheck = true;
-
-		rc = componentManager.QueryInterface (IIDStore.GetIID (nsIComponentRegistrar.class), result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-		if (result[0] == 0) {
-			browser.dispose ();
-			error (XPCOM.NS_NOINTERFACE);
-		}
-		nsIComponentRegistrar componentRegistrar = new nsIComponentRegistrar (result[0]);
-		result[0] = 0;
-
-		/*
-		* Check for the property indicating that factories have already been registered,
-		* in which case this browser should not overwrite them with its own.
-		*/
-		boolean factoriesRegistered = Boolean.getBoolean (FACTORIES_REGISTERED);
-
-		/*
-		* If the version is earlier than 10.x then query for the IID of nsIDocShell from
-		* various mozilla releases to determine more precisely which version is being used.
-		*/
-		if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
-			rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIInterfaceRequestor.class), result);
-			if (rc != XPCOM.NS_OK) {
-				browser.dispose ();
-				error (XPCOM.NS_ERROR_FAILURE);
-			}
-			if (result[0] == 0) {
-				browser.dispose ();
-				error (XPCOM.NS_ERROR_NO_INTERFACE);
-			}
-			nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
-			result[0] = 0;
-
-			for (int i = MozillaVersion.VERSION_XR1_9_2; MozillaVersion.VERSION_BASE <= i; i--) {
-				nsID iid = IIDStore.GetIID (nsIDocShell.class, i, true);
-				if (iid != null) {
-					result[0] = 0;
-					rc = interfaceRequestor.GetInterface (iid, result);
-					if (rc == XPCOM.NS_OK && result[0] != 0) {
-						new nsISupports (result[0]).Release ();
-						MozillaVersion.SetCurrentVersion (i);
-						break;
-					}
-				}
-			}
-			interfaceRequestor.Release ();
-			result[0] = 0;
-		}
-
-		/*
-		* A Download factory for contract "Transfer" must be registered iff the GRE's version is 1.8.x.
-		*   Check for the availability of the 1.8 implementation of nsIDocShell to determine if the
-		*   GRE's version is 1.8.x.
-		* If the GRE version is < 1.8 then the previously-registered Download factory for contract
-		*   "Download" will be used.
-		* If the GRE version is >= 1.9 then no Download factory is registered because this
-		*   functionality is provided by the GRE.
-		*/
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_8, true)) {
-			if (!factoriesRegistered) {
-				DownloadFactory_1_8 downloadFactory_1_8 = new DownloadFactory_1_8 ();
-				downloadFactory_1_8.AddRef ();
-				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_TRANSFER_CONTRACTID, true);
-				byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "swtTransfer", true); //$NON-NLS-1$
-				rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName, aContractID, downloadFactory_1_8.getAddress ());
-				if (rc != XPCOM.NS_OK) {
-					browser.dispose ();
-					error (rc);
-				}
-				downloadFactory_1_8.Release ();
-			}
-		}
-		componentRegistrar.Release ();
-
-		if (!factoriesRegistered) {
-			HelperAppLauncherDialogFactory dialogFactory = new HelperAppLauncherDialogFactory ();
-			dialogFactory.AddRef ();
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID, true);
-			byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "swtHelperAppLauncherDialog", true); //$NON-NLS-1$
-			rc = componentRegistrar.RegisterFactory (XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CID, aClassName, aContractID, dialogFactory.getAddress ());
-			if (rc != XPCOM.NS_OK) {
-				browser.dispose ();
-				error (rc);
-			}
-			dialogFactory.Release ();
-		}
-
-		System.setProperty (FACTORIES_REGISTERED, TRUE);
-	}
-	componentManager.Release ();
-
-	/*
-	 * Bug in XULRunner 1.9.  On win32, Mozilla does not clear its background before content has
-	 * been set into it.  As a result, embedders appear broken if they do not immediately display
-	 * a URL or text.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=453523.
-	 *
-	 * The workaround is to subclass the Mozilla window and clear it whenever WM_ERASEBKGND is received.
-	 * This subclass should be removed once content has been set into the browser.
-	 */
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_9)) {
-		delegate.addWindowSubclass ();
-	}
-
-	/* add listeners for progress and content */
-	rc = webBrowser.AddWebBrowserListener (weakReference.getAddress (), IIDStore.GetIID (nsIWebProgressListener.class));
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	rc = webBrowser.SetParentURIContentListener (uriContentListener.getAddress ());
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-
-	delegate.init ();
-
-	listener = event -> {
-		switch (event.type) {
-			case SWT.Dispose: {
-				/* make this handler run after other dispose listeners */
-				if (ignoreDispose) {
-					ignoreDispose = false;
-					break;
-				}
-				ignoreDispose = true;
-				browser.notifyListeners (event.type, event);
-				event.type = SWT.NONE;
-				onDispose (event.display);
-				break;
-			}
-			case SWT.Resize: onResize (); break;
-			case SWT.FocusIn: {
-				Activate ();
-
-				/* if tabbing onto a page for the first time then full-Browser focus ring should be shown */
-
-				long /*int*/[] result1 = new long /*int*/[1];
-				int rc1 = XPCOM.NS_GetServiceManager (result1);
-				if (rc1 != XPCOM.NS_OK) error (rc1);
-				if (result1[0] == 0) error (XPCOM.NS_NOINTERFACE);
-				nsIServiceManager serviceManager = new nsIServiceManager (result1[0]);
-				result1[0] = 0;
-				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_FOCUSMANAGER_CONTRACTID, true);
-				rc1 = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIFocusManager.class), result1);
-				serviceManager.Release ();
-
-				if (rc1 == XPCOM.NS_OK && result1[0] != 0) {
-					nsIFocusManager focusManager = new nsIFocusManager (result1[0]);
-					result1[0] = 0;
-					rc1 = focusManager.GetFocusedElement (result1);
-					if (rc1 == XPCOM.NS_OK) {
-						if (result1[0] != 0) {
-							new nsISupports (result1[0]).Release ();
-							result1[0] = 0;
-						} else {
-							/* show full browser focus ring */
-							rc1 = webBrowser.GetContentDOMWindow (result1);
-							if (rc1 == XPCOM.NS_OK && result1[0] != 0) {
-								nsIDOMWindow domWindow = new nsIDOMWindow (result1[0]);
-								result1[0] = 0;
-								rc1 = domWindow.GetDocument (result1);
-								domWindow.Release ();
-								if (rc1 == XPCOM.NS_OK && result1[0] != 0) {
-									nsIDOMDocument domDocument = new nsIDOMDocument (result1[0]);
-									result1[0] = 0;
-									rc1 = domDocument.GetDocumentElement (result1);
-									domDocument.Release ();
-									if (rc1 == XPCOM.NS_OK && result1[0] != 0) {
-										rc1 = focusManager.SetFocus (result1[0], nsIFocusManager.FLAG_BYKEY);
-										new nsISupports(result1[0]).Release ();
-										result1[0] = 0;
-									}
-								}
-							}
-						}
-					}
-					focusManager.Release ();
-				}
-				break;
-			}
-			case SWT.Activate: Activate (); break;
-			case SWT.Deactivate: {
-				Display display1 = event.display;
-				if (Mozilla.this.browser == display1.getFocusControl ()) Deactivate ();
-				break;
-			}
-			case SWT.Show: {
-				/*
-				* Feature in GTK Mozilla.  Mozilla does not show up when
-				* its container (a GTK fixed handle) is made visible
-				* after having been hidden.  The workaround is to reset
-				* its size after the container has been made visible.
-				*/
-				Display display2 = event.display;
-				display2.asyncExec(() -> {
-					if (browser.isDisposed ()) return;
-					onResize ();
-				});
-				break;
-			}
-		}
-	};
-	int[] folderEvents = new int[] {
-		SWT.Dispose,
-		SWT.Resize,
-		SWT.FocusIn,
-		SWT.Activate,
-		SWT.Deactivate,
-		SWT.Show,
-		SWT.KeyDown,		/* needed to make browser traversable */
-	};
-	for (int i = 0; i < folderEvents.length; i++) {
-		browser.addListener (folderEvents[i], listener);
-	}
-}
-
-@Override
-public boolean back () {
-	htmlBytes = null;
-
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	rc = webNavigation.GoBack ();
-	webNavigation.Release ();
-	return rc == XPCOM.NS_OK;
-}
-
-@Override
-public boolean close () {
-	final boolean[] result = new boolean[] {false};
-	LocationListener[] oldListeners = locationListeners;
-	locationListeners = new LocationListener[] {
-		new LocationAdapter () {
-			@Override
-			public void changing (LocationEvent event) {
-				/* implies that the user did not veto the page unload */
-				result[0] = true;
-			}
-		}
-	};
-	execute ("window.location.replace('about:blank');"); //$NON-NLS-1$
-	locationListeners = oldListeners;
-	return result[0];
-}
-
-void createCOMInterfaces () {
-	// Create each of the interfaces that this object implements
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	weakReference = new XPCOMObject (new int[] {2, 0, 0, 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 QueryReferent (args[0], args[1]);}
-	};
-
-	webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-	};
-
-	webProgressListener_24 = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 4, 4, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2], (int)/*64*/args[3]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-	};
-
-	webBrowserChrome = new XPCOMObject (new int[] {2, 0, 0, 2, 1, 1, 1, 1, 0, 2, 0, 1, 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 SetStatus ((int)/*64*/args[0], args[1]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return GetWebBrowser (args[0]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return SetWebBrowser (args[0]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return GetChromeFlags (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return DestroyBrowserWindow ();}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return ShowAsModal ();}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return IsWindowModal (args[0]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return ExitModalEventLoop ((int)/*64*/args[0]);}
-	};
-
-	webBrowserChromeFocus = new XPCOMObject (new int[] {2, 0, 0, 0, 0}) {
-		@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 FocusNextElement ();}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return FocusPrevElement ();}
-	};
-
-	embeddingSiteWindow = new XPCOMObject (new int[] {2, 0, 0, 5, 5, 0, 1, 1, 1, 1, 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 SetDimensions ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return SetFocus ();}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return GetVisibility (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return SetVisibility ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return GetTitle (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return SetTitle (args[0]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetSiteWindow (args[0]);}
-	};
-
-	embeddingSiteWindow_24 = new XPCOMObject (new int[] {2, 0, 0, 5, 5, 0, 1, 1, 1, 1, 1, 0}) {
-		@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 SetDimensions ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return SetFocus ();}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return GetVisibility (args[0]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return SetVisibility ((int)/*64*/args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return GetTitle (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return SetTitle (args[0]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return GetSiteWindow (args[0]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return Blur ();}
-	};
-
-	interfaceRequestor = new XPCOMObject (new int[] {2, 0, 0, 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 GetInterface (args[0], args[1]);}
-	};
-
-	supportsWeakReference = new XPCOMObject (new int[] {2, 0, 0, 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 GetWeakReference (args[0]);}
-	};
-
-	contextMenuListener = new XPCOMObject (new int[] {2, 0, 0, 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 OnShowContextMenu ((int)/*64*/args[0], args[1], args[2]);}
-	};
-
-	uriContentListener = new XPCOMObject (new int[] {2, 0, 0, 2, 5, 3, 4, 1, 1, 1, 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 OnStartURIOpen (args[0], args[1]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return IsPreferred (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return GetLoadCookie (args[0]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return SetLoadCookie (args[0]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return GetParentContentListener (args[0]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return SetParentContentListener (args[0]);}
-	};
-
-	tooltipListener = new XPCOMObject (new int[] {2, 0, 0, 3, 0}) {
-		@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 OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return OnHideTooltip ();}
-	};
-
-	domEventListener = new XPCOMObject (new int[] {2, 0, 0, 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 HandleEvent (args[0]);}
-	};
-
-	badCertListener = 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*/ 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 NotifyCertProblem (args[0], args[1], args[2], args[3]);}
-	};
-}
-
-@Override
-void deregisterFunction (BrowserFunction function) {
-	super.deregisterFunction (function);
-	AllFunctions.remove (function.index);
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (weakReference != null) {
-		weakReference.dispose ();
-		weakReference = null;
-	}
-	if (webProgressListener != null) {
-		webProgressListener.dispose ();
-		webProgressListener = null;
-	}
-	if (webProgressListener_24 != null) {
-		webProgressListener_24.dispose ();
-		webProgressListener_24 = null;
-	}
-	if (webBrowserChrome != null) {
-		webBrowserChrome.dispose ();
-		webBrowserChrome = null;
-	}
-	if (webBrowserChromeFocus != null) {
-		webBrowserChromeFocus.dispose ();
-		webBrowserChromeFocus = null;
-	}
-	if (embeddingSiteWindow != null) {
-		embeddingSiteWindow.dispose ();
-		embeddingSiteWindow = null;
-	}
-	if (embeddingSiteWindow_24 != null) {
-		embeddingSiteWindow_24.dispose ();
-		embeddingSiteWindow_24 = null;
-	}
-	if (interfaceRequestor != null) {
-		interfaceRequestor.dispose ();
-		interfaceRequestor = null;
-	}
-	if (supportsWeakReference != null) {
-		supportsWeakReference.dispose ();
-		supportsWeakReference = null;
-	}
-	if (contextMenuListener != null) {
-		contextMenuListener.dispose ();
-		contextMenuListener = null;
-	}
-	if (uriContentListener != null) {
-		uriContentListener.dispose ();
-		uriContentListener = null;
-	}
-	if (tooltipListener != null) {
-		tooltipListener.dispose ();
-		tooltipListener = null;
-	}
-	if (domEventListener != null) {
-		domEventListener.dispose ();
-		domEventListener = null;
-	}
-	if (badCertListener != null) {
-		badCertListener.dispose ();
-		badCertListener = null;
-	}
-}
-
-@Override
-public Object evaluate (String script, boolean trusted) throws SWTException {
-	if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24, false)) {
-		return super.evaluate(script);
-	}
-	if (trusted) {
-		return evaluateAsChrome(script);
-	} else {
-		return evaluateInWindow(script);
-	}
-}
-
-/**
- * evaluate in Chrome security context
-*/
-Object evaluateAsChrome (String script) {
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface(IIDStore.GetIID (nsIInterfaceRequestor.class), result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-	nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
-	result[0] = 0;
-	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 = interfaceRequestor.GetInterface (IIDStore.GetIID (nsIDOMWindow.class), result);
-	interfaceRequestor.Release ();
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.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) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-
-	Execute execute = new Execute (result[0]);
-	result[0] = 0;
-	nsEmbedString data = new nsEmbedString ("(function(){" + script + "}())");
-	execute.EvalAsChrome(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;
-}
-
-/**
- * evaluate in Normal security context
-*/
-Object evaluateInWindow (String script) throws SWTException {
-	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 ("(function(){" + 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
-	* ensure that the custom subclass that works around Mozilla bug
-	* https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
-	*/
-	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);
-		rc = execute.EvalInWindow (window, data, result);
-		if (result[0] != 0)
-			new nsIVariant (result[0]).Release ();
-		data.dispose ();
-		execute.Release ();
-		return rc == XPCOM.NS_OK;
-	}
-
-	/*
-	* 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 is to invoke the javascript handler directly via C++, which is
-	* exposed as of mozilla 1.9.
-	*/
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_9)) {
-		int 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;
-		byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_SCRIPTSECURITYMANAGER_CONTRACTID, true);
-		rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIScriptSecurityManager.class), result);
-
-		if (rc == XPCOM.NS_OK && result[0] != 0) {
-			nsIScriptSecurityManager securityManager = new nsIScriptSecurityManager (result[0]);
-			result[0] = 0;
-			rc = securityManager.GetSystemPrincipal (result);
-			securityManager.Release ();
-
-			if (rc == XPCOM.NS_OK && result[0] != 0) {
-				nsIPrincipal principal = new nsIPrincipal (result[0]);
-				result[0] = 0;
-				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 = interfaceRequestor.GetInterface (IIDStore.GetIID (nsIScriptGlobalObject.class), result);
-				interfaceRequestor.Release ();
-
-				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 */
-					if (rc != XPCOM.NS_OK) {
-						new nsISupports (scriptGlobalObject).Release ();
-					} else {
-						long /*int*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
-
-						if (scriptContext != 0) {
-							/* ensure that the received nsIScriptContext implements the expected interface */
-							nsISupports supports = new nsISupports (scriptContext);
-							rc = supports.QueryInterface (IIDStore.GetIID (nsIScriptContext.class), result);
-							if (rc == XPCOM.NS_OK && result[0] != 0) {
-								new nsISupports (result[0]).Release ();
-								result[0] = 0;
-
-								long /*int*/ jsContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
-								if (jsContext != 0) {
-									int length = script.length ();
-									char[] scriptChars = new char[length];
-									script.getChars(0, length, scriptChars, 0);
-									byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
-									rc = principal.GetJSPrincipals (jsContext, result);
-									long /*int*/ principals = 0;
-									if (rc == XPCOM.NS_OK && result[0] != 0) {
-										principals = result[0];
-										result[0] = 0;
-									}
-									byte[] jsLibPath = getJSLibPathBytes ();
-									long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, jsContext);
-									if (globalJSObject != 0) {
-										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) {
-											nsIJSContextStack stack = new nsIJSContextStack (result[0]);
-											result[0] = 0;
-											rc = stack.Push (jsContext);
-											if (rc != XPCOM.NS_OK) {
-												stack.Release ();
-											} else {
-												boolean success;
-												if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_9, true)) {
-													success = XPCOM.JS_EvaluateUCScriptForPrincipals (jsLibPath, jsContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, result) != 0;
-												} else {
-													success = XPCOM.JS_EvaluateUCScriptForPrincipals191 (jsLibPath, jsContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, 0) != 0;
-												}
-												result[0] = 0;
-												rc = stack.Pop (result);
-												stack.Release ();
-												// should principals be Release()d too?
-												new nsISupports (scriptGlobalObject).Release ();
-												principal.Release ();
-												serviceManager.Release ();
-												return success;
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-					new nsISupports (scriptGlobalObject).Release ();
-				}
-				principal.Release ();
-			}
-		}
-		serviceManager.Release ();
-	}
-
-	/* fall back to the pre-1.9 approach */
-
-	String url = PREFIX_JAVASCRIPT + script + ";void(0);";	//$NON-NLS-1$
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	char[] arg = url.toCharArray ();
-	char[] c = new char[arg.length+1];
-	System.arraycopy (arg, 0, c, 0, arg.length);
-	rc = webNavigation.LoadURI (c, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-	webNavigation.Release ();
-	return rc == XPCOM.NS_OK;
-}
-
-static Browser findBrowser (long /*int*/ handle) {
-	return MozillaDelegate.findBrowser (handle);
-}
-
-static Browser getBrowser (long /*int*/ aDOMWindow) {
-	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_WINDOWWATCHER_CONTRACTID, true);
-	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIWindowWatcher.class), result);
-	if (rc != XPCOM.NS_OK) Mozilla.error(rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-	serviceManager.Release ();
-
-	nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
-	result[0] = 0;
-	/* the chrome will only be answered for the top-level nsIDOMWindow */
-	nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
-	rc = window.GetTop (result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-	long /*int*/ topDOMWindow = result[0];
-	result[0] = 0;
-	rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	new nsISupports (topDOMWindow).Release ();
-	windowWatcher.Release ();
-	if (result[0] == 0) return null;	/* the parent chrome is disconnected */
-
-	nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (result[0]);
-	result[0] = 0;
-	rc = webBrowserChrome.QueryInterface (IIDStore.GetIID (nsIEmbeddingSiteWindow.class), result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-	webBrowserChrome.Release ();
-
-	nsIEmbeddingSiteWindow embeddingSiteWindow = new nsIEmbeddingSiteWindow (result[0]);
-	result[0] = 0;
-	IsGettingSiteWindow = true;
-	rc = embeddingSiteWindow.GetSiteWindow (result);
-	IsGettingSiteWindow = false;
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-	embeddingSiteWindow.Release ();
-
-	return findBrowser (result[0]);
-}
-
-@Override
-public boolean forward () {
-	htmlBytes = null;
-
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	rc = webNavigation.GoForward ();
-	webNavigation.Release ();
-
-	return rc == XPCOM.NS_OK;
-}
-
-@Override
-public String getBrowserType () {
-	return "mozilla"; //$NON-NLS-1$
-}
-
-static byte[] getJSLibPathBytes () {
-	if (jsLibPathBytes == null) {
-		String[] names = MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10) ? MozillaDelegate.getJSLibraryNames () : new String[] {MozillaDelegate.getJSLibraryName_Pre10 ()};
-		for (int i = 0; i < names.length; i++) {
-			File file = new File (getMozillaPath (), names[i]);
-			if (file.exists ()) {
-				String pathString = file.getAbsolutePath () + '\0';
-				jsLibPathBytes = pathString.getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$
-				break;
-			}
-		}
-	}
-	return jsLibPathBytes;
-}
-
-static String getMozillaPath () {
-	if (LocationProvider != null) return LocationProvider.mozillaPath;
-	if (!Initialized) return "";
-
-	long /*int*/[] result = new long /*int*/[1];
-	int 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;
-	byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DIRECTORYSERVICE_CONTRACTID, true);
-	rc = serviceManager.GetServiceByContractID (buffer, XPCOM.NS_IDIRECTORYSERVICE_IID, result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-	serviceManager.Release();
-
-	nsISupports directoryService = new nsISupports (result[0]);
-	result[0] = 0;
-	rc = directoryService.QueryInterface (IIDStore.GetIID (nsIProperties.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-	directoryService.Release ();
-
-	nsIProperties properties = new nsIProperties (result[0]);
-	result[0] = 0;
-	buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_GRE_DIR, true);
-	rc = properties.Get (buffer, IIDStore.GetIID (nsIFile.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-	properties.Release ();
-
-	nsIFile mozillaDir = new nsIFile (result[0]);
-	result[0] = 0;
-	nsEmbedString path = new nsEmbedString ();
-	rc = mozillaDir.GetPath (path.getAddress());
-	if (rc != XPCOM.NS_OK) error (rc);
-	String mozillaPath = path.toString ();
-	path.dispose ();
-	mozillaDir.Release ();
-
-	return mozillaPath + SEPARATOR_OS;
-}
-
-@Override
-int getNextFunctionIndex () {
-	return NextJSFunctionIndex++;
-}
-
-@Override
-public String getText () {
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.GetContentDOMWindow (result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-	nsIDOMWindow window = new nsIDOMWindow (result[0]);
-	result[0] = 0;
-	rc = window.GetDocument (result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-	window.Release ();
-
-	long /*int*/ document = result[0];
-	result[0] = 0;
-	rc = XPCOM.NS_GetComponentManager (result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-	nsIComponentManager componentManager = new nsIComponentManager (result[0]);
-	result[0] = 0;
-	byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOMSERIALIZER_CONTRACTID, true);
-	String text = "";
-
-	rc = componentManager.CreateInstanceByContractID (contractID, 0, IIDStore.GetIID (nsIDOMSerializer.class), result);
-	if (rc == XPCOM.NS_OK && result[0] != 0) {
-		nsIDOMSerializer serializer = new nsIDOMSerializer (result[0]);
-		result[0] = 0;
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_8)) {
-			nsEmbedString string = new nsEmbedString ();
-			rc = serializer.SerializeToString (document, string.getAddress());
-			if (rc == XPCOM.NS_OK) {
-				text = string.toString();
-			}
-			string.dispose ();
-		} else {
-			rc = serializer.SerializeToString (document, result);
-			if (rc == XPCOM.NS_OK) {
-				int length = XPCOM.strlen_PRUnichar (result[0]);
-				char[] chars = new char[length];
-				XPCOM.memmove (chars, result[0], length * 2);
-				text = new String (chars);
-			}
-		}
-		serializer.Release ();
-	}
-
-	componentManager.Release ();
-	new nsISupports (document).Release ();
-	return text;
-}
-
-@Override
-public String getUrl () {
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	long /*int*/[] aCurrentURI = new long /*int*/[1];
-	rc = webNavigation.GetCurrentURI (aCurrentURI);
-	if (rc != XPCOM.NS_OK) error (rc);
-	webNavigation.Release ();
-
-	byte[] dest = null;
-	if (aCurrentURI[0] != 0) {
-		nsIURI uri = new nsIURI (aCurrentURI[0]);
-		long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
-		rc = uri.GetSpec (aSpec);
-		if (rc != XPCOM.NS_OK) error (rc);
-		int length = XPCOM.nsEmbedCString_Length (aSpec);
-		long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-		dest = new byte[length];
-		XPCOM.memmove (dest, buffer, length);
-		XPCOM.nsEmbedCString_delete (aSpec);
-		uri.Release ();
-	}
-	if (dest == null) return ""; //$NON-NLS-1$
-
-	String location = new String (dest);
-	/*
-	 * If the URI indicates that the page is being rendered from memory
-	 * (via setText()) then set it to about:blank to be consistent with IE.
-	 */
-	if (location.equals (URI_FILEROOT)) {
-		location = ABOUT_BLANK;
-	} else {
-		int length = URI_FILEROOT.length ();
-		if (location.startsWith (URI_FILEROOT) && location.charAt (length) == '#') {
-			location = ABOUT_BLANK + location.substring (length);
-		}
-	}
-	return location;
-}
-
-@Override
-public Object getWebBrowser () {
-	if ((browser.getStyle () & SWT.MOZILLA) == 0) return null;
-	if (webBrowserObject != null) return webBrowserObject;
-
-	try {
-		Class<?> clazz = Class.forName ("org.mozilla.xpcom.Mozilla"); //$NON-NLS-1$
-		Method method = clazz.getMethod ("getInstance", new Class[0]); //$NON-NLS-1$
-		Object mozilla = method.invoke (null, new Object[0]);
-		method = clazz.getMethod ("wrapXPCOMObject", new Class[] {Long.TYPE, String.class}); //$NON-NLS-1$
-		webBrowserObject = method.invoke (
-			mozilla,
-			new Object[] {
-				new Long (webBrowser.getAddress ()),
-				IIDStore.GetIID (nsIWebBrowser.class).toString ()});
-		/*
-		 * The following AddRef() is needed to offset the automatic Release() that
-		 * will be performed by JavaXPCOM when webBrowserObject is finalized.
-		 */
-		webBrowser.AddRef ();
-		return webBrowserObject;
-	} catch (ClassNotFoundException e) {
-		webBrowserObject = webBrowser;
-		return webBrowserObject;
-	} catch (NoSuchMethodException e) {
-	} catch (IllegalArgumentException e) {
-	} catch (IllegalAccessException e) {
-	} catch (InvocationTargetException e) {
-	}
-	return null;
-}
-
-/**
- * This method attempts to discover XULRunner and if found returns path of
- * the mozilla library, else return empty string.
- *
- * @return string Mozilla path.
- */
-static String InitDiscoverXULRunner () {
-	/*
-	* Up to three XULRunner detection attempts will be made:
-	*
-	* 1. A XULRunner with 1.8.1.2 <= version < 2.0, and with "abi" property matching
-	* the current runtime.  Note that XULRunner registrations began including abi
-	* info as of version 1.9.x, so older versions than this will not be returned.
-	* 2. A XULRunner with 1.8.1.2 <= version < 2.0.  XULRunner 1.8.1.2 is the oldest
-	* release that enables the Browser to expose its JavaXPCOM interfaces to clients.
-	* 3. A XULRunner with 1.8.0.1 <= version < 2.0.
-	*/
-
-	GREVersionRange range = null;
-	try {
-		range = new GREVersionRange ();
-	} catch (NoClassDefFoundError e) {
-		/* Failed to discover XULRunner, return empty string. */
-		return "";
-	} catch (UnsatisfiedLinkError e) {
-		/* Failed to discover XULRunner, return empty string. */
-		return "";
-	}
-	byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
-	long /*int*/ lower = C.malloc (bytes.length);
-	C.memmove (lower, bytes, bytes.length);
-	range.lower = lower;
-	range.lowerInclusive = LowerRangeInclusive;
-
-	bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_UPPER, true);
-	long /*int*/ upper = C.malloc (bytes.length);
-	C.memmove (upper, bytes, bytes.length);
-	range.upper = upper;
-	range.upperInclusive = UpperRangeInclusive;
-
-	GREProperty property = new GREProperty ();
-	bytes = MozillaDelegate.wcsToMbcs (null, PROPERTY_ABI, true);
-	long /*int*/ name = C.malloc (bytes.length);
-	C.memmove (name, bytes, bytes.length);
-	property.property = name;
-	bytes = MozillaDelegate.wcsToMbcs (null, Arch () + GCC3, true);
-	long /*int*/ value = C.malloc (bytes.length);
-	C.memmove (value, bytes, bytes.length);
-	property.value = value;
-
-	int length = XPCOMInit.PATH_MAX;
-	long /*int*/ greBuffer = C.malloc (length);
-	int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 1, greBuffer, length);
-
-	if (rc != XPCOM.NS_OK) {
-		/* Fall back to attempt #2 */
-		rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 0, greBuffer, length); /* note: propertiesLength is 0 */
-		if (rc != XPCOM.NS_OK) {
-			/* Fall back to attempt #3 */
-			C.free (lower);
-			bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER_FALLBACK, true);
-			lower = C.malloc (bytes.length);
-			C.memmove (lower, bytes, bytes.length);
-			range.lower = lower;
-			rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 0, greBuffer, length); /* note: propertiesLength is 0 */
-		}
-	}
-	C.free (value);
-	C.free (name);
-	C.free (lower);
-	C.free (upper);
-
-	String result = null;
-	if (rc == XPCOM.NS_OK) {
-		/* indicates that a XULRunner was found */
-		length = C.strlen (greBuffer);
-		bytes = new byte[length];
-		C.memmove (bytes, greBuffer, length);
-		result = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-	} else {
-		result = ""; //$NON-NLS-1$
-	}
-	C.free (greBuffer);
-	return result;
-}
-
-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) {
-				os.write(buffer, 0, read);
-			}
-			os.close ();
-			is.close ();
-		} catch (FileNotFoundException e) {
-		} catch (IOException e) {
-		}
-	}
-}
-
-void initFactories (nsIServiceManager serviceManager, nsIComponentManager componentManager, boolean isXULRunner) {
-	long /*int*/[] result = new long /*int*/[1];
-
-	int rc = componentManager.QueryInterface (IIDStore.GetIID (nsIComponentRegistrar.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);
-	}
-
-	nsIComponentRegistrar componentRegistrar = new nsIComponentRegistrar (result[0]);
-	result[0] = 0;
-	if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) {
-		componentRegistrar.AutoRegister (0);	 /* detect the External component */
-	}
-
-	PromptService2Factory factory = new PromptService2Factory ();
-	factory.AddRef ();
-	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PROMPTSERVICE_CONTRACTID, true);
-	byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "swtPromptService", true); //$NON-NLS-1$
-	rc = componentRegistrar.RegisterFactory (XPCOM.NS_PROMPTSERVICE_CID, aClassName, aContractID, factory.getAddress ());
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) { /* > 10.x */
-		aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PROMPTER_CONTRACTID, true);
-		aClassName = MozillaDelegate.wcsToMbcs (null, "swtPrompter", true); //$NON-NLS-1$
-		rc = componentRegistrar.RegisterFactory (XPCOM.NS_PROMPTER_CID, aClassName, aContractID, factory.getAddress ());
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-		aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_AUTHPROMPTER_CONTRACTID, true);
-		aClassName = MozillaDelegate.wcsToMbcs (null, "swtAuthPrompter", true); //$NON-NLS-1$
-		rc = componentRegistrar.RegisterFactory (XPCOM.NS_AUTHPROMPTER_CID, aClassName, aContractID, factory.getAddress ());
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-	}
-	factory.Release();
-
-	ExternalFactory externalFactory = new ExternalFactory ();
-	externalFactory.AddRef ();
-	aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.EXTERNAL_CONTRACTID, true);
-	aClassName = MozillaDelegate.wcsToMbcs (null, "External", true); //$NON-NLS-1$
-	rc = componentRegistrar.RegisterFactory (XPCOM.EXTERNAL_CID, aClassName, aContractID, externalFactory.getAddress ());
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	externalFactory.Release ();
-
-	rc = serviceManager.GetService (XPCOM.NS_CATEGORYMANAGER_CID, IIDStore.GetIID (nsICategoryManager.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-	nsICategoryManager categoryManager = new nsICategoryManager (result[0]);
-	result[0] = 0;
-	byte[] entry = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
-
-	/* register for mozilla versions <= 3.6.x */
-	byte[] category = MozillaDelegate.wcsToMbcs (null, "JavaScript global property", true); //$NON-NLS-1$
-	rc = categoryManager.AddCategoryEntry (category, entry, aContractID, 0, 1, result);
-	result[0] = 0;
-
-	/* register for mozilla versions >= 3.6.x */
-	category = MozillaDelegate.wcsToMbcs (null, "JavaScript-global-property", true); //$NON-NLS-1$
-	rc = categoryManager.AddCategoryEntry (category, entry, aContractID, 0, 1, result);
-	result[0] = 0;
-
-	categoryManager.Release ();
-
-	if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) { /* 1.4.x - 3.6.x */
-		DownloadFactory downloadFactory = new DownloadFactory ();
-		downloadFactory.AddRef ();
-		aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOWNLOAD_CONTRACTID, true);
-		aClassName = MozillaDelegate.wcsToMbcs (null, "swtDownload", true); //$NON-NLS-1$
-		rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName, aContractID, downloadFactory.getAddress ());
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-		downloadFactory.Release ();
-	}
-
-	if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) { /* 1.4.x - 10.x */
-		FilePickerFactory pickerFactory = new FilePickerFactory ();
-		pickerFactory.AddRef ();
-		aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_FILEPICKER_CONTRACTID, true);
-		aClassName = MozillaDelegate.wcsToMbcs (null, "swtFilePicker", true); //$NON-NLS-1$
-		rc = componentRegistrar.RegisterFactory (XPCOM.NS_FILEPICKER_CID, aClassName, aContractID, pickerFactory.getAddress ());
-		/* a failure here is fine, it likely indicates that a default implementation is provided */
-		pickerFactory.Release ();
-	}
-
-	componentRegistrar.Release ();
-}
-
-void initJavaXPCOM (String mozillaPath) {
-	try {
-		Class<?> clazz = Class.forName ("org.mozilla.xpcom.Mozilla"); //$NON-NLS-1$
-		Method method = clazz.getMethod ("getInstance", new Class[0]); //$NON-NLS-1$
-		Object mozilla = method.invoke (null, new Object[0]);
-		method = clazz.getMethod ("getComponentManager", new Class[0]); //$NON-NLS-1$
-		try {
-			method.invoke (mozilla, new Object[0]);
-		} catch (InvocationTargetException e) {
-			/* indicates that JavaXPCOM has not been initialized yet */
-			Class<?> fileClass = Class.forName ("java.io.File"); //$NON-NLS-1$
-			method = clazz.getMethod ("initialize", new Class[] {fileClass}); //$NON-NLS-1$
-			Constructor<?> constructor = fileClass.getDeclaredConstructor (new Class[] {String.class});
-			Object argument = constructor.newInstance (new Object[] {mozillaPath});
-			method.invoke (mozilla, new Object[] {argument});
-		}
-	} catch (ClassNotFoundException e) {
-		/* JavaXPCOM is not on the classpath */
-	} catch (NoSuchMethodException e) {
-		/* the JavaXPCOM on the classpath does not implement initialize() */
-	} catch (IllegalArgumentException e) {
-	} catch (IllegalAccessException e) {
-	} catch (InvocationTargetException e) {
-	} catch (InstantiationException e) {
-	}
-}
-
-String initMozilla (String mozillaPath) {
-	/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
-	long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, MOZILLA_FIVE_HOME, true));
-	if (ptr != 0) {
-		int length = C.strlen (ptr);
-		byte[] buffer = new byte[length];
-		C.memmove (buffer, ptr, length);
-		mozillaPath = new String (MozillaDelegate.mbcsToWcs (null, buffer));
-
-		/* ensure that client-supplied path is using correct separators */
-		if (SEPARATOR_OS == '/') {
-			mozillaPath = mozillaPath.replace ('\\', SEPARATOR_OS);
-		} else {
-			mozillaPath = mozillaPath.replace ('/', SEPARATOR_OS);
-		}
-	} else {
-		browser.dispose ();
-		SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unknown Mozilla path (MOZILLA_FIVE_HOME not set)]"); //$NON-NLS-1$
-	}
-	if (Device.DEBUG) System.out.println ("Mozilla path: " + mozillaPath); //$NON-NLS-1$
-
-	try {
-		Library.loadLibrary ("swt-mozilla"); //$NON-NLS-1$
-	} catch (UnsatisfiedLinkError e) {
-		browser.dispose ();
-		SWT.error (SWT.ERROR_NO_HANDLES, e, " [MOZILLA_FIVE_HOME='" + mozillaPath + "']"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	return mozillaPath;
-}
-
-void initXPCOM (String mozillaPath, boolean isXULRunner) {
-	long /*int*/[] result = new long /*int*/[1];
-
-	nsEmbedString pathString = new nsEmbedString (mozillaPath);
-	int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-	pathString.dispose ();
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_ERROR_NULL_POINTER);
-	}
-
-	nsIFile localFile = new nsIFile (result[0]);
-	result[0] = 0;
-	if (isXULRunner) {
-		int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
-		/* alloc memory for two structs, the second is empty to signify the end of the list */
-		long /*int*/ ptr = C.malloc (size * 2);
-		C.memset (ptr, 0, size * 2);
-		nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
-
-		/*
-		 * Attempt to load the XRE_InitEmbedding2 function first, which is present in
-		 * mozilla versions > 3.x.
-		 */
-		byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_InitEmbedding2", true); //$NON-NLS-1$
-		functionLoad.functionName = C.malloc (bytes.length);
-		C.memmove (functionLoad.functionName, bytes, bytes.length);
-		functionLoad.function = C.malloc (C.PTR_SIZEOF);
-		C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
-		XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
-		rc = XPCOM.XPCOMGlueLoadXULFunctions (ptr);
-		if (rc == XPCOM.NS_OK) { /* > 3.x */
-			result[0] = 0;
-			rc = localFile.QueryInterface (IIDStore.GetIID (nsIFile.class, MozillaVersion.VERSION_XR31, true), result);
-			if (rc == XPCOM.NS_OK) { /* 31.x */
-				MozillaVersion.SetCurrentVersion (MozillaVersion.VERSION_XR31);
-			} else {
-				rc = localFile.QueryInterface (IIDStore.GetIID (nsIFile.class, MozillaVersion.VERSION_XR24, true), result);
-				if (rc == XPCOM.NS_OK) { /* 24.x */
-					MozillaVersion.SetCurrentVersion (MozillaVersion.VERSION_XR24);
-				} else { /* 10.x */
-					rc = localFile.QueryInterface (IIDStore.GetIID (nsILocalFile.class, MozillaVersion.VERSION_XR10), result);
-					if (rc != XPCOM.NS_OK) {
-						/* appears to be an unsupported version */
-						browser.dispose ();
-						error (rc);
-					}
-					MozillaVersion.SetCurrentVersion (MozillaVersion.VERSION_XR10);
-				}
-			}
-			if (result[0] != 0) new nsISupports (result[0]).Release();
-			result[0] = 0;
-		} else {
-			/*
-			 * XRE_InitEmbedding2 was not found, so fall back to XRE_InitEmbedding, which is
-			 * present in older mozilla versions.
-			 */
-			C.free (functionLoad.functionName);
-			bytes = MozillaDelegate.wcsToMbcs (null, "XRE_InitEmbedding", true); //$NON-NLS-1$
-			functionLoad.functionName = C.malloc (bytes.length);
-			C.memmove (functionLoad.functionName, bytes, bytes.length);
-			XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
-			rc = XPCOM.XPCOMGlueLoadXULFunctions (ptr);
-			/*
-			 * For now guess that the version is 1.9.2.x (aka 3.6.x), will determine
-			 * this more precisely once a browser instance has been created.
-			 */
-			MozillaVersion.SetCurrentVersion (MozillaVersion.VERSION_XR1_9_2);
-		}
-
-		C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
-		long /*int*/ functionPtr = result[0];
-		result[0] = 0;
-		C.free (functionLoad.function);
-		C.free (functionLoad.functionName);
-		C.free (ptr);
-		if (functionPtr == 0) {
-			browser.dispose ();
-			error (XPCOM.NS_ERROR_NULL_POINTER);
-		}
-
-		MozillaDelegate.loadAdditionalLibraries (mozillaPath, true);
-
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
-			rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress ());
-		} else {
-			rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress (), 0, 0);
-		}
-		if (rc == XPCOM.NS_OK) {
-			System.setProperty (XULRUNNER_PATH, mozillaPath);
-		}
-	} else {
-		/*
-		 * For now guess that the version is equivalent to Firefox 3.6.x (aka XULRunner 1.9.2.x),
-		 * will determine this more precisely once a browser instance has been created.
-		 */
-		MozillaVersion.SetCurrentVersion (MozillaVersion.VERSION_XR1_9_2);
-		rc = XPCOM.NS_InitXPCOM2 (0, localFile.getAddress(), LocationProvider.getAddress ());
-	}
-	localFile.Release ();
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		SWT.error (SWT.ERROR_NO_HANDLES, null, " [MOZILLA_FIVE_HOME may not point at an embeddable GRE] [NS_InitEmbedding " + mozillaPath + " error " + rc + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	System.setProperty (GRE_INITIALIZED, TRUE);
-}
-
-void initPreferences (nsIServiceManager serviceManager, nsIComponentManager componentManager) {
-	long /*int*/[] result = new long /*int*/[1];
-
-	/*
-	 * As a result of using a common profile the user cannot change their locale
-	 * and charset.  The fix for this is to set mozilla's locale and charset
-	 * preference values according to the user's current locale and charset.
-	 */
-	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFSERVICE_CONTRACTID, true);
-	int rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIPrefService.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);
-	}
-
-	nsIPrefService prefService = new nsIPrefService (result[0]);
-	result[0] = 0;
-	byte[] buffer = new byte[1];
-	rc = prefService.GetBranch (buffer, result);	/* empty buffer denotes root preference level */
-	prefService.Release ();
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);
-	}
-
-	nsIPrefBranch prefBranch = new nsIPrefBranch (result[0]);
-	result[0] = 0;
-
-	/* get Mozilla's current locale preference value */
-	String prefLocales = null;
-	nsIPrefLocalizedString localizedString = null;
-	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_LANGUAGES, true);
-	rc = prefBranch.GetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-	/*
-	 * Feature of Debian.  For some reason attempting to query for the current locale
-	 * preference fails on Debian.  The workaround for this is to assume a value of
-	 * "en-us,en" since this is typically the default value when mozilla is used without
-	 * a profile.
-	 */
-	if (rc != XPCOM.NS_OK) {
-		prefLocales = "en-us,en" + TOKENIZER_LOCALE;	//$NON-NLS-1$
-	} else {
-		if (result[0] == 0) {
-			browser.dispose ();
-			error (XPCOM.NS_NOINTERFACE);
-		}
-		localizedString = new nsIPrefLocalizedString (result[0]);
-		result[0] = 0;
-		rc = localizedString.ToString (result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-		if (result[0] == 0) {
-			browser.dispose ();
-			error (XPCOM.NS_NOINTERFACE);
-		}
-		int length = XPCOM.strlen_PRUnichar (result[0]);
-		char[] dest = new char[length];
-		XPCOM.memmove (dest, result[0], length * 2);
-		prefLocales = new String (dest) + TOKENIZER_LOCALE;
-	}
-	result[0] = 0;
-
-	/*
-	 * construct the new locale preference value by prepending the
-	 * user's current locale and language to the original value
-	 */
-	Locale locale = Locale.getDefault ();
-	String language = locale.getLanguage ();
-	String country = locale.getCountry ();
-	StringBuffer stringBuffer = new StringBuffer (language);
-	stringBuffer.append (SEPARATOR_LOCALE);
-	stringBuffer.append (country.toLowerCase ());
-	stringBuffer.append (TOKENIZER_LOCALE);
-	stringBuffer.append (language);
-	stringBuffer.append (TOKENIZER_LOCALE);
-	String newLocales = stringBuffer.toString ();
-
-	int start, end = -1;
-	do {
-		start = end + 1;
-		end = prefLocales.indexOf (TOKENIZER_LOCALE, start);
-		String token;
-		if (end == -1) {
-			token = prefLocales.substring (start);
-		} else {
-			token = prefLocales.substring (start, end);
-		}
-		if (token.length () > 0) {
-			token = (token + TOKENIZER_LOCALE).trim ();
-			/* ensure that duplicate locale values are not added */
-			if (newLocales.indexOf (token) == -1) {
-				stringBuffer.append (token);
-			}
-		}
-	} while (end != -1);
-	newLocales = stringBuffer.toString ();
-	if (!newLocales.equals (prefLocales)) {
-		/* write the new locale value */
-		newLocales = newLocales.substring (0, newLocales.length () - TOKENIZER_LOCALE.length ()); /* remove trailing tokenizer */
-		int length = newLocales.length ();
-		char[] charBuffer = new char[length + 1];
-		newLocales.getChars (0, length, charBuffer, 0);
-		if (localizedString == null) {
-			byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-			rc = componentManager.CreateInstanceByContractID (contractID, 0, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-			if (rc != XPCOM.NS_OK) {
-				browser.dispose ();
-				error (rc);
-			}
-			if (result[0] == 0) {
-				browser.dispose ();
-				error (XPCOM.NS_NOINTERFACE);
-			}
-			localizedString = new nsIPrefLocalizedString (result[0]);
-			result[0] = 0;
-		}
-		localizedString.SetDataWithLength (length, charBuffer);
-		rc = prefBranch.SetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), localizedString.getAddress());
-	}
-	if (localizedString != null) {
-		localizedString.Release ();
-		localizedString = null;
-	}
-
-	/* get Mozilla's current charset preference value */
-	String prefCharset = null;
-	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_CHARSET, true);
-	rc = prefBranch.GetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-	/*
-	 * Feature of Debian.  For some reason attempting to query for the current charset
-	 * preference fails on Debian.  The workaround for this is to assume a value of
-	 * "ISO-8859-1" since this is typically the default value when mozilla is used
-	 * without a profile.
-	 */
-	if (rc != XPCOM.NS_OK) {
-		prefCharset = "ISO-8859-1";	//$NON-NLS-1$
-	} else {
-		if (result[0] == 0) {
-			browser.dispose ();
-			error (XPCOM.NS_NOINTERFACE);
-		}
-		localizedString = new nsIPrefLocalizedString (result[0]);
-		result[0] = 0;
-		rc = localizedString.ToString (result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-		if (result[0] == 0) {
-			browser.dispose ();
-			error (XPCOM.NS_NOINTERFACE);
-		}
-		int length = XPCOM.strlen_PRUnichar (result[0]);
-		char[] dest = new char[length];
-		XPCOM.memmove (dest, result[0], length * 2);
-		prefCharset = new String (dest);
-	}
-	result[0] = 0;
-
-	String newCharset = System.getProperty ("file.encoding");	// $NON-NLS-1$
-	if (!newCharset.equals (prefCharset)) {
-		/* write the new charset value */
-		int length = newCharset.length ();
-		char[] charBuffer = new char[length + 1];
-		newCharset.getChars (0, length, charBuffer, 0);
-		if (localizedString == null) {
-			byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-			rc = componentManager.CreateInstanceByContractID (contractID, 0, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-			if (rc != XPCOM.NS_OK) {
-				browser.dispose ();
-				error (rc);
-			}
-			if (result[0] == 0) {
-				browser.dispose ();
-				error (XPCOM.NS_NOINTERFACE);
-			}
-			localizedString = new nsIPrefLocalizedString (result[0]);
-			result[0] = 0;
-		}
-		localizedString.SetDataWithLength (length, charBuffer);
-		rc = prefBranch.SetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), localizedString.getAddress ());
-	}
-	if (localizedString != null) localizedString.Release ();
-
-	/*
-	* Check for proxy values set as documented java properties and update mozilla's
-	* preferences with these values if needed.
-	*/
-	String proxyHost = System.getProperty (PROPERTY_PROXYHOST);
-	int port = -1;
-	int propertyValue = Integer.getInteger (PROPERTY_PROXYPORT, -1).intValue ();
-	if (0 <= propertyValue && propertyValue <= MAX_PORT) port = propertyValue;
-
-	if (proxyHost != null) {
-		byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-		rc = componentManager.CreateInstanceByContractID (contractID, 0, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-		localizedString = new nsIPrefLocalizedString (result[0]);
-		result[0] = 0;
-
-		int length = proxyHost.length ();
-		char[] charBuffer = new char[length];
-		proxyHost.getChars (0, length, charBuffer, 0);
-		rc = localizedString.SetDataWithLength (length, charBuffer);
-		if (rc != XPCOM.NS_OK) error (rc);
-
-		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_FTP, true);
-		rc = prefBranch.GetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-		if (rc == XPCOM.NS_OK && result[0] != 0) {
-			nsIPrefLocalizedString value = new nsIPrefLocalizedString (result[0]);
-			result[0] = 0;
-			rc = value.ToString (result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-			length = XPCOM.strlen_PRUnichar (result[0]);
-			char[] dest = new char[length];
-			XPCOM.memmove (dest, result[0], length * 2);
-			oldProxyHostFTP = new String (dest);
-		} else {
-			/* value is default */
-			oldProxyHostFTP = DEFAULTVALUE_STRING;
-		}
-		result[0] = 0;
-		rc = prefBranch.SetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), localizedString.getAddress ());
-		if (rc != XPCOM.NS_OK) error (rc);
-
-		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_HTTP, true);
-		rc = prefBranch.GetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-		if (rc == XPCOM.NS_OK && result[0] != 0) {
-			nsIPrefLocalizedString value = new nsIPrefLocalizedString (result[0]);
-			result[0] = 0;
-			rc = value.ToString (result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-			length = XPCOM.strlen_PRUnichar (result[0]);
-			char[] dest = new char[length];
-			XPCOM.memmove (dest, result[0], length * 2);
-			oldProxyHostHTTP = new String (dest);
-		} else {
-			/* value is default */
-			oldProxyHostHTTP = DEFAULTVALUE_STRING;
-		}
-		result[0] = 0;
-		rc = prefBranch.SetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), localizedString.getAddress ());
-		if (rc != XPCOM.NS_OK) error (rc);
-
-		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_SSL, true);
-		rc = prefBranch.GetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), result);
-		if (rc == XPCOM.NS_OK && result[0] != 0) {
-			nsIPrefLocalizedString value = new nsIPrefLocalizedString (result[0]);
-			result[0] = 0;
-			rc = value.ToString (result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-			length = XPCOM.strlen_PRUnichar (result[0]);
-			char[] dest = new char[length];
-			XPCOM.memmove (dest, result[0], length * 2);
-			oldProxyHostSSL = new String (dest);
-		} else {
-			/* value is default */
-			oldProxyHostSSL = DEFAULTVALUE_STRING;
-		}
-		result[0] = 0;
-		rc = prefBranch.SetComplexValue (buffer, IIDStore.GetIID (nsIPrefLocalizedString.class), localizedString.getAddress ());
-		if (rc != XPCOM.NS_OK) error (rc);
-
-		localizedString.Release ();
-	}
-
-	int[] intResult = new int[1]; /* C long*/
-	if (port != -1) {
-		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYPORT_FTP, true);
-		rc = prefBranch.GetIntPref (buffer, intResult);
-		if (rc != XPCOM.NS_OK) error (rc);
-		oldProxyPortFTP = intResult[0];
-		intResult[0] = 0;
-		rc = prefBranch.SetIntPref (buffer, port);
-		if (rc != XPCOM.NS_OK) error (rc);
-
-		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYPORT_HTTP, true);
-		rc = prefBranch.GetIntPref (buffer, intResult);
-		if (rc != XPCOM.NS_OK) error (rc);
-		oldProxyPortHTTP = intResult[0];
-		intResult[0] = 0;
-		rc = prefBranch.SetIntPref (buffer, port);
-		if (rc != XPCOM.NS_OK) error (rc);
-
-		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYPORT_SSL, true);
-		rc = prefBranch.GetIntPref (buffer, intResult);
-		if (rc != XPCOM.NS_OK) error (rc);
-		oldProxyPortSSL = intResult[0];
-		intResult[0] = 0;
-		rc = prefBranch.SetIntPref (buffer, port);
-		if (rc != XPCOM.NS_OK) error (rc);
-	}
-
-	if (proxyHost != null || port != -1) {
-		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYTYPE, true);
-		rc = prefBranch.GetIntPref (buffer, intResult);
-		if (rc != XPCOM.NS_OK) error (rc);
-		oldProxyType = intResult[0];
-		intResult[0] = 0;
-		rc = prefBranch.SetIntPref (buffer, 1);
-		if (rc != XPCOM.NS_OK) error (rc);
-	}
-
-	/*
-	* Ensure that windows that are shown during page loads are not blocked.  Firefox may
-	* try to block these by default since such windows are often unwelcome, but this
-	* assumption should not be made in the Browser's context.  Since the Browser client
-	* is responsible for creating the new Browser and Shell in an OpenWindowListener,
-	* they should decide whether the new window is unwelcome or not and act accordingly.
-	*/
-	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_DISABLEOPENDURINGLOAD, true);
-	rc = prefBranch.SetBoolPref (buffer, 0);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-
-	/* Ensure that the status text can be set through means like javascript */
-	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_DISABLEWINDOWSTATUSCHANGE, true);
-	rc = prefBranch.SetBoolPref (buffer, 0);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-
-	/* Ensure that the status line can be hidden when opening a window from javascript */
-	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_DISABLEOPENWINDOWSTATUSHIDE, true);
-	rc = prefBranch.SetBoolPref (buffer, 0);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-
-	/* Ensure that javascript execution is enabled since this is the Browser's default behaviour */
-	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_JAVASCRIPTENABLED, true);
-	rc = prefBranch.SetBoolPref (buffer, 1);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-
-	prefBranch.Release ();
-}
-
-void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
-	long /*int*/[] result = new long /*int*/[1];
-
-	byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
-	int rc = serviceManager.GetServiceByContractID (buffer, IIDStore.GetIID (nsIObserverService.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);
-	}
-
-	nsIObserverService observerService = new nsIObserverService (result[0]);
-	result[0] = 0;
-	buffer = MozillaDelegate.wcsToMbcs (null, PROFILE_DO_CHANGE, true);
-	int length = STARTUP.length ();
-	char[] chars = new char [length + 1];
-	STARTUP.getChars (0, length, chars, 0);
-	rc = observerService.NotifyObservers (0, buffer, chars);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	buffer = MozillaDelegate.wcsToMbcs (null, PROFILE_AFTER_CHANGE, true);
-	rc = observerService.NotifyObservers (0, buffer, chars);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	observerService.Release ();
-
-	if (isXULRunner) {
-		int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
-		/* alloc memory for two structs, the second is empty to signify the end of the list */
-		long /*int*/ ptr = C.malloc (size * 2);
-		C.memset (ptr, 0, size * 2);
-		nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
-		byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_NotifyProfile", true); //$NON-NLS-1$
-		functionLoad.functionName = C.malloc (bytes.length);
-		C.memmove (functionLoad.functionName, bytes, bytes.length);
-		functionLoad.function = C.malloc (C.PTR_SIZEOF);
-		C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
-		XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
-		XPCOM.XPCOMGlueLoadXULFunctions (ptr);
-		C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
-		long /*int*/ functionPtr = result[0];
-		result[0] = 0;
-		C.free (functionLoad.function);
-		C.free (functionLoad.functionName);
-		C.free (ptr);
-		/* functionPtr == 0 for xulrunner < 1.9 */
-		if (functionPtr != 0) {
-			rc = XPCOM.Call (functionPtr);
-			if (rc != XPCOM.NS_OK) {
-				browser.dispose ();
-				error (rc);
-			}
-		}
-	}
-}
-
-void initSpinup (nsIComponentManager componentManager) {
-	if (MozillaDelegate.needsSpinup ()) {
-		long /*int*/[] result = new long /*int*/[1];
-
-		/* nsIAppShell is discontinued as of xulrunner 1.9, so do not fail if it is not found */
-		int rc = componentManager.CreateInstance (XPCOM.NS_APPSHELL_CID, 0, IIDStore.GetIID (nsIAppShell.class, MozillaVersion.VERSION_BASE), result);
-		if (rc != XPCOM.NS_ERROR_NO_INTERFACE) {
-			if (rc != XPCOM.NS_OK) {
-				browser.dispose ();
-				error (rc);
-			}
-			if (result[0] == 0) {
-				browser.dispose ();
-				error (XPCOM.NS_NOINTERFACE);
-			}
-
-			AppShell = new nsIAppShell (result[0]);
-			result[0] = 0;
-			rc = AppShell.Create (0, null);
-			if (rc != XPCOM.NS_OK) {
-				browser.dispose ();
-				error (rc);
-			}
-			rc = AppShell.Spinup ();
-			if (rc != XPCOM.NS_OK) {
-				browser.dispose ();
-				error (rc);
-			}
-		}
-	}
-}
-
-void initWebBrowserWindows () {
-	int rc = webBrowser.SetContainerWindow (webBrowserChrome.getAddress());
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-
-	long /*int*/[] result = new long /*int*/[1];
-	rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIBaseWindow.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_ERROR_NO_INTERFACE);
-	}
-
-	nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
-	result[0] = 0;
-	Rectangle rect = browser.getClientArea ();
-	if (rect.isEmpty ()) {
-		rect.width = 1;
-		rect.height = 1;
-	}
-
-	embedHandle = delegate.getHandle ();
-
-	rc = baseWindow.InitWindow (embedHandle, 0, 0, 0, rect.width, rect.height);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (XPCOM.NS_ERROR_FAILURE);
-	}
-	rc = delegate.createBaseWindow (baseWindow);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (XPCOM.NS_ERROR_FAILURE);
-	}
-	rc = baseWindow.SetVisibility (1);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (XPCOM.NS_ERROR_FAILURE);
-	}
-	baseWindow.Release ();
-}
-
-void initWindowCreator (nsIServiceManager serviceManager) {
-	WindowCreator = new WindowCreator2 ();
-	WindowCreator.AddRef ();
-
-	long /*int*/[] result = new long /*int*/[1];
-	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
-	int rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIWindowWatcher.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);
-	}
-
-	nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
-	result[0] = 0;
-	rc = windowWatcher.SetWindowCreator (WindowCreator.getAddress());
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	windowWatcher.Release ();
-}
-
-String initXULRunner (String mozillaPath) {
-	if (Device.DEBUG) System.out.println ("XULRunner path: " + mozillaPath); //$NON-NLS-1$
-	try {
-		Library.loadLibrary ("swt-xulrunner"); //$NON-NLS-1$
-	} catch (UnsatisfiedLinkError e) {
-		SWT.error (SWT.ERROR_NO_HANDLES, e);
-	}
-
-	/*
-	* Remove the trailing xpcom lib name from mozillaPath because the
-	* Mozilla.initialize and NS_InitXPCOM2 invocations require a directory name only.
-	*/
-	String mozillaDirPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
-	MozillaDelegate.loadAdditionalLibraries (mozillaDirPath, false);
-	byte[] path = MozillaDelegate.wcsToMbcs (null, mozillaPath, true);
-	int rc = XPCOM.XPCOMGlueStartup (path);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	XPCOMWasGlued = true;
-
-	return mozillaDirPath;
-}
-
-@Override
-public boolean isBackEnabled () {
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	int[] aCanGoBack = new int[1]; /* PRBool */
-	rc = webNavigation.GetCanGoBack (aCanGoBack);
-	webNavigation.Release ();
-	return aCanGoBack[0] != 0;
-}
-
-@Override
-public boolean isForwardEnabled () {
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	int[] aCanGoForward = new int[1]; /* PRBool */
-	rc = webNavigation.GetCanGoForward (aCanGoForward);
-	webNavigation.Release ();
-	return aCanGoForward[0] != 0;
-}
-
-static String error (int code) {
-	throw new SWTError ("XPCOM error 0x" + Integer.toHexString(code)); //$NON-NLS-1$
-}
-
-void onDispose (Display display) {
-	/* invoke onbeforeunload handlers */
-	if (!browser.isClosing && !browser.isDisposed()) {
-		LocationListener[] oldLocationListeners = locationListeners;
-		locationListeners = new LocationListener[0];
-		ignoreAllMessages = true;
-		execute ("window.location.replace('about:blank');"); //$NON-NLS-1$
-		ignoreAllMessages = false;
-		locationListeners = oldLocationListeners;
-	}
-
-	if (badCertRequest != 0) {
-		new nsISupports (badCertRequest).Release ();
-	}
-
-	int rc = webBrowser.RemoveWebBrowserListener (weakReference.getAddress (), IIDStore.GetIID (nsIWebProgressListener.class));
-	if (rc != XPCOM.NS_OK) error (rc);
-
-	rc = webBrowser.SetParentURIContentListener (0);
-	if (rc != XPCOM.NS_OK) error (rc);
-
-	rc = webBrowser.SetContainerWindow (0);
-	if (rc != XPCOM.NS_OK) error (rc);
-
-	unhookDOMListeners ();
-
-	long /*int*/[] result = new long /*int*/[1];
-	rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIBaseWindow.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
-	rc = baseWindow.Destroy ();
-	if (rc != XPCOM.NS_OK) error (rc);
-	baseWindow.Release ();
-
-	Release ();
-	webBrowser.Release ();
-	webBrowser = null;
-	webBrowserObject = null;
-	lastNavigateURL = null;
-	htmlBytes = null;
-	listener = null;
-
-	if (tip != null && !tip.isDisposed ()) tip.dispose ();
-	tip = null;
-	location = size = null;
-
-	for (LONG ptrObject : unhookedDOMWindows) {
-		new nsISupports (ptrObject.value).Release ();
-	}
-	unhookedDOMWindows = null;
-
-	Iterator<BrowserFunction> elements = functions.values().iterator ();
-	while (elements.hasNext ()) {
-		BrowserFunction function = elements.next ();
-		AllFunctions.remove (new Integer (function.index));
-		function.dispose (false);
-	}
-	functions = null;
-
-	delegate.onDispose (embedHandle);
-	delegate = null;
-
-	embedHandle = 0;
-	BrowserCount--;
-}
-
-void Activate () {
-	isActive = true;
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebBrowserFocus.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebBrowserFocus webBrowserFocus = new nsIWebBrowserFocus (result[0]);
-	rc = webBrowserFocus.Activate ();
-	if (rc != XPCOM.NS_OK) error (rc);
-	webBrowserFocus.Release ();
-}
-
-void Deactivate () {
-	isActive = false;
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebBrowserFocus.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebBrowserFocus webBrowserFocus = new nsIWebBrowserFocus (result[0]);
-	rc = webBrowserFocus.Deactivate ();
-	if (rc != XPCOM.NS_OK) error (rc);
-	webBrowserFocus.Release ();
-}
-
-void navigate (long /*int*/ requestHandle) {
-	nsIRequest request = new nsIRequest (requestHandle);
-
-	/* get the request post data, if any */
-	long /*int*/[] result = new long /*int*/[1];
-	byte[] postData = null;
-	final List<String> headers = new ArrayList<> ();
-	int rc = request.QueryInterface (IIDStore.GetIID (nsIUploadChannel.class), result);
-	if (rc == XPCOM.NS_OK && result[0] != 0) {
-		nsIUploadChannel uploadChannel = new nsIUploadChannel (result[0]);
-		result[0] = 0;
-		rc = uploadChannel.GetUploadStream (result);
-		if (rc == XPCOM.NS_OK && result[0] != 0) {
-			nsIInputStream inputStream = new nsIInputStream (result[0]);
-			result[0] = 0;
-			rc = inputStream.QueryInterface (IIDStore.GetIID (nsISeekableStream.class), result);
-			if (rc == XPCOM.NS_OK && result[0] != 0) {
-				nsISeekableStream seekableStream = new nsISeekableStream (result[0]);
-				result[0] = 0;
-				long[] initialOffset = new long[1];
-				rc = seekableStream.Tell (initialOffset);
-				if (rc == XPCOM.NS_OK) {
-					rc = seekableStream.Seek (nsISeekableStream.NS_SEEK_SET, 0);
-					if (rc == XPCOM.NS_OK) {
-						long available;
-						if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24)) {
-							long[] _retval = new long[1];
-							rc = inputStream.Available (_retval);
-							available = _retval[0];
-						} else {
-							int[] _retval = new int[1];
-							rc = inputStream.Available (_retval);
-							available = _retval[0];
-						}
-						if (rc == XPCOM.NS_OK) {
-							int length = (int)available;
-							byte[] bytes = new byte[length];
-							int[] retVal = new int[1];
-							rc = inputStream.Read (bytes, length, retVal);
-							if (rc == XPCOM.NS_OK) {
-								int start = 0;
-								for (int i = 0; i < length; i++) {
-									if (bytes[i] == 13) {
-										byte[] current = new byte[i - start];
-										System.arraycopy (bytes, start, current, 0, i - start);
-										String string = new String (current).trim ();
-										if (string.length () != 0) {
-											headers.add (string);
-										} else {
-											start = i + 2; /* skip \r\n */
-											postData = new byte[length - start];
-											System.arraycopy (bytes, start, postData, 0, length - start);
-											break;
-										}
-										start = i;
-									}
-								}
-							}
-						}
-					}
-					seekableStream.Seek (nsISeekableStream.NS_SEEK_SET, initialOffset[0]);
-				}
-				seekableStream.Release ();
-			}
-			inputStream.Release ();
-		}
-		uploadChannel.Release ();
-	}
-
-	/* get the request headers */
-	XPCOMObject visitor = new XPCOMObject (new int[] {2, 0, 0, 2}) {
-		int refCount = 0;
-		@Override
-		public long /*int*/ method0 (long /*int*/[] args) {
-			/* QueryInterface */
-			long /*int*/ riid = args[0];
-			long /*int*/ ppvObject = args[1];
-			if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-			nsID guid = new nsID ();
-			XPCOM.memmove (guid, riid, nsID.sizeof);
-			if (guid.Equals (XPCOM.NS_ISUPPORTS_IID) || guid.Equals (XPCOM.NS_IHTTPHEADERVISITOR_IID) || guid.Equals (XPCOM.NS_IHTTPHEADERVISITOR_10_IID)) {
-				XPCOM.memmove (ppvObject, new long /*int*/[] {getAddress ()}, C.PTR_SIZEOF);
-				refCount++;
-				return XPCOM.NS_OK;
-			}
-			XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
-			return XPCOM.NS_ERROR_NO_INTERFACE;
-		}
-		@Override
-		public long /*int*/ method1 (long /*int*/[] args) {
-			/* AddRef */
-			return ++refCount;
-		}
-		@Override
-		public long /*int*/ method2 (long /*int*/[] args) {
-			/* Release */
-			if (--refCount == 0) dispose ();
-			return refCount;
-		}
-		@Override
-		public long /*int*/ method3 (long /*int*/[] args) {
-			/* VisitHeader */
-			long /*int*/ aHeader = args[0];
-			long /*int*/ aValue = args[1];
-
-			int length = XPCOM.nsEmbedCString_Length (aHeader);
-			long /*int*/ buffer = XPCOM.nsEmbedCString_get (aHeader);
-			byte[] dest = new byte[length];
-			XPCOM.memmove (dest, buffer, length);
-			String header = new String (dest);
-
-			length = XPCOM.nsEmbedCString_Length (aValue);
-			buffer = XPCOM.nsEmbedCString_get (aValue);
-			dest = new byte[length];
-			XPCOM.memmove (dest, buffer, length);
-			String value = new String (dest);
-
-			headers.add(header + ':' + value);
-			return XPCOM.NS_OK;
-		}
-	};
-
-	new nsISupports (visitor.getAddress ()).AddRef ();
-	rc = request.QueryInterface (IIDStore.GetIID (nsIHttpChannel.class), result);
-	if (rc == XPCOM.NS_OK && result[0] != 0) {
-		nsIHttpChannel httpChannel = new nsIHttpChannel (result[0]);
-		httpChannel.VisitRequestHeaders (visitor.getAddress ());
-		httpChannel.Release ();
-	}
-	result[0] = 0;
-	new nsISupports (visitor.getAddress ()).Release ();
-
-	String[] headersArray = null;
-	int size = headers.size ();
-	if (size > 0) {
-		headersArray = new String[size];
-		headers.toArray(headersArray);
-	}
-
-	/* a request's name often (but not always) is its url */
-	String url = lastNavigateURL;
-	long /*int*/ name = XPCOM.nsEmbedCString_new ();
-	rc = request.GetName (name);
-	if (rc == XPCOM.NS_OK) {
-		int length = XPCOM.nsEmbedCString_Length (name);
-		long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
-		byte[] bytes = new byte[length];
-		XPCOM.memmove (bytes, buffer, length);
-		String value = new String (bytes);
-		if (value.indexOf (":/") != -1) url = value;	//$NON-NLS-1$
-	}
-	XPCOM.nsEmbedCString_delete (name);
-
-	setUrl (url, postData, headersArray);
-}
-
-void onResize () {
-	Rectangle rect = DPIUtil.autoScaleUp (browser.getClientArea ()); // To Pixels
-	int width = Math.max (1, rect.width);
-	int height = Math.max (1, rect.height);
-
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIBaseWindow.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	Point size = delegate.getNativeSize (width, height);
-	delegate.setSize (embedHandle, size.x, size.y);
-	nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
-	rc = baseWindow.SetPositionAndSize (0, 0, size.x, size.y, 1);
-	if (rc != XPCOM.NS_OK) error (rc);
-	baseWindow.Release ();
-}
-
-@Override
-public void refresh () {
-	htmlBytes = null;
-
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	rc = webNavigation.Reload (nsIWebNavigation.LOAD_FLAGS_NONE);
-	webNavigation.Release ();
-
-	/*
-	* The following error conditions do not indicate unrecoverable problems:
-	*
-	* - NS_ERROR_INVALID_POINTER: happens when Reload is called immediately
-	* after calling LoadURI.
-	* - NS_ERROR_FILE_NOT_FOUND: happens when attempting to reload a file that
-	* no longer exists.
-	* - NS_BINDING_ABORTED: happens when the user aborts the load (eg.- chooses
-	* to not resubmit a page with form data).
-	*/
-	switch (rc) {
-		case XPCOM.NS_OK:
-		case XPCOM.NS_ERROR_INVALID_POINTER:
-		case XPCOM.NS_ERROR_FILE_NOT_FOUND:
-		case XPCOM.NS_BINDING_ABORTED: {
-			return;
-		}
-	}
-	error (rc);
-}
-
-@Override
-void registerFunction (BrowserFunction function) {
-	super.registerFunction (function);
-	AllFunctions.put (function.index, function);
-}
-
-boolean sendChangingEvent (String url) {
-	isViewingErrorPage = url.indexOf ("netError.xhtml") != -1; //$NON-NLS-1$
-
-	boolean doit = true;
-	if (request == 0) {
-		/*
-		 * listeners should not be notified of internal transitions like "javascript:..."
-		 * because this is an implementation side-effect, not a true navigate
-		 */
-		if (!url.startsWith (PREFIX_JAVASCRIPT)) {
-			if (locationListeners.length > 0) {
-				LocationEvent event = new LocationEvent (browser);
-				event.display = browser.getDisplay();
-				event.widget = browser;
-				event.location = url;
-				/*
-				 * If the URI indicates that the page is being rendered from memory
-				 * (via setText()) then set it to about:blank to be consistent with IE.
-				 */
-				if (event.location.equals (URI_FILEROOT)) {
-					event.location = ABOUT_BLANK;
-				} else {
-					int length = URI_FILEROOT.length ();
-					if (event.location.startsWith (URI_FILEROOT) && event.location.charAt (length) == '#') {
-						event.location = ABOUT_BLANK + event.location.substring (length);
-					}
-				}
-				event.doit = doit;
-				for (int i = 0; i < locationListeners.length; i++) {
-					locationListeners[i].changing (event);
-				}
-				doit = event.doit && !browser.isDisposed();
-			}
-
-			if (doit) {
-				if (jsEnabled != jsEnabledOnNextPage) {
-					jsEnabled = jsEnabledOnNextPage;
-					long /*int*/[] result = new long /*int*/[1];
-					int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebBrowserSetup.class), result);
-					if (rc != XPCOM.NS_OK) error (rc);
-					if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-					nsIWebBrowserSetup setup = new nsIWebBrowserSetup (result[0]);
-					result[0] = 0;
-					rc = setup.SetProperty (nsIWebBrowserSetup.SETUP_ALLOW_JAVASCRIPT, jsEnabled ? 1 : 0);
-					if (rc != XPCOM.NS_OK) error (rc);
-					setup.Release ();
-				}
-				if (!isViewingErrorPage) lastNavigateURL = url;
-			}
-		}
-	}
-	return doit;
-}
-
-@Override
-public boolean setText (String html, boolean trusted) {
-	/*
-	*  Feature in Mozilla.  The focus memory of Mozilla must be
-	*  properly managed through the nsIWebBrowserFocus interface.
-	*  In particular, nsIWebBrowserFocus.deactivate must be called
-	*  when the focus moves from the browser (or one of its children
-	*  managed by Mozilla to another widget.  We currently do not
-	*  get notified when a widget takes focus away from the Browser.
-	*  As a result, deactivate is not properly called. This causes
-	*  Mozilla to retake focus the next time a document is loaded.
-	*  This breaks the case where the HTML loaded in the Browser
-	*  varies while the user enters characters in a text widget. The text
-	*  widget loses focus every time new content is loaded.
-	*  The current workaround is to call deactivate everytime if
-	*  the browser currently does not have focus. A better workaround
-	*  would be to have a way to call deactivate when the Browser
-	*  or one of its children loses focus.
-	*/
-	if (browser != browser.getDisplay ().getFocusControl ()) Deactivate ();
-
-	/* convert the String containing HTML to an array of bytes with UTF-8 data */
-	byte[] data = html.getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$
-
-	/*
-	 * This could be the first content that is set into the browser, so
-	 * ensure that the custom subclass that works around Mozilla bug
-	 * https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
-	 */
-	delegate.removeWindowSubclass ();
-
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebBrowserStream.class), result);
-	if (rc == XPCOM.NS_OK && result[0] != 0) {
-		/*
-		* Setting mozilla's content through nsIWebBrowserStream does not cause a page
-		* load to occur, so the events that usually accompany a page change are not
-		* fired.  To make this behave as expected, navigate to about:blank first and
-		* then set the html content once the page has loaded.
-		*/
-		new nsISupports (result[0]).Release ();
-		result[0] = 0;
-
-		/*
-		* If htmlBytes is not null then the about:blank page is already being loaded,
-		* so no Navigate is required.  Just set the html that is to be shown.
-		*/
-		boolean blankLoading = htmlBytes != null;
-		htmlBytes = data;
-		untrustedText = !trusted;
-		if (blankLoading) return true;
-
-		/* navigate to about:blank */
-		rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-		nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-		result[0] = 0;
-		char[] uri = new char[ABOUT_BLANK.length () + 1];
-		ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
-		rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-		if (rc != XPCOM.NS_OK) error (rc);
-		webNavigation.Release ();
-	} else {
-		byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", false);	//$NON-NLS-1$
-		long /*int*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
-		byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $NON-NLS-1$
-		long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
-
-		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 = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, IIDStore.GetIID (nsIIOService.class), result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-		nsIIOService ioService = new nsIIOService (result[0]);
-		result[0] = 0;
-		byte[] aString;
-		if (trusted) {
-			aString = MozillaDelegate.wcsToMbcs (null, URI_FILEROOT, false);
-		} else {
-			aString = MozillaDelegate.wcsToMbcs (null, ABOUT_BLANK, false);
-		}
-		long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
-		rc = ioService.NewURI (aSpec, null, 0, result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-		XPCOM.nsEmbedCString_delete (aSpec);
-		ioService.Release ();
-
-		nsIURI uri = new nsIURI (result[0]);
-		result[0] = 0;
-
-		rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIInterfaceRequestor.class), result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-		nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
-		result[0] = 0;
-
-		/*
-		* Feature in Mozilla. LoadStream invokes the nsIInputStream argument
-		* through a different thread.  The callback mechanism must attach
-		* a non java thread to the JVM otherwise the nsIInputStream Read and
-		* Close methods never get called.
-		*/
-		InputStream inputStream = new InputStream (data);
-		inputStream.AddRef ();
-
-		rc = interfaceRequestor.GetInterface (IIDStore.GetIID (nsIDocShell.class, MozillaVersion.VERSION_BASE), result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-		nsIDocShell docShell = new nsIDocShell (result[0]);
-		result[0] = 0;
-		rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
-		docShell.Release ();
-
-		inputStream.Release ();
-		interfaceRequestor.Release ();
-		uri.Release ();
-		XPCOM.nsEmbedCString_delete (aContentType);
-		XPCOM.nsEmbedCString_delete (aContentCharset);
-	}
-	return true;
-}
-
-@Override
-public boolean setUrl (String url, String postData, String[] headers) {
-	byte[] postDataBytes = null;
-	if (postData != null) {
-		postDataBytes = MozillaDelegate.wcsToMbcs (null, postData, false);
-	}
-	return setUrl (url, postDataBytes, headers);
-}
-
-boolean setUrl (String url, byte[] postData, String[] headers) {
-	htmlBytes = null;
-
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	/*
-	 * This could be the first content that is set into the browser, so
-	 * ensure that the custom subclass that works around Mozilla bug
-	 * https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
-	 */
-	delegate.removeWindowSubclass ();
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	result[0] = 0;
-	char[] uri = new char[url.length () + 1];
-	url.getChars (0, url.length (), uri, 0);
-
-	nsIMIMEInputStream postDataStream = null;
-	InputStream dataStream = null;
-	if (postData != null) {
-		rc = XPCOM.NS_GetComponentManager (result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
-		result[0] = 0;
-		byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MIMEINPUTSTREAM_CONTRACTID, true);
-		rc = componentManager.CreateInstanceByContractID (contractID, 0, IIDStore.GetIID (nsIMIMEInputStream.class), result);
-		componentManager.Release();
-
-		if (rc == XPCOM.NS_OK && result[0] != 0) { /* nsIMIMEInputStream is not in mozilla 1.4 */
-			dataStream = new InputStream (postData);
-			dataStream.AddRef ();
-			postDataStream = new nsIMIMEInputStream (result[0]);
-			rc = postDataStream.SetData (dataStream.getAddress ());
-			if (rc != XPCOM.NS_OK) error (rc);
-
-			boolean foundLength = false;
-			boolean foundType = false;
-			if (headers != null) {
-				for (int i = 0; i < headers.length; i++) {
-					int index = headers[i].indexOf (':');
-					if (index != -1) {
-						String name = headers[i].substring (0, index).trim ().toLowerCase ();
-						if (name.equals (HEADER_CONTENTLENGTH)) {
-							foundLength = true;
-						} else if (name.equals (HEADER_CONTENTTYPE)) {
-							foundType = true;
-						}
-					}
-				}
-			}
-			rc = postDataStream.SetAddContentLength (foundLength ? 0 : 1);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (!foundType) {
-				byte[] name = MozillaDelegate.wcsToMbcs (null, HEADER_CONTENTTYPE, true);
-				byte[] value = MozillaDelegate.wcsToMbcs (null, MIMETYPE_FORMURLENCODED, true);
-				rc = postDataStream.AddHeader (name, value);
-				if (rc != XPCOM.NS_OK) error (rc);
-			}
-		}
-		result[0] = 0;
-	}
-
-	InputStream headersStream = null;
-    if (headers != null) {
-		StringBuffer buffer = new StringBuffer ();
-		for (int i = 0; i < headers.length; i++) {
-			String current = headers[i];
-			if (current != null) {
-				int sep = current.indexOf (':');
-				if (sep != -1) {
-					String key = current.substring (0, sep).trim ();
-					String value = current.substring (sep + 1).trim ();
-					if (key.length () > 0 && value.length () > 0) {
-						buffer.append (key);
-						buffer.append (':');
-						buffer.append (value);
-						buffer.append ("\r\n");
-					}
-				}
-			}
-		}
-		byte[] bytes = MozillaDelegate.wcsToMbcs (null, buffer.toString (), true);
-		headersStream = new InputStream (bytes);
-		headersStream.AddRef ();
-    }
-
-	rc = webNavigation.LoadURI (
-		uri,
-		nsIWebNavigation.LOAD_FLAGS_NONE,
-		0,
-		postDataStream == null ? 0 : postDataStream.getAddress (),
-		headersStream == null ? 0 : headersStream.getAddress ());
-	if (dataStream != null) dataStream.Release ();
-	if (headersStream != null) headersStream.Release ();
-	webNavigation.Release ();
-	return rc == XPCOM.NS_OK;
-}
-
-@Override
-public void stop () {
-	htmlBytes = null;
-
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebNavigation.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	rc = webNavigation.Stop (nsIWebNavigation.STOP_ALL);
-	if (rc != XPCOM.NS_OK) error (rc);
-	webNavigation.Release ();
-}
-
-void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
-	nsEmbedString string = new nsEmbedString (XPCOM.DOMEVENT_FOCUS);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_UNLOAD);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEDOWN);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEUP);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEMOVE);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEWHEEL);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEDRAG);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-
-	/*
-	* Only hook mouseover and mouseout if the target is a top-level frame, so that mouse moves
-	* between frames will not generate events.
-	*/
-	if (isTop && delegate.hookEnterExit ()) {
-		string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEOVER);
-		target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-		string.dispose ();
-		string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEOUT);
-		target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-		string.dispose ();
-	}
-
-	string = new nsEmbedString (XPCOM.DOMEVENT_KEYDOWN);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_KEYPRESS);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_KEYUP);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0, 1, 0);
-	string.dispose ();
-}
-
-void unhookDOMListeners () {
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.GetContentDOMWindow (result);
-	if (rc != XPCOM.NS_OK || result[0] == 0) return;
-
-	nsIDOMWindow window = new nsIDOMWindow (result[0]);
-	result[0] = 0;
-	rc = window.QueryInterface (IIDStore.GetIID (nsIDOMEventTarget.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-	nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
-	result[0] = 0;
-	unhookDOMListeners (target);
-	target.Release ();
-
-	/* Listeners must be unhooked in pages contained in frames */
-	rc = window.GetFrames (result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-	nsIDOMWindowCollection frames = new nsIDOMWindowCollection (result[0]);
-	result[0] = 0;
-	int[] frameCount = new int[1];
-	rc = frames.GetLength (frameCount); /* PRUint32 */
-	if (rc != XPCOM.NS_OK) error (rc);
-	int count = frameCount[0];
-
-	if (count > 0) {
-		for (int i = 0; i < count; i++) {
-			rc = frames.Item (i, result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-			nsIDOMWindow frame = new nsIDOMWindow (result[0]);
-			result[0] = 0;
-			rc = frame.QueryInterface (IIDStore.GetIID (nsIDOMEventTarget.class), result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-			target = new nsIDOMEventTarget (result[0]);
-			result[0] = 0;
-			unhookDOMListeners (target);
-			target.Release ();
-			frame.Release ();
-		}
-	}
-	frames.Release ();
-	window.Release ();
-}
-
-void unhookDOMListeners (nsIDOMEventTarget target) {
-	nsEmbedString string = new nsEmbedString (XPCOM.DOMEVENT_FOCUS);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_UNLOAD);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEDOWN);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEUP);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEMOVE);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEWHEEL);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEDRAG);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEOVER);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEOUT);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_KEYDOWN);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_KEYPRESS);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-	string = new nsEmbedString (XPCOM.DOMEVENT_KEYUP);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
-	string.dispose ();
-}
-
-/* nsISupports */
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IWEAKREFERENCE_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIWebProgressListener.class, MozillaVersion.VERSION_XR24, true))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener_24.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIWebProgressListener.class, MozillaVersion.VERSION_XR10))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIWebBrowserChrome.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IWEBBROWSERCHROMEFOCUS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIEmbeddingSiteWindow.class, MozillaVersion.VERSION_XR24, true))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {embeddingSiteWindow_24.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIEmbeddingSiteWindow.class, MozillaVersion.VERSION_XR10))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIInterfaceRequestor.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_ISUPPORTSWEAKREFERENCE_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_ICONTEXTMENULISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IURICONTENTLISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_ITOOLTIPLISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IBADCERTLISTENER2_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {badCertListener.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 AddRef () {
-	refCount++;
-	return refCount;
-}
-
-int Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIWeakReference */
-
-int QueryReferent (long /*int*/ riid, long /*int*/ ppvObject) {
-	return QueryInterface (riid, ppvObject);
-}
-
-/* nsIInterfaceRequestor */
-
-int GetInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-	if (guid.Equals (IIDStore.GetIID (nsIDOMWindow.class))) {
-		long /*int*/[] aContentDOMWindow = new long /*int*/[1];
-		int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-		XPCOM.memmove (ppvObject, aContentDOMWindow, C.PTR_SIZEOF);
-		return rc;
-	}
-	return QueryInterface (riid, ppvObject);
-}
-
-int GetWeakReference (long /*int*/ ppvObject) {
-	XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
-	AddRef ();
-	return XPCOM.NS_OK;
-}
-
-/* nsIWebProgressListener */
-
-int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
-	if (registerFunctionsOnState != 0 && ((aStateFlags & registerFunctionsOnState) == registerFunctionsOnState)) {
-		registerFunctionsOnState = 0;
-		Iterator<BrowserFunction> elements = functions.values().iterator ();
-		while (elements.hasNext ()) {
-			BrowserFunction function = elements.next ();
-			if (!function.isEvaluate) {
-				execute (function.functionString);
-			}
-		}
-	}
-
-	/*
-	* Feature of Mozilla.  When a redirect occurs, no STATE_IS_DOCUMENT state
-	* transitions or OnStartURIOpen() callbacks are received for the new
-	* location.  As a result, lastNavigateURL is left with the value of the old
-	* url (that was redirected from), and the client does not get an opportunity
-	* to veto the redirect.  The only opportunity to work around these omissions
-	* is in the subsequent STATE_START | STATE_IS_REQUEST state transition.
-	* When this comes, if the request's name appears to be a url then take it to
-	* be the new site (update lastNavigateURL), and send a "changing" LocationEvent
-	* to allow the redirect to be vetoed.
-	*
-	* Note that updateLastNavigateUrl is not reset to false here so that in
-	* typical contexts where a redirect occurs without an accompanying invalid
-	* certificate, the updated site will be retrieved from the channel (this
-	* is more proper) on the next STATE_TRANSFERRING | STATE_IS_DOCUMENT transition.
-	*/
-	if (updateLastNavigateUrl && aStateFlags == (nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START)) {
-		nsIRequest request = new nsIRequest (aRequest);
-		long /*int*/ name = XPCOM.nsEmbedCString_new ();
-		int rc = request.GetName (name);
-		if (rc == XPCOM.NS_OK) {
-			int length = XPCOM.nsEmbedCString_Length (name);
-			long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
-			byte[] bytes = new byte[length];
-			XPCOM.memmove (bytes, buffer, length);
-			String value = new String (bytes);
-			if (value.indexOf (":/") != -1) { //$NON-NLS-1$
-				boolean doit = sendChangingEvent (value);
-				if (doit) {
-					lastNavigateURL = value;
-				} else {
-					stop ();
-				}
-			}
-		}
-		XPCOM.nsEmbedCString_delete (name);
-	}
-
-	if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
-	if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
-		long /*int*/[] result = new long /*int*/[1];
-
-		/*
-		* When navigating to a site that is known to have a bad certificate, request notification
-		* callbacks on the channel so that our nsIBadCertListener2 will be invoked.
-		*/
-		if (isRetrievingBadCert) {
-			nsIRequest request = new nsIRequest (aRequest);
-			int rc = request.QueryInterface (IIDStore.GetIID (nsIChannel.class), result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-			nsIChannel channel = new nsIChannel (result[0]);
-			result[0] = 0;
-			rc = channel.SetNotificationCallbacks (interfaceRequestor.getAddress ());
-			if (rc != XPCOM.NS_OK) error (rc);
-			channel.Release ();
-			return XPCOM.NS_OK;
-		}
-
-		if (request == 0) request = aRequest;
-		registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START;
-		/*
-		 * Add the page's nsIDOMWindow to the collection of windows that will
-		 * have DOM listeners added to them later on in the page loading
-		 * process.  These listeners cannot be added yet because the
-		 * nsIDOMWindow is not ready to take them at this stage.
-		 */
-		nsIWebProgress progress = new nsIWebProgress (aWebProgress);
-		int rc = progress.GetDOMWindow (result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-		unhookedDOMWindows.add (new LONG (result[0]));
-	} else if ((aStateFlags & nsIWebProgressListener.STATE_REDIRECTING) != 0) {
-		if (request == aRequest) request = 0;
-		registerFunctionsOnState = nsIWebProgressListener.STATE_TRANSFERRING;
-		updateLastNavigateUrl = true;
-	} else if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
-		if (isRetrievingBadCert) {
-			return XPCOM.NS_OK;
-		}
-
-		/*
-		* If a site with a bad certificate is being encountered for the first time
-		* then store the request for future reference, set the isRetrievingBadCert
-		* flag and re-navigate to the site so that notification callbacks can be
-		* hooked on it to get its certificate info.
-		*/
-		switch (aStatus) {
-			case XPCOM.SSL_ERROR_BAD_CERT_DOMAIN:
-			case XPCOM.SEC_ERROR_CA_CERT_INVALID:
-			case XPCOM.SEC_ERROR_EXPIRED_CERTIFICATE:
-			case XPCOM.SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-			case XPCOM.SEC_ERROR_INADEQUATE_KEY_USAGE:
-			case XPCOM.SEC_ERROR_UNKNOWN_ISSUER:
-			case XPCOM.SEC_ERROR_UNTRUSTED_CERT:
-			case XPCOM.SEC_ERROR_UNTRUSTED_ISSUER: {
-				new nsISupports (aRequest).AddRef ();
-				if (badCertRequest != 0) {
-					new nsISupports (badCertRequest).Release ();
-				}
-				badCertRequest = aRequest;
-				isRetrievingBadCert = true;
-				navigate (aRequest);
-				return XPCOM.NS_OK;
-			}
-		}
-
-		/*
-		* If this page's nsIDOMWindow handle is still in unhookedDOMWindows then
-		* add its DOM listeners now.  It's possible for this to happen since
-		* there is no guarantee that a STATE_TRANSFERRING state change will be
-		* received for every window in a page, which is when these listeners
-		* are typically added.
-		*/
-
-		long /*int*/[] result = new long /*int*/[1];
-		int rc;
-		LONG ptrObject = new LONG (result[0]);
-		result[0] = 0;
-		int index = unhookedDOMWindows.indexOf (ptrObject);
-		if (index != -1) {
-			long /*int*/[] window = new long /*int*/[1];
-			nsIWebProgress progress = new nsIWebProgress (aWebProgress);
-			rc = progress.GetDOMWindow (window);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (window[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-			rc = webBrowser.GetContentDOMWindow (result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-			boolean isTop = result[0] == window[0];
-			new nsISupports (result[0]).Release ();
-			result[0] = 0;
-
-			nsIDOMWindow domWindow = new nsIDOMWindow (window[0]);
-			rc = domWindow.QueryInterface (IIDStore.GetIID (nsIDOMEventTarget.class), result);
-			domWindow.Release();
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-			nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
-			hookDOMListeners (target, isTop);
-			target.Release ();
-			result[0] = 0;
-
-			/*
-			* Remove and unreference the nsIDOMWindow from the collection of windows
-			* that are waiting to have DOM listeners hooked on them.
-			*/
-			unhookedDOMWindows.remove (ptrObject);
-			new nsISupports (ptrObject.value).Release ();
-		}
-
-		boolean deferCompleted = false;
-		/*
-		 * If htmlBytes is not null then there is html from a previous setText() call
-		 * waiting to be set into the about:blank page once it has completed loading.
-		 */
-		if (htmlBytes != null) {
-			nsIRequest req = new nsIRequest (aRequest);
-			long /*int*/ name = XPCOM.nsEmbedCString_new ();
-			rc = req.GetName (name);
-			if (rc != XPCOM.NS_OK) error (rc);
-			int length = XPCOM.nsEmbedCString_Length (name);
-			long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
-			byte[] dest = new byte[length];
-			XPCOM.memmove (dest, buffer, length);
-			String url = new String (dest);
-			XPCOM.nsEmbedCString_delete (name);
-
-			if (url.startsWith (ABOUT_BLANK)) {
-				/*
-				 * Setting mozilla's content with nsIWebBrowserStream invalidates the
-				 * DOM listeners that were hooked on it (about:blank), so remove them and
-				 * add new ones after the content has been set.
-				 */
-				unhookDOMListeners ();
-
-				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 = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, IIDStore.GetIID (nsIIOService.class), result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-				serviceManager.Release ();
-
-				nsIIOService ioService = new nsIIOService (result[0]);
-				result[0] = 0;
-				byte[] aString;
-				if (untrustedText) {
-					aString = MozillaDelegate.wcsToMbcs (null, ABOUT_BLANK, false);
-				} else {
-					aString = MozillaDelegate.wcsToMbcs (null, URI_FILEROOT, false);
-				}
-				long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
-				rc = ioService.NewURI (aSpec, null, 0, result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-				XPCOM.nsEmbedCString_delete (aSpec);
-				ioService.Release ();
-
-				nsIURI uri = new nsIURI (result[0]);
-				result[0] = 0;
-
-				rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIWebBrowserStream.class), result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-				nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
-				result[0] = 0;
-
-				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $NON-NLS-1$
-				long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
-
-				rc = stream.OpenStream (uri.getAddress (), aContentType);
-				if (rc != XPCOM.NS_OK) error (rc);
-
-				/*
-				* For Mozilla < 1.9.2, when content is being set via nsIWebBrowserStream, this
-				* is the only place where registered functions can be re-installed such that
-				* they will be invokable at load time by JS contained in the text.
-				*/
-				Iterator<BrowserFunction> elements = functions.values().iterator ();
-				while (elements.hasNext ()) {
-					BrowserFunction function = elements.next ();
-					if (!function.isEvaluate) {
-						execute (function.functionString);
-					}
-				}
-				/*
-				* For Mozilla >= 1.9.2, when content is being set via nsIWebBrowserStream,
-				* registered functions must be re-installed in the subsequent Start Request
-				* in order to be invokable at load time by JS contained in the text.
-				*/
-				registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START;
-
-				long /*int*/ ptr = C.malloc (htmlBytes.length);
-				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
-				int pageSize = 8192;
-				int pageCount = htmlBytes.length / pageSize + 1;
-				long /*int*/ current = ptr;
-				for (int i = 0; i < pageCount; i++) {
-					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
-					if (length > 0) {
-						rc = stream.AppendToStream (current, length);
-						if (rc != XPCOM.NS_OK) error (rc);
-					}
-					current += pageSize;
-				}
-				rc = stream.CloseStream ();
-				if (rc != XPCOM.NS_OK) error (rc);
-				C.free (ptr);
-				XPCOM.nsEmbedCString_delete (aContentType);
-				stream.Release ();
-				uri.Release ();
-				htmlBytes = null;
-				/*
-				* Browser content that is set via nsIWebBrowserStream is not parsed immediately.
-				* Since clients depend on the Completed event to know when the browser's content
-				* is available, delay the sending of this event so that the stream content will
-				* be parsed first.
-				*/
-				deferCompleted = true;
-
-				long /*int*/[] window = new long /*int*/[1];
-				nsIWebProgress progress = new nsIWebProgress (aWebProgress);
-				rc = progress.GetDOMWindow (window);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (window[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-				rc = webBrowser.GetContentDOMWindow (result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-				boolean isTop = result[0] == window[0];
-				new nsISupports (result[0]).Release ();
-				result[0] = 0;
-
-				nsIDOMWindow domWindow = new nsIDOMWindow (window[0]);
-				rc = domWindow.QueryInterface (IIDStore.GetIID (nsIDOMEventTarget.class), result);
-				domWindow.Release();
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-				nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
-				hookDOMListeners (target, isTop);
-				target.Release ();
-				result[0] = 0;
-			} else {
-				registerFunctionsOnState = 0;
-			}
-		}
-
-		/*
-		* Feature in Mozilla.  When a request is redirected (STATE_REDIRECTING),
-		* it never reaches the state STATE_STOP and it is replaced with a new request.
-		* The new request is received when it is in the state STATE_STOP.
-		* To handle this case,  the variable request is set to 0 when the corresponding
-		* request is redirected. The following request received with the state STATE_STOP
-		* - the new request resulting from the redirection - is used to send
-		* the ProgressListener.completed event.
-		*/
-		if (request == aRequest || request == 0) {
-			request = 0;
-			StatusTextEvent event = new StatusTextEvent (browser);
-			event.display = browser.getDisplay ();
-			event.widget = browser;
-			event.text = ""; //$NON-NLS-1$
-			for (int i = 0; i < statusTextListeners.length; i++) {
-				statusTextListeners[i].changed (event);
-			}
-
-			final Display display = browser.getDisplay ();
-			final ProgressEvent event2 = new ProgressEvent (browser);
-			event2.display = display;
-			event2.widget = browser;
-			Runnable runnable = () -> {
-				if (browser.isDisposed ()) return;
-				for (int i = 0; i < progressListeners.length; i++) {
-					progressListeners[i].completed (event2);
-				}
-			};
-			if (deferCompleted) {
-				display.asyncExec (runnable);
-			} else {
-				display.syncExec (runnable);
-			}
-		}
-	} else if ((aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) != 0) {
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
-			registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_STOP;
-		}
-
-		if (updateLastNavigateUrl) {
-			updateLastNavigateUrl = false;
-			nsIRequest request = new nsIRequest (aRequest);
-
-			long /*int*/[] result = new long /*int*/[1];
-			int rc = request.QueryInterface (IIDStore.GetIID (nsIChannel.class), result);
-			if (rc == XPCOM.NS_OK && result[0] != 0) {
-				nsIChannel channel = new nsIChannel (result[0]);
-				result[0] = 0;
-				rc = channel.GetURI (result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-				channel.Release ();
-
-				nsIURI uri = new nsIURI (result[0]);
-				result[0] = 0;
-				long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
-				rc = uri.GetSpec (aSpec);
-				if (rc != XPCOM.NS_OK) error (rc);
-				int length = XPCOM.nsEmbedCString_Length (aSpec);
-				long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-				byte[] bytes = new byte[length];
-				XPCOM.memmove (bytes, buffer, length);
-				lastNavigateURL = new String (bytes);
-				XPCOM.nsEmbedCString_delete (aSpec);
-				uri.Release ();
-			}
-		}
-
-		/*
-		* Hook DOM listeners to the page's nsIDOMWindow here because this is
-		* the earliest opportunity to do so.
-		*/
-		long /*int*/[] result = new long /*int*/[1];
-		nsIWebProgress progress = new nsIWebProgress (aWebProgress);
-		int rc = progress.GetDOMWindow (result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-		nsIDOMWindow domWindow = new nsIDOMWindow (result[0]);
-
-		LONG ptrObject = new LONG (result[0]);
-		result[0] = 0;
-		int index = unhookedDOMWindows.indexOf (ptrObject);
-		if (index != -1) {
-			rc = webBrowser.GetContentDOMWindow (result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-			boolean isTop = result[0] == domWindow.getAddress ();
-			new nsISupports (result[0]).Release ();
-			result[0] = 0;
-
-			rc = domWindow.QueryInterface (IIDStore.GetIID (nsIDOMEventTarget.class), result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-			nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
-			hookDOMListeners (target, isTop);
-			target.Release ();
-			result[0] = 0;
-
-			/*
-			* Remove and unreference the nsIDOMWindow from the collection of windows
-			* that are waiting to have DOM listeners hooked on them.
-			*/
-			unhookedDOMWindows.remove (ptrObject);
-			new nsISupports (ptrObject.value).Release ();
-		}
-		domWindow.Release ();
-	}
-	return XPCOM.NS_OK;
-}
-
-int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
-	if (progressListeners.length == 0) return XPCOM.NS_OK;
-	ProgressEvent event = new ProgressEvent (browser);
-	event.display = browser.getDisplay ();
-	event.widget = browser;
-	event.current = aCurTotalProgress;
-	event.total = aMaxTotalProgress;
-	for (int i = 0; i < progressListeners.length; i++) {
-		progressListeners[i].changed (event);
-	}
-	return XPCOM.NS_OK;
-}
-
-int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
-	return OnLocationChange(aWebProgress, aRequest, aLocation, 0);
-}
-
-int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation, int aFlags) {
-	/*
-	* Feature in Mozilla.  When a page is loaded via setText before a previous
-	* setText page load has completed, the expected OnStateChange STATE_STOP for the
-	* original setText never arrives because it gets replaced by the OnStateChange
-	* STATE_STOP for the new request.  This results in the request field never being
-	* cleared because the original request's OnStateChange STATE_STOP is still expected
-	* (but never arrives).  To handle this case, the request field is updated to the new
-	* overriding request since its OnStateChange STATE_STOP will be received next.
-	*/
-	if (request != 0 && request != aRequest) request = aRequest;
-
-	if (locationListeners.length == 0) return XPCOM.NS_OK;
-
-	nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
-	long /*int*/[] aDOMWindow = new long /*int*/[1];
-	int rc = webProgress.GetDOMWindow (aDOMWindow);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (aDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	long /*int*/[] aTop = new long /*int*/[1];
-	nsIDOMWindow domWindow = new nsIDOMWindow (aDOMWindow[0]);
-	rc = domWindow.GetTop (aTop);
-	domWindow.Release ();
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (aTop[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-	nsIDOMWindow topWindow = new nsIDOMWindow (aTop[0]);
-	topWindow.Release ();
-
-	nsIURI location = new nsIURI (aLocation);
-	long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
-	location.GetSpec (aSpec);
-	int length = XPCOM.nsEmbedCString_Length (aSpec);
-	long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-	byte[] dest = new byte[length];
-	XPCOM.memmove (dest, buffer, length);
-	XPCOM.nsEmbedCString_delete (aSpec);
-	String url = new String (dest);
-
-	/*
-	 * As of Mozilla 1.8, the first time that a page is displayed, regardless of
-	 * whether it's via Browser.setURL() or Browser.setText(), the GRE navigates
-	 * to about:blank and fires the corresponding navigation events.  Do not send
-	 * this event on to the user since it is not expected.
-	 */
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_8) && aRequest == 0 && url.startsWith (ABOUT_BLANK)) return XPCOM.NS_OK;
-
-	LocationEvent event = new LocationEvent (browser);
-	event.display = browser.getDisplay ();
-	event.widget = browser;
-	event.location = url;
-	/*
-	 * If the URI indicates that the page is being rendered from memory
-	 * (via setText()) then set it to about:blank to be consistent with IE.
-	 */
-	if (event.location.equals (URI_FILEROOT)) {
-		event.location = ABOUT_BLANK;
-	} else {
-		length = URI_FILEROOT.length ();
-		if (event.location.startsWith (URI_FILEROOT) && event.location.charAt (length) == '#') {
-			event.location = ABOUT_BLANK + event.location.substring (length);
-		}
-	}
-	event.top = aTop[0] == aDOMWindow[0];
-	for (int i = 0; i < locationListeners.length; i++) {
-		locationListeners[i].changed (event);
-	}
-	return XPCOM.NS_OK;
-}
-
-int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
-	if (statusTextListeners.length == 0) return XPCOM.NS_OK;
-	StatusTextEvent event = new StatusTextEvent (browser);
-	event.display = browser.getDisplay ();
-	event.widget = browser;
-	int length = XPCOM.strlen_PRUnichar (aMessage);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aMessage, length * 2);
-	event.text = new String (dest);
-	for (int i = 0; i < statusTextListeners.length; i++) {
-		statusTextListeners[i].changed (event);
-	}
-	return XPCOM.NS_OK;
-}
-
-int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
-	return XPCOM.NS_OK;
-}
-
-/* nsIWebBrowserChrome */
-
-int SetStatus (int statusType, long /*int*/ status) {
-	if (statusTextListeners.length == 0) return XPCOM.NS_OK;
-	StatusTextEvent event = new StatusTextEvent (browser);
-	event.display = browser.getDisplay ();
-	event.widget = browser;
-	int length = XPCOM.strlen_PRUnichar (status);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, status, length * 2);
-	String string = new String (dest);
-	event.text = string;
-	for (int i = 0; i < statusTextListeners.length; i++) {
-		statusTextListeners[i].changed (event);
-	}
-	return XPCOM.NS_OK;
-}
-
-int GetWebBrowser (long /*int*/ aWebBrowser) {
-	long /*int*/[] ret = new long /*int*/[1];
-	if (webBrowser != null) {
-		webBrowser.AddRef ();
-		ret[0] = webBrowser.getAddress ();
-	}
-	XPCOM.memmove (aWebBrowser, ret, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-
-int SetWebBrowser (long /*int*/ aWebBrowser) {
-	if (webBrowser != null) webBrowser.Release ();
-	webBrowser = aWebBrowser != 0 ? new nsIWebBrowser (aWebBrowser) : null;
-	return XPCOM.NS_OK;
-}
-
-int GetChromeFlags (long /*int*/ aChromeFlags) {
-	int[] ret = new int[1];
-	ret[0] = chromeFlags;
-	XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */
-	return XPCOM.NS_OK;
-}
-
-int SetChromeFlags (int aChromeFlags) {
-	chromeFlags = aChromeFlags;
-	return XPCOM.NS_OK;
-}
-
-int DestroyBrowserWindow () {
-	WindowEvent newEvent = new WindowEvent (browser);
-	newEvent.display = browser.getDisplay ();
-	newEvent.widget = browser;
-	for (int i = 0; i < closeWindowListeners.length; i++) {
-		closeWindowListeners[i].close (newEvent);
-	}
-	/*
-	* Note on Mozilla.  The DestroyBrowserWindow notification cannot be cancelled.
-	* The browser widget cannot be used after this notification has been received.
-	* The application is advised to close the window hosting the browser widget.
-	* The browser widget must be disposed in all cases.
-	*/
-	browser.dispose ();
-	return XPCOM.NS_OK;
-}
-
-int SizeBrowserTo (int aCX, int aCY) {
-	size = new Point (aCX, aCY);
-	boolean isChrome = (chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) != 0;
-	if (isChrome) {
-		Shell shell = browser.getShell ();
-		shell.setSize (shell.computeSize (size.x, size.y));
-	}
-	return XPCOM.NS_OK;
-}
-
-int ShowAsModal () {
-	long /*int*/[] result = new long /*int*/[1];
-	int 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;
-	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
-	rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIJSContextStack.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-	serviceManager.Release ();
-
-	nsIJSContextStack stack = new nsIJSContextStack (result[0]);
-	result[0] = 0;
-	rc = stack.Push (0);
-	if (rc != XPCOM.NS_OK) error (rc);
-
-	Shell shell = browser.getShell ();
-	Display display = browser.getDisplay ();
-	while (!shell.isDisposed ()) {
-		if (!display.readAndDispatch ()) display.sleep ();
-	}
-
-	rc = stack.Pop (result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	stack.Release ();
-	return XPCOM.NS_OK;
-}
-
-int IsWindowModal (long /*int*/ retval) {
-	boolean result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0;
-	XPCOM.memmove (retval, new boolean[] {result});
-	return XPCOM.NS_OK;
-}
-
-int ExitModalEventLoop (int aStatus) {
-	return XPCOM.NS_OK;
-}
-
-/* nsIEmbeddingSiteWindow */
-
-int SetDimensions (int flags, int x, int y, int cx, int cy) {
-	boolean isChrome = (chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) != 0;
-	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
-		location = new Point (x, y);
-		if (isChrome) {
-			browser.getShell ().setLocation (x, y);
-		}
-	}
-	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_SIZE_INNER) != 0) {
-		size = new Point (cx, cy);
-		if (isChrome) {
-			browser.setSize (cx, cy);
-		}
-	}
-	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_SIZE_OUTER) != 0) {
-		if (isChrome) {
-			browser.getShell ().setSize (cx, cy);
-		}
-	}
-	return XPCOM.NS_OK;
-}
-
-int GetDimensions (int flags, long /*int*/ x, long /*int*/ y, long /*int*/ cx, long /*int*/ cy) {
-	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
-		Point location = browser.getShell ().getLocation ();
-		if (x != 0) C.memmove (x, new int[] {location.x}, 4); /* PRInt32 */
-		if (y != 0) C.memmove (y, new int[] {location.y}, 4); /* PRInt32 */
-	}
-	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_SIZE_INNER) != 0) {
-		Point size = browser.getSize ();
-		if (cx != 0) C.memmove (cx, new int[] {size.x}, 4); /* PRInt32 */
-		if (cy != 0) C.memmove (cy, new int[] {size.y}, 4); /* PRInt32 */
-	}
-	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_SIZE_OUTER) != 0) {
-		Point size = browser.getShell().getSize ();
-		if (cx != 0) C.memmove (cx, new int[] {size.x}, 4); /* PRInt32 */
-		if (cy != 0) C.memmove (cy, new int[] {size.y}, 4); /* PRInt32 */
-	}
-	return XPCOM.NS_OK;
-}
-
-int SetFocus () {
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIBaseWindow.class), result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-	nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
-	rc = baseWindow.SetFocus ();
-	if (rc != XPCOM.NS_OK) error (rc);
-	baseWindow.Release ();
-
-	/*
-	* Note. Mozilla notifies here that one of the children took
-	* focus. This could or should be used to fire an SWT.FOCUS_IN
-	* event on Browser focus listeners.
-	*/
-	return XPCOM.NS_OK;
-}
-
-int GetVisibility (long /*int*/ aVisibility) {
-	boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
-	XPCOM.memmove (aVisibility, new boolean[] {visible});
-	return XPCOM.NS_OK;
-}
-
-int SetVisibility (int aVisibility) {
-	if (isChild) {
-		WindowEvent event = new WindowEvent (browser);
-		event.display = browser.getDisplay ();
-		event.widget = browser;
-		if (aVisibility != 0) {
-			/*
-			* Bug in Mozilla.  When the JavaScript window.open is executed, Mozilla
-			* fires multiple SetVisibility 1 notifications.  The workaround is
-			* to ignore subsequent notifications.
-			*/
-			if (!visible) {
-				visible = true;
-				event.location = location;
-				event.size = size;
-				event.addressBar = (chromeFlags & nsIWebBrowserChrome.CHROME_LOCATIONBAR) != 0;
-				/* Feature of OSX.  The menu bar is always displayed. */
-				boolean isOSX = Platform.PLATFORM.equals ("cocoa");
-				event.menuBar = isOSX || (chromeFlags & nsIWebBrowserChrome.CHROME_MENUBAR) != 0;
-				event.statusBar = (chromeFlags & nsIWebBrowserChrome.CHROME_STATUSBAR) != 0;
-				event.toolBar = (chromeFlags & nsIWebBrowserChrome.CHROME_TOOLBAR) != 0;
-				for (int i = 0; i < visibilityWindowListeners.length; i++) {
-					visibilityWindowListeners[i].show (event);
-				}
-				location = null;
-				size = null;
-			}
-		} else {
-			visible = false;
-			for (int i = 0; i < visibilityWindowListeners.length; i++) {
-				visibilityWindowListeners[i].hide (event);
-			}
-		}
-	}
-	return XPCOM.NS_OK;
-}
-
-int GetTitle (long /*int*/ aTitle) {
-	return XPCOM.NS_OK;
-}
-
-int SetTitle (long /*int*/ aTitle) {
-	if (titleListeners.length == 0) return XPCOM.NS_OK;
-	TitleEvent event = new TitleEvent (browser);
-	event.display = browser.getDisplay ();
-	event.widget = browser;
-	/*
-	* To be consistent with other platforms the title event should
-	* contain the page's url if the page does not contain a <title>
-	* tag.
-	*/
-	int length = XPCOM.strlen_PRUnichar (aTitle);
-	if (length > 0) {
-		char[] dest = new char[length];
-		XPCOM.memmove (dest, aTitle, length * 2);
-		event.title = new String (dest);
-	} else {
-		event.title = getUrl ();
-	}
-	for (int i = 0; i < titleListeners.length; i++) {
-		titleListeners[i].changed (event);
-	}
-	return XPCOM.NS_OK;
-}
-
-int GetSiteWindow (long /*int*/ aSiteWindow) {
-	/*
-	* This is expected to be an HWND on Windows, a GtkWidget* on GTK, and
-	* a WindowPtr on OS X.  This callback is invoked on Windows when the
-	* print dialog is to be shown.  If no handle is returned then no print
-	* dialog is shown with XULRunner versions < 4.
-	*/
-
-	long /*int*/ siteWindow = delegate.getSiteWindow ();
-	XPCOM.memmove (aSiteWindow, new long /*int*/[] {siteWindow}, C.PTR_SIZEOF);
-	return XPCOM.NS_OK;
-}
-
-int Blur () {
-	return XPCOM.NS_OK;
-}
-
-/* nsIWebBrowserChromeFocus */
-
-int FocusNextElement () {
-	/*
-	* Bug in Mozilla embedding API.  Mozilla takes back the focus after sending
-	* this event.  This prevents tabbing out of Mozilla. This behaviour can be reproduced
-	* with the Mozilla application TestGtkEmbed.  The workaround is to
-	* send the traversal notification after this callback returns.
-	*/
-	browser.getDisplay ().asyncExec (() -> {
-		if (browser.isDisposed ()) return;
-		browser.traverse (SWT.TRAVERSE_TAB_NEXT);
-	});
-	return XPCOM.NS_OK;
-}
-
-int FocusPrevElement () {
-	/*
-	* Bug in Mozilla embedding API.  Mozilla takes back the focus after sending
-	* this event.  This prevents tabbing out of Mozilla. This behaviour can be reproduced
-	* with the Mozilla application TestGtkEmbed.  The workaround is to
-	* send the traversal notification after this callback returns.
-	*/
-	browser.getDisplay ().asyncExec (() -> {
-		if (browser.isDisposed ()) return;
-		browser.traverse (SWT.TRAVERSE_TAB_PREVIOUS);
-	});
-	return XPCOM.NS_OK;
-}
-
-/* nsIContextMenuListener */
-
-int OnShowContextMenu (int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {
-	nsIDOMEvent domEvent = new nsIDOMEvent (aEvent);
-	long /*int*/[] result = new long /*int*/[1];
-	int rc = domEvent.QueryInterface (IIDStore.GetIID (nsIDOMMouseEvent.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-	int[] aScreenX = new int[1], aScreenY = new int[1];
-	nsIDOMMouseEvent domMouseEvent = new nsIDOMMouseEvent (result[0]);
-	rc = domMouseEvent.GetScreenX (aScreenX);
-	if (rc != XPCOM.NS_OK) error (rc);
-	rc = domMouseEvent.GetScreenY (aScreenY);
-	if (rc != XPCOM.NS_OK) error (rc);
-	domMouseEvent.Release ();
-
-	Event event = new Event ();
-	aScreenX[0] = DPIUtil.autoScaleDown(aScreenX[0]); // To Points
-	aScreenY[0] = DPIUtil.autoScaleDown(aScreenY[0]); // To Points
-	event.x = aScreenX[0];
-	event.y = aScreenY[0];
-	browser.notifyListeners (SWT.MenuDetect, event);
-	if (!event.doit || browser.isDisposed ()) return XPCOM.NS_OK;
-	Menu menu = browser.getMenu ();
-	if (menu != null && !menu.isDisposed ()) {
-		if (aScreenX[0] != event.x || aScreenY[0] != event.y) {
-			menu.setLocation (event.x, event.y);
-		}
-		menu.setVisible (true);
-	}
-	return XPCOM.NS_OK;
-}
-
-/* nsIURIContentListener */
-
-int OnStartURIOpen (long /*int*/ aURI, long /*int*/ retval) {
-	if (isRetrievingBadCert) return XPCOM.NS_OK;
-	authCount = 0;
-
-	nsIURI location = new nsIURI (aURI);
-	long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
-	location.GetSpec (aSpec);
-	int length = XPCOM.nsEmbedCString_Length (aSpec);
-	long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-	buffer = XPCOM.nsEmbedCString_get (aSpec);
-	byte[] dest = new byte[length];
-	XPCOM.memmove (dest, buffer, length);
-	XPCOM.nsEmbedCString_delete (aSpec);
-	String value = new String (dest);
-
-	/*
-	* Navigating to "...aboutCertError.xhtml", or to "javascript:showSecuritySection()" when
-	* the page "netError.xhtml" is showing, indicates that the last attempted page view had
-	* an invalid certificate.  When this happens, veto the current navigate and re-navigate
-	* to the page with the bad certificate so that NotifyCertProblem will be invoked.
-	*/
-	if (value.indexOf ("aboutCertError.xhtml") != -1 || (isViewingErrorPage && value.indexOf ("javascript:showSecuritySection") != -1)) { //$NON-NLS-1$ //$NON-NLS-2$
-		XPCOM.memmove (retval, new boolean[] {true});
-		isRetrievingBadCert = true;
-		setUrl (lastNavigateURL, (byte[])null, null);
-		return XPCOM.NS_OK;
-	}
-	boolean doit = sendChangingEvent (value);
-	XPCOM.memmove (retval, new boolean[] {!doit});
-	return XPCOM.NS_OK;
-}
-
-int DoContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/ aContentHandler, long /*int*/ retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int IsPreferred (long /*int*/ aContentType, long /*int*/ aDesiredContentType, long /*int*/ retval) {
-	boolean preferred = false;
-	int size = XPCOM.strlen (aContentType);
-	if (size > 0) {
-		byte[] typeBytes = new byte[size + 1];
-		XPCOM.memmove (typeBytes, aContentType, size);
-		String contentType = new String (typeBytes, 0, size);
-
-		/* do not attempt to handle known problematic content types */
-		if (!contentType.equals (XPCOM.CONTENT_MAYBETEXT) && !contentType.equals (XPCOM.CONTENT_MULTIPART)) {
-			/* determine whether browser can handle the content type */
-			long /*int*/[] result = new long /*int*/[1];
-			int 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;
-
-			/* First try to use the nsIWebNavigationInfo if it's available (>= mozilla 1.8) */
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WEBNAVIGATIONINFO_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIWebNavigationInfo.class), result);
-			if (rc == XPCOM.NS_OK) {
-				byte[] bytes = MozillaDelegate.wcsToMbcs (null, contentType, false);
-				long /*int*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length);
-				nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);
-				result[0] = 0;
-				int[] isSupportedResult = new int[1]; /* PRUint32 */
-				rc = info.IsTypeSupported (typePtr, 0, isSupportedResult);
-				if (rc != XPCOM.NS_OK) error (rc);
-				info.Release ();
-				XPCOM.nsEmbedCString_delete (typePtr);
-				preferred = isSupportedResult[0] != 0;
-			} else {
-				/* nsIWebNavigationInfo is not available, so do the type lookup */
-				result[0] = 0;
-				rc = serviceManager.GetService (XPCOM.NS_CATEGORYMANAGER_CID, IIDStore.GetIID (nsICategoryManager.class), result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-				nsICategoryManager categoryManager = new nsICategoryManager (result[0]);
-				result[0] = 0;
-				byte[] categoryBytes = MozillaDelegate.wcsToMbcs (null, "Gecko-Content-Viewers", true);	//$NON-NLS-1$
-				rc = categoryManager.GetCategoryEntry (categoryBytes, typeBytes, result);
-				categoryManager.Release ();
-				/* if no viewer for the content type is registered then rc == XPCOM.NS_ERROR_NOT_AVAILABLE */
-				preferred = rc == XPCOM.NS_OK;
-			}
-			serviceManager.Release ();
-		}
-	}
-
-	XPCOM.memmove(retval, new boolean[] {preferred});
-	if (preferred) {
-		XPCOM.memmove (aDesiredContentType, new long /*int*/[] {0}, C.PTR_SIZEOF);
-	}
-	return XPCOM.NS_OK;
-}
-
-int CanHandleContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aDesiredContentType, long /*int*/ retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetLoadCookie (long /*int*/ aLoadCookie) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetLoadCookie (long /*int*/ aLoadCookie) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetParentContentListener (long /*int*/ aParentContentListener) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetParentContentListener (long /*int*/ aParentContentListener) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsITooltipListener */
-
-int OnShowTooltip (int aXCoords, int aYCoords, long /*int*/ aTipText) {
-	int length = XPCOM.strlen_PRUnichar (aTipText);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aTipText, length * 2);
-	String text = new String (dest);
-	if (tip != null && !tip.isDisposed ()) tip.dispose ();
-	Display display = browser.getDisplay ();
-	Shell parent = browser.getShell ();
-	tip = new Shell (parent, SWT.ON_TOP);
-	tip.setLayout (new FillLayout());
-	Label label = new Label (tip, SWT.CENTER);
-	label.setForeground (display.getSystemColor (SWT.COLOR_INFO_FOREGROUND));
-	label.setBackground (display.getSystemColor (SWT.COLOR_INFO_BACKGROUND));
-	label.setText (text);
-	/*
-	* Bug in Mozilla embedded API.  Tooltip coordinates are wrong for
-	* elements inside an inline frame (IFrame tag).  The workaround is
-	* to position the tooltip based on the mouse cursor location.
-	*/
-	Point point = display.getCursorLocation ();
-	/* Assuming cursor is 21x21 because this is the size of
-	 * the arrow cursor on Windows
-	 */
-	point.y += 21;
-	tip.setLocation (point);
-	tip.pack ();
-	tip.setVisible (true);
-	return XPCOM.NS_OK;
-}
-
-int OnHideTooltip () {
-	if (tip != null && !tip.isDisposed ()) tip.dispose ();
-	tip = null;
-	return XPCOM.NS_OK;
-}
-
-int HandleEvent (long /*int*/ event) {
-	nsIDOMEvent domEvent = new nsIDOMEvent (event);
-	nsEmbedString type = new nsEmbedString ();
-	int rc = domEvent.GetType (type.getAddress());
-	if (rc != XPCOM.NS_OK) error (rc);
-	String typeString = type.toString();
-	type.dispose();
-
-	if (XPCOM.DOMEVENT_UNLOAD.equals (typeString)) {
-		long /*int*/[] result = new long /*int*/[1];
-		rc = domEvent.GetCurrentTarget (result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-		nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
-		unhookDOMListeners (target);
-		target.Release ();
-		return XPCOM.NS_OK;
-	}
-
-	if (XPCOM.DOMEVENT_FOCUS.equals (typeString)) {
-		delegate.handleFocus ();
-		return XPCOM.NS_OK;
-	}
-
-	if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
-		long /*int*/[] result = new long /*int*/[1];
-		rc = domEvent.QueryInterface (IIDStore.GetIID (nsIDOMKeyEvent.class), result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-		nsIDOMKeyEvent domKeyEvent = new nsIDOMKeyEvent (result[0]);
-		result[0] = 0;
-
-		int[] aKeyCode = new int[1]; /* PRUint32 */
-		rc = domKeyEvent.GetKeyCode (aKeyCode);
-		if (rc != XPCOM.NS_OK) error (rc);
-		int keyCode = translateKey (aKeyCode[0]);
-
-		/*
-		* if keyCode == lastKeyCode then either a repeating key like Shift
-		* is being held or a key for which key events are not sent has been
-		* pressed.  In both of these cases a KeyDown should not be sent.
-		*/
-		if (keyCode != lastKeyCode) {
-			lastKeyCode = keyCode;
-			switch (keyCode) {
-				case SWT.SHIFT:
-				case SWT.CONTROL:
-				case SWT.ALT:
-				case SWT.CAPS_LOCK:
-				case SWT.NUM_LOCK:
-				case SWT.SCROLL_LOCK:
-				case SWT.COMMAND: {
-					/* keypress events will not be received for these keys, so send KeyDowns for them now */
-					int[] aAltKey = new int[1], aCtrlKey = new int[1], aShiftKey = new int[1], aMetaKey = new int[1]; /* PRBool */
-					rc = domKeyEvent.GetAltKey (aAltKey);
-					if (rc != XPCOM.NS_OK) error (rc);
-					rc = domKeyEvent.GetCtrlKey (aCtrlKey);
-					if (rc != XPCOM.NS_OK) error (rc);
-					rc = domKeyEvent.GetShiftKey (aShiftKey);
-					if (rc != XPCOM.NS_OK) error (rc);
-					rc = domKeyEvent.GetMetaKey (aMetaKey);
-					if (rc != XPCOM.NS_OK) error (rc);
-
-					Event keyEvent = new Event ();
-					keyEvent.widget = browser;
-					keyEvent.type = SWT.KeyDown;
-					keyEvent.keyCode = keyCode;
-					keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
-					keyEvent.stateMask &= ~keyCode;		/* remove current keydown if it's a state key */
-					browser.notifyListeners (keyEvent.type, keyEvent);
-					if (!keyEvent.doit || browser.isDisposed ()) {
-						domEvent.PreventDefault ();
-					}
-					break;
-				}
-				default: {
-					/*
-					* If the keydown has Meta (but not Meta+Ctrl) as a modifier then send a KeyDown event for it here
-					* because a corresponding keypress event will not be received for it from the DOM.  If the keydown
-					* does not have Meta as a modifier, or has Meta+Ctrl as a modifier, then then do nothing here
-					* because its KeyDown event will be sent from the keypress listener.
-					*/
-					int[] aMetaKey = new int[1]; /* PRBool */
-					rc = domKeyEvent.GetMetaKey (aMetaKey);
-					if (rc != XPCOM.NS_OK) error (rc);
-					if (aMetaKey[0] != 0) {
-						int[] aCtrlKey = new int[1]; /* PRBool */
-						rc = domKeyEvent.GetCtrlKey (aCtrlKey);
-						if (rc != XPCOM.NS_OK) error (rc);
-						if (aCtrlKey[0] == 0) {
-							int[] aAltKey = new int[1], aShiftKey = new int[1]; /* PRBool */
-							rc = domKeyEvent.GetAltKey (aAltKey);
-							if (rc != XPCOM.NS_OK) error (rc);
-							rc = domKeyEvent.GetShiftKey (aShiftKey);
-							if (rc != XPCOM.NS_OK) error (rc);
-
-							Event keyEvent = new Event ();
-							keyEvent.widget = browser;
-							keyEvent.type = SWT.KeyDown;
-							keyEvent.keyCode = lastKeyCode;
-							keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0? SWT.CTRL : 0) | (aShiftKey[0] != 0? SWT.SHIFT : 0) | (aMetaKey[0] != 0? SWT.COMMAND : 0);
-							browser.notifyListeners (keyEvent.type, keyEvent);
-							if (!keyEvent.doit || browser.isDisposed ()) {
-								domEvent.PreventDefault ();
-							}
-						}
-					}
-				}
-			}
-		}
-
-		domKeyEvent.Release ();
-		return XPCOM.NS_OK;
-	}
-
-	if (XPCOM.DOMEVENT_KEYPRESS.equals (typeString)) {
-		/*
-		* if keydown could not determine a keycode for this key then it's a
-		* key for which key events are not sent (eg.- the Windows key)
-		*/
-		if (lastKeyCode == 0) return XPCOM.NS_OK;
-
-		/*
-		* On linux only, unexpected keypress events are received for some
-		* modifier keys.  The workaround is to ignore these events since
-		* KeyDown events are sent for these keys in the keydown listener.
-		*/
-		switch (lastKeyCode) {
-			case SWT.CAPS_LOCK:
-			case SWT.NUM_LOCK:
-			case SWT.SCROLL_LOCK: return XPCOM.NS_OK;
-		}
-
-		long /*int*/[] result = new long /*int*/[1];
-		rc = domEvent.QueryInterface (IIDStore.GetIID (nsIDOMKeyEvent.class), result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-		nsIDOMKeyEvent domKeyEvent = new nsIDOMKeyEvent (result[0]);
-		result[0] = 0;
-
-		int[] aAltKey = new int[1], aCtrlKey = new int[1], aShiftKey = new int[1], aMetaKey = new int[1]; /* PRBool */
-		rc = domKeyEvent.GetAltKey (aAltKey);
-		if (rc != XPCOM.NS_OK) error (rc);
-		rc = domKeyEvent.GetCtrlKey (aCtrlKey);
-		if (rc != XPCOM.NS_OK) error (rc);
-		rc = domKeyEvent.GetShiftKey (aShiftKey);
-		if (rc != XPCOM.NS_OK) error (rc);
-		rc = domKeyEvent.GetMetaKey (aMetaKey);
-		if (rc != XPCOM.NS_OK) error (rc);
-		int[] aCharCode = new int[1]; /* PRUint32 */
-		rc = domKeyEvent.GetCharCode (aCharCode);
-		if (rc != XPCOM.NS_OK) error (rc);
-		domKeyEvent.Release ();
-		lastCharCode = aCharCode[0];
-		if (lastCharCode == 0) {
-			switch (lastKeyCode) {
-				case SWT.TAB: lastCharCode = SWT.TAB; break;
-				case SWT.CR: lastCharCode = SWT.CR; break;
-				case SWT.BS: lastCharCode = SWT.BS; break;
-				case SWT.ESC: lastCharCode = SWT.ESC; break;
-				case SWT.DEL: lastCharCode = SWT.DEL; break;
-			}
-		}
-		if (aCtrlKey[0] != 0 && (0 <= lastCharCode && lastCharCode <= 0x7F)) {
-			if ('a'  <= lastCharCode && lastCharCode <= 'z') lastCharCode -= 'a' - 'A';
-			if (64 <= lastCharCode && lastCharCode <= 95) lastCharCode -= 64;
-		}
-
-		Event keyEvent = new Event ();
-		keyEvent.widget = browser;
-		keyEvent.type = SWT.KeyDown;
-		keyEvent.keyCode = lastKeyCode;
-		keyEvent.character = (char)lastCharCode;
-		keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
-		boolean doit = true;
-		if (delegate.sendTraverse ()) {
-			doit = sendKeyEvent (keyEvent);
-		} else {
-			browser.notifyListeners (keyEvent.type, keyEvent);
-			doit = keyEvent.doit;
-		}
-		if (!doit || browser.isDisposed ()) {
-			domEvent.PreventDefault ();
-		}
-		return XPCOM.NS_OK;
-	}
-
-	if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
-		long /*int*/[] result = new long /*int*/[1];
-		rc = domEvent.QueryInterface (IIDStore.GetIID (nsIDOMKeyEvent.class), result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-		nsIDOMKeyEvent domKeyEvent = new nsIDOMKeyEvent (result[0]);
-		result[0] = 0;
-
-		int[] aKeyCode = new int[1]; /* PRUint32 */
-		rc = domKeyEvent.GetKeyCode (aKeyCode);
-		if (rc != XPCOM.NS_OK) error (rc);
-		int keyCode = translateKey (aKeyCode[0]);
-		if (keyCode == 0) {
-			/* indicates a key for which key events are not sent */
-			domKeyEvent.Release ();
-			return XPCOM.NS_OK;
-		}
-		if (keyCode != lastKeyCode) {
-			/* keyup does not correspond to the last keydown */
-			lastKeyCode = keyCode;
-			lastCharCode = 0;
-		}
-
-		int[] aAltKey = new int[1], aCtrlKey = new int[1], aShiftKey = new int[1], aMetaKey = new int[1]; /* PRBool */
-		rc = domKeyEvent.GetAltKey (aAltKey);
-		if (rc != XPCOM.NS_OK) error (rc);
-		rc = domKeyEvent.GetCtrlKey (aCtrlKey);
-		if (rc != XPCOM.NS_OK) error (rc);
-		rc = domKeyEvent.GetShiftKey (aShiftKey);
-		if (rc != XPCOM.NS_OK) error (rc);
-		rc = domKeyEvent.GetMetaKey (aMetaKey);
-		if (rc != XPCOM.NS_OK) error (rc);
-		domKeyEvent.Release ();
-
-		Event keyEvent = new Event ();
-		keyEvent.widget = browser;
-		keyEvent.type = SWT.KeyUp;
-		keyEvent.keyCode = lastKeyCode;
-		keyEvent.character = (char)lastCharCode;
-		keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
-		switch (lastKeyCode) {
-			case SWT.SHIFT:
-			case SWT.CONTROL:
-			case SWT.ALT:
-			case SWT.COMMAND: {
-				keyEvent.stateMask |= lastKeyCode;
-			}
-		}
-		browser.notifyListeners (keyEvent.type, keyEvent);
-		if (!keyEvent.doit || browser.isDisposed ()) {
-			domEvent.PreventDefault ();
-		}
-		lastKeyCode = lastCharCode = 0;
-		return XPCOM.NS_OK;
-	}
-
-	/* mouse event */
-
-	long /*int*/[] result = new long /*int*/[1];
-	rc = domEvent.QueryInterface (IIDStore.GetIID (nsIDOMMouseEvent.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-	nsIDOMMouseEvent domMouseEvent = new nsIDOMMouseEvent (result[0]);
-	result[0] = 0;
-
-	/*
-	 * MouseOver and MouseOut events are fired any time the mouse enters or exits
-	 * any element within the Browser.  To ensure that SWT events are only
-	 * fired for mouse movements into or out of the Browser, do not fire an
-	 * event if the element being exited (on MouseOver) or entered (on MouseExit)
-	 * is within the Browser.
-	 */
-	if (XPCOM.DOMEVENT_MOUSEOVER.equals (typeString) || XPCOM.DOMEVENT_MOUSEOUT.equals (typeString)) {
-		rc = domMouseEvent.GetRelatedTarget (result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] != 0) {
-			new nsISupports (result[0]).Release ();
-			domMouseEvent.Release ();
-			return XPCOM.NS_OK;
-		}
-	}
-
-	int[] aScreenX = new int[1], aScreenY = new int[1]; /* PRInt32 */
-
-	/*
-	 * The position of mouse events is received in screen-relative coordinates
-	 * in order to handle pages with frames, since frames express their event
-	 * coordinates relative to themselves rather than relative to their top-
-	 * level page.  Convert screen-relative coordinates to be browser-relative.
-	 */
-	rc = domMouseEvent.GetScreenX (aScreenX);
-	if (rc != XPCOM.NS_OK) error (rc);
-	rc = domMouseEvent.GetScreenY (aScreenY);
-	if (rc != XPCOM.NS_OK) error (rc);
-	Point position = DPIUtil.autoScaleDown(new Point (aScreenX[0], aScreenY[0]));// To Points
-	position = browser.getDisplay ().map (null, browser, position);
-
-	int[] aDetail = new int[1]; /* PRInt32 */
-	rc = domMouseEvent.GetDetail (aDetail);
-	if (rc != XPCOM.NS_OK) error (rc);
-	short[] aButton = new short[1]; /* PRUint16 */
-	rc = domMouseEvent.GetButton (aButton);
-	if (rc != XPCOM.NS_OK) error (rc);
-	int[] aAltKey = new int[1], aCtrlKey = new int[1], aShiftKey = new int[1], aMetaKey = new int[1]; /* PRBool */
-	rc = domMouseEvent.GetAltKey (aAltKey);
-	if (rc != XPCOM.NS_OK) error (rc);
-	rc = domMouseEvent.GetCtrlKey (aCtrlKey);
-	if (rc != XPCOM.NS_OK) error (rc);
-	rc = domMouseEvent.GetShiftKey (aShiftKey);
-	if (rc != XPCOM.NS_OK) error (rc);
-	rc = domMouseEvent.GetMetaKey (aMetaKey);
-	if (rc != XPCOM.NS_OK) error (rc);
-	domMouseEvent.Release ();
-
-	Event mouseEvent = new Event ();
-	mouseEvent.widget = browser;
-	mouseEvent.x = position.x; mouseEvent.y = position.y;
-	mouseEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
-
-	if (XPCOM.DOMEVENT_MOUSEDOWN.equals (typeString)) {
-		delegate.handleMouseDown ();
-		mouseEvent.type = SWT.MouseDown;
-		mouseEvent.button = aButton[0] + 1;
-		mouseEvent.count = aDetail[0];
-	} else if (XPCOM.DOMEVENT_MOUSEUP.equals (typeString)) {
-		/*
-		 * Bug on OSX.  For some reason multiple mouseup events come from the DOM
-		 * when button 3 is released on OSX.  The first of these events has a count
-		 * detail and the others do not.  The workaround is to not fire received
-		 * button 3 mouseup events that do not have a count since mouse events
-		 * without a click count are not valid.
-		 */
-		int button = aButton[0] + 1;
-		int count = aDetail[0];
-		if (count == 0 && button == 3) return XPCOM.NS_OK;
-		mouseEvent.type = SWT.MouseUp;
-		mouseEvent.button = button;
-		mouseEvent.count = count;
-	} else if (XPCOM.DOMEVENT_MOUSEMOVE.equals (typeString)) {
-		mouseEvent.type = SWT.MouseMove;
-	} else if (XPCOM.DOMEVENT_MOUSEWHEEL.equals (typeString)) {
-		mouseEvent.type = SWT.MouseWheel;
-		mouseEvent.count = -aDetail[0];
-	} else if (XPCOM.DOMEVENT_MOUSEOVER.equals (typeString)) {
-		mouseEvent.type = SWT.MouseEnter;
-	} else if (XPCOM.DOMEVENT_MOUSEOUT.equals (typeString)) {
-		mouseEvent.type = SWT.MouseExit;
-	} else if (XPCOM.DOMEVENT_MOUSEDRAG.equals (typeString)) {
-		mouseEvent.type = SWT.DragDetect;
-		mouseEvent.button = aButton[0] + 1;
-		switch (mouseEvent.button) {
-			case 1: mouseEvent.stateMask |= SWT.BUTTON1; break;
-			case 2: mouseEvent.stateMask |= SWT.BUTTON2; break;
-			case 3: mouseEvent.stateMask |= SWT.BUTTON3; break;
-			case 4: mouseEvent.stateMask |= SWT.BUTTON4; break;
-			case 5: mouseEvent.stateMask |= SWT.BUTTON5; break;
-		}
-	}
-
-	browser.notifyListeners (mouseEvent.type, mouseEvent);
-	if (browser.isDisposed ()) return XPCOM.NS_OK;
-	if (aDetail[0] == 2 && XPCOM.DOMEVENT_MOUSEDOWN.equals (typeString)) {
-		mouseEvent = new Event ();
-		mouseEvent.widget = browser;
-		mouseEvent.x = position.x; mouseEvent.y = position.y;
-		mouseEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
-		mouseEvent.type = SWT.MouseDoubleClick;
-		mouseEvent.button = aButton[0] + 1;
-		mouseEvent.count = aDetail[0];
-		browser.notifyListeners (mouseEvent.type, mouseEvent);
-	}
-	return XPCOM.NS_OK;
-}
-
-/* nsIBadCertListener2 */
-
-int NotifyCertProblem (long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, long /*int*/ _suppressError) {
-	/* determine the host name and port */
-	int length = XPCOM.nsEmbedCString_Length (targetSite);
-	long /*int*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
-	byte[] dest = new byte[length];
-	XPCOM.memmove (dest, buffer, length);
-	final String urlPort = new String (dest);
-	int index = urlPort.indexOf (':');
-	final String host = urlPort.substring (0,index);
-	final int port = Integer.valueOf (urlPort.substring (index + 1)).intValue ();
-
-	/* create text descriptions of the certificate problem(s) */
-
-	long /*int*/[] result = new long /*int*/[1];
-	nsISupports supports = new nsISupports (status);
-	int rc = supports.QueryInterface (IIDStore.GetIID (nsISSLStatus.class), result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-	nsISSLStatus sslStatus = new nsISSLStatus (result[0]);
-	result[0] = 0;
-	rc = sslStatus.GetServerCert (result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-
-	final nsIX509Cert cert = new nsIX509Cert (result[0]);
-	result[0] = 0;
-	String[] problems = new String[3];
-	int problemCount = 0, flags = 0;
-	int[] intResult = new int[1];
-
-	rc = sslStatus.GetIsDomainMismatch (intResult);
-	if (intResult[0] != 0) {
-		nsEmbedString ptr = new nsEmbedString ();
-		rc = cert.GetCommonName (ptr.getAddress());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		String name = ptr.toString ();
-		problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_InvalidName", new String[] {name}); //$NON-NLS-1$
-		flags |= nsICertOverrideService.ERROR_MISMATCH;
-		ptr.dispose ();
-	}
-	intResult[0] = 0;
-
-	rc = sslStatus.GetIsNotValidAtThisTime (intResult);
-	if (intResult[0] != 0) {
-		rc = cert.GetValidity (result);
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-
-		nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
-		result[0] = 0;
-
-		nsEmbedString ptr = new nsEmbedString ();
-		rc = validity.GetNotBeforeGMT (ptr.getAddress());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		String notBefore = ptr.toString ();
-		ptr.dispose ();
-
-		ptr = new nsEmbedString ();
-		rc = validity.GetNotAfterGMT (ptr.getAddress());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		String notAfter = ptr.toString ();
-		ptr.dispose ();
-
-		String range = notBefore + " - " + notAfter; //$NON-NLS-1$
-		problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_NotValid", new String[] {range}); //$NON-NLS-1$
-		flags |= nsICertOverrideService.ERROR_TIME;
-		validity.Release ();
-	}
-	intResult[0] = 0;
-
-	rc = sslStatus.GetIsUntrusted (intResult);
-	if (intResult[0] != 0) {
-		nsEmbedString ptr = new nsEmbedString ();
-		rc = cert.GetIssuerCommonName (ptr.getAddress());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		String name = ptr.toString ();
-		problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_NotTrusted", new String[] {name}); //$NON-NLS-1$
-		flags |= nsICertOverrideService.ERROR_UNTRUSTED;
-		ptr.dispose ();
-	}
-	intResult[0] = 0;
-	sslStatus.Release ();
-
-	/*
-	* The invalid certificate dialog must be shown asynchronously because
-	* NotifyCertProblem implementations cannot block.
-	*/
-	final int finalFlags = flags;
-	final String[] finalProblems = new String[problemCount];
-	System.arraycopy (problems, 0, finalProblems, 0, problemCount);
-	final String url = lastNavigateURL;
-	browser.getDisplay().asyncExec(() -> {
-		if (browser.isDisposed ()) return;
-		if (url.equals (lastNavigateURL)) {
-			String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
-			if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
-				long /*int*/[] result1 = new long /*int*/[1];
-				int rc1 = XPCOM.NS_GetServiceManager (result1);
-				if (rc1 != XPCOM.NS_OK) error (rc1);
-				if (result1[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
-				nsIServiceManager serviceManager = new nsIServiceManager (result1[0]);
-				result1[0] = 0;
-				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CERTOVERRIDE_CONTRACTID, true);
-				rc1 = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsICertOverrideService.class), result1);
-				if (rc1 != XPCOM.NS_OK) error (rc1);
-				if (result1[0] == 0) error (XPCOM.NS_NOINTERFACE);
-				serviceManager.Release ();
-
-				nsICertOverrideService overrideService = new nsICertOverrideService (result1[0]);
-				result1[0] = 0;
-				byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
-				long /*int*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
-				rc1 = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
-				navigate (badCertRequest);
-				XPCOM.nsEmbedCString_delete (hostString);
-				overrideService.Release ();
-			}
-			isRetrievingBadCert = false;
-		}
-		cert.Release ();
-		new nsISupports (badCertRequest).Release ();
-		badCertRequest = 0;
-	});
-
-	XPCOM.memmove (_suppressError, new boolean[] {true});
-	return XPCOM.NS_OK;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java
deleted file mode 100644
index 7670e76ec4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-class PromptAuth2 {
-	XPCOMObject supports;
-	XPCOMObject promptAuth;
-	int refCount = 0;
-	long /*int*/ parent;
-
-PromptAuth2 () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	promptAuth = new XPCOMObject (new int[] {2, 0, 0, 4, 6}) {
-		@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 PromptAuth (args[0], (int)/*64*/args[1], args[2], args[3]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (promptAuth != null) {
-		promptAuth.dispose ();
-		promptAuth = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return promptAuth.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IAUTHPROMPT2_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {promptAuth.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-Browser getBrowser () {
-	if (parent == 0) return null;
-	return Mozilla.getBrowser (parent);
-}
-
-void setParent(long /*int*/ aParent) {
-	parent = aParent;
-}
-
-int PromptAuth(long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ _retval) {
-	nsIAuthInformation auth = new nsIAuthInformation (authInfo);
-
-	Browser browser = getBrowser ();
-	if (browser != null) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
-		/*
-		 * Do not invoke the listeners if this challenge has been failed too many
-		 * times because a listener is likely giving incorrect credentials repeatedly
-		 * and will do so indefinitely.
-		 */
-		if (mozilla.authCount++ < 3) {
-			for (int i = 0; i < mozilla.authenticationListeners.length; i++) {
-				AuthenticationEvent event = new AuthenticationEvent (browser);
-				event.location = mozilla.lastNavigateURL;
-				mozilla.authenticationListeners[i].authenticate (event);
-				if (!event.doit) {
-					XPCOM.memmove (_retval, new boolean[] {false});
-					return XPCOM.NS_OK;
-				}
-				if (event.user != null && event.password != null) {
-					nsEmbedString string = new nsEmbedString (event.user);
-					int rc = auth.SetUsername (string.getAddress ());
-					if (rc != XPCOM.NS_OK) SWT.error (rc);
-					string.dispose ();
-					string = new nsEmbedString (event.password);
-					rc = auth.SetPassword (string.getAddress ());
-					if (rc != XPCOM.NS_OK) SWT.error (rc);
-					string.dispose ();
-					XPCOM.memmove (_retval, new boolean[] {true});
-					return XPCOM.NS_OK;
-				}
-			}
-		}
-	}
-
-	/* no listener handled the challenge, so show an authentication dialog */
-
-	String checkLabel = null;
-	boolean[] checkValue = new boolean[1];
-	String[] userLabel = new String[1], passLabel = new String[1];
-
-	String title = SWT.getMessage ("SWT_Authentication_Required"); //$NON-NLS-1$
-
-	/* get initial username and password values */
-
-	nsEmbedString ptr = new nsEmbedString ();
-	int rc = auth.GetUsername (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	userLabel[0] = ptr.toString ();
-	ptr.dispose ();
-
-	ptr = new nsEmbedString ();
-	rc = auth.GetPassword (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	passLabel[0] = ptr.toString ();
-	ptr.dispose ();
-
-	/* compute the message text */
-
-	ptr = new nsEmbedString ();
-	rc = auth.GetRealm (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	String realm = ptr.toString ();
-	ptr.dispose ();
-
-	nsIChannel channel = new nsIChannel (aChannel);
-	long /*int*/[] uri = new long /*int*/[1];
-	rc = channel.GetURI (uri);
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-
-	nsIURI nsURI = new nsIURI (uri[0]);
-	long /*int*/ host = XPCOM.nsEmbedCString_new ();
-	rc = nsURI.GetHost (host);
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	int length = XPCOM.nsEmbedCString_Length (host);
-	long /*int*/ buffer = XPCOM.nsEmbedCString_get (host);
-	byte[] bytes = new byte[length];
-	XPCOM.memmove (bytes, buffer, length);
-	String hostString = new String (bytes);
-	XPCOM.nsEmbedCString_delete (host);
-	nsURI.Release ();
-
-	String message;
-	if (realm.length () > 0 && hostString.length () > 0) {
-		message = Compatibility.getMessage ("SWT_Enter_Username_and_Password", new String[] {realm, hostString}); //$NON-NLS-1$
-	} else {
-		message = ""; //$NON-NLS-1$
-	}
-
-	/* open the prompter */
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] result = new boolean[1];
-	dialog.promptUsernameAndPassword (title, message, checkLabel, userLabel, passLabel, checkValue, result);
-
-	XPCOM.memmove (_retval, result);
-	if (result[0]) {	/* User selected OK */
-		nsEmbedString string = new nsEmbedString (userLabel[0]);
-		rc = auth.SetUsername(string.getAddress ());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		string.dispose ();
-
-		string = new nsEmbedString (passLabel[0]);
-		rc = auth.SetPassword(string.getAddress ());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		string.dispose ();
-	}
-
-	return XPCOM.NS_OK;
-}
-
-int AsyncPromptAuth(long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, long /*int*/ _retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
deleted file mode 100644
index 7815d39b00..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-class PromptDialog extends Dialog {
-
-	PromptDialog(Shell parent, int style) {
-		super(parent, style);
-	}
-
-	PromptDialog(Shell parent) {
-		this(parent, 0);
-	}
-
-	void alertCheck(String title, String text, String check, final boolean[] checkValue) {
-		Shell parent = getParent();
-		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		if (title != null) shell.setText(title);
-		GridLayout gridLayout = new GridLayout();
-		shell.setLayout(gridLayout);
-		Label label = new Label(shell, SWT.WRAP);
-		label.setText(text);
-		GridData data = new GridData();
-		Monitor monitor = parent.getMonitor();
-		int maxWidth = monitor.getBounds().width * 2 / 3;
-		int width = label.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		data.widthHint = Math.min(width, maxWidth);
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		label.setLayoutData (data);
-
-		final Button checkButton = check != null ? new Button(shell, SWT.CHECK) : null;
-		if (checkButton != null) {
-			checkButton.setText(check);
-			checkButton.setSelection(checkValue[0]);
-			data = new GridData ();
-			data.horizontalAlignment = GridData.BEGINNING;
-			checkButton.setLayoutData (data);
-		}
-		Button okButton = new Button(shell, SWT.PUSH);
-		okButton.setText(SWT.getMessage("SWT_OK")); //$NON-NLS-1$
-		data = new GridData ();
-		data.horizontalAlignment = GridData.CENTER;
-		okButton.setLayoutData (data);
-		okButton.addListener(SWT.Selection, event -> {
-			if (checkButton != null) checkValue[0] = checkButton.getSelection();
-			shell.close();
-		});
-
-		shell.pack();
-		shell.open();
-		Display display = parent.getDisplay();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch()) display.sleep();
-		}
-	}
-
-	boolean invalidCert(final Browser browser, String message, String[] problems, final nsIX509Cert cert) {
-		Shell parent = getParent();
-		Display display = parent.getDisplay();
-		Monitor monitor = parent.getMonitor();
-		int maxWidth = monitor.getBounds().width * 2 / 3;
-		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		shell.setText(Compatibility.getMessage("SWT_InvalidCert_Title")); //$NON-NLS-1$
-		shell.setLayout(new GridLayout());
-
-		Composite messageComposite = new Composite(shell, SWT.NONE);
-		messageComposite.setLayout(new GridLayout(2, false));
-		Image image = display.getSystemImage(SWT.ICON_WARNING);
-		new Label(messageComposite, SWT.NONE).setImage(image);
-		Text text = new Text(messageComposite, SWT.WRAP);
-		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		text.setEditable(false);
-		text.setBackground(shell.getBackground());
-		text.setText(message);
-		int width = messageComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		GridData data = new GridData();
-		data.widthHint = Math.min(width, maxWidth);
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		messageComposite.setLayoutData(data);
-
-		StyledText problemsText = new StyledText(shell, SWT.WRAP);
-		problemsText.setMargins(30, 0, 30, 0);
-		problemsText.setEditable(false);
-		problemsText.setBackground(shell.getBackground());
-		for (int i = 0; i < problems.length; i++) {
-			problemsText.append(problems[i] + '\n');
-		}
-		StyleRange style = new StyleRange();
-		style.metrics = new GlyphMetrics(0, 0, 30);
-		Bullet bullet0 = new Bullet (style);
-		problemsText.setLineBullet(0, problems.length, bullet0);
-		width = problemsText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		data = new GridData();
-		data.widthHint = Math.min(width, maxWidth);
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		problemsText.setLayoutData(data);
-
-		text = new Text(shell, SWT.SINGLE);
-		text.setEditable(false);
-		text.setBackground(shell.getBackground());
-		text.setText(Compatibility.getMessage("SWT_InvalidCert_Connect")); //$NON-NLS-1$
-
-		new Label(shell, SWT.NONE); /* vertical spacer */
-
-		/*
-		* Create a local invisible Browser to be passed to the ViewCert call,
-		* so that this prompter can be the certificate view dialog's parent.
-		*/
-		final Browser localBrowser = new Browser(shell, browser.getStyle());
-		data = new GridData();
-		data.exclude = true;
-		localBrowser.setLayoutData(data);
-
-		Composite buttonsComposite = new Composite(shell, SWT.NONE);
-		buttonsComposite.setLayout(new GridLayout(3, true));
-		buttonsComposite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
-
-		Button viewCertButton = new Button(buttonsComposite, SWT.PUSH);
-		viewCertButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-		viewCertButton.setText(Compatibility.getMessage("SWT_ViewCertificate")); //$NON-NLS-1$
-		viewCertButton.addListener(SWT.Selection, event -> {
-			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_CERTIFICATEDIALOGS_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsICertificateDialogs.class), result);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-			serviceManager.Release();
-
-			nsICertificateDialogs dialogs = new nsICertificateDialogs(result[0]);
-			result[0] = 0;
-
-			/*
-			* Bug in Mozilla.  The certificate viewer dialog does not show its content when
-			* opened.  The workaround is to periodically wake up the UI thread.
-			*/
-			Runnable runnable = new Runnable() {
-				@Override
-				public void run() {
-					browser.getDisplay().timerExec(1000, this);
-				}
-			};
-			runnable.run();
-
-			rc = ((Mozilla)localBrowser.webBrowser).webBrowser.GetContentDOMWindow(result);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-
-			nsIDOMWindow window = new nsIDOMWindow(result[0]);
-			result[0] = 0;
-			rc = dialogs.ViewCert(window.getAddress(), cert.getAddress());
-			browser.getDisplay().timerExec(-1, runnable);
-			window.Release();
-			dialogs.Release();
-		});
-
-		final Button okButton = new Button(buttonsComposite, SWT.PUSH);
-		okButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-		okButton.setText(Compatibility.getMessage("SWT_OK")); //$NON-NLS-1$
-		Button cancelButton = new Button(buttonsComposite, SWT.PUSH);
-		cancelButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-		cancelButton.setText(Compatibility.getMessage("SWT_Cancel")); //$NON-NLS-1$
-		final boolean[] result = new boolean[1];
-		Listener listener = event -> {
-			shell.dispose();
-			result[0] = event.widget == okButton;
-		};
-		okButton.addListener(SWT.Selection, listener);
-		cancelButton.addListener(SWT.Selection, listener);
-
-		cancelButton.setFocus();
-		shell.setDefaultButton(cancelButton);
-		shell.pack();
-		shell.open();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch()) display.sleep();
-		}
-		return result[0];
-	}
-
-	void confirmEx(String title, String text, String check, String button0, String button1, String button2, int defaultIndex, final boolean[] checkValue, final int[] result) {
-		Shell parent = getParent();
-		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		shell.setText(title);
-		GridLayout gridLayout = new GridLayout();
-		shell.setLayout(gridLayout);
-		Label label = new Label(shell, SWT.WRAP);
-		label.setText(text);
-		GridData data = new GridData();
-		Monitor monitor = parent.getMonitor();
-		int maxWidth = monitor.getBounds().width * 2 / 3;
-		int width = label.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		data.widthHint = Math.min(width, maxWidth);
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		label.setLayoutData (data);
-
-		final Button[] buttons = new Button[4];
-		Listener listener = event -> {
-			if (buttons[0] != null) checkValue[0] = buttons[0].getSelection();
-			Widget widget = event.widget;
-			for (int i = 1; i < buttons.length; i++) {
-				if (widget == buttons[i]) {
-					result[0] = i - 1;
-					break;
-				}
-			}
-			shell.close();
-		};
-		if (check != null) {
-			buttons[0] = new Button(shell, SWT.CHECK);
-			buttons[0].setText(check);
-			buttons[0].setSelection(checkValue[0]);
-			data = new GridData ();
-			data.horizontalAlignment = GridData.BEGINNING;
-			buttons[0].setLayoutData (data);
-		}
-		Composite composite = new Composite(shell, SWT.NONE);
-		data = new GridData();
-		data.horizontalAlignment = GridData.CENTER;
-		composite.setLayoutData (data);
-		GridLayout layout = new GridLayout();
-		layout.makeColumnsEqualWidth = true;
-		composite.setLayout(layout);
-		int buttonCount = 0;
-		if (button0 != null) {
-			buttons[1] = new Button(composite, SWT.PUSH);
-			buttons[1].setText(button0);
-			buttons[1].addListener(SWT.Selection, listener);
-			buttons[1].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			buttonCount++;
-		}
-		if (button1 != null) {
-			buttons[2] = new Button(composite, SWT.PUSH);
-			buttons[2].setText(button1);
-			buttons[2].addListener(SWT.Selection, listener);
-			buttons[2].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			buttonCount++;
-		}
-		if (button2 != null) {
-			buttons[3] = new Button(composite, SWT.PUSH);
-			buttons[3].setText(button2);
-			buttons[3].addListener(SWT.Selection, listener);
-			buttons[3].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			buttonCount++;
-		}
-		layout.numColumns = buttonCount;
-		Button defaultButton = buttons [defaultIndex + 1];
-		if (defaultButton != null) shell.setDefaultButton (defaultButton);
-
-		shell.pack();
-		shell.open();
-		Display display = parent.getDisplay();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch()) display.sleep();
-		}
-	}
-
-	void prompt(String title, String text, String check, final String[] value, final boolean[] checkValue, final boolean[] result) {
-		Shell parent = getParent();
-		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		if (title != null) shell.setText(title);
-		GridLayout gridLayout = new GridLayout();
-		shell.setLayout(gridLayout);
-		Label label = new Label(shell, SWT.WRAP);
-		label.setText(text);
-		GridData data = new GridData();
-		Monitor monitor = parent.getMonitor();
-		int maxWidth = monitor.getBounds().width * 2 / 3;
-		int width = label.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		data.widthHint = Math.min(width, maxWidth);
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		label.setLayoutData (data);
-
-		final Text valueText = new Text(shell, SWT.BORDER);
-		if (value[0] != null) valueText.setText(value[0]);
-		data = new GridData();
-		width = valueText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		if (width > maxWidth) data.widthHint = maxWidth;
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		valueText.setLayoutData(data);
-
-		final Button[] buttons = new Button[3];
-		Listener listener = event -> {
-			if (buttons[0] != null) checkValue[0] = buttons[0].getSelection();
-			value[0] = valueText.getText();
-			result[0] = event.widget == buttons[1];
-			shell.close();
-		};
-		if (check != null) {
-			buttons[0] = new Button(shell, SWT.CHECK);
-			buttons[0].setText(check);
-			buttons[0].setSelection(checkValue[0]);
-			data = new GridData ();
-			data.horizontalAlignment = GridData.BEGINNING;
-			buttons[0].setLayoutData (data);
-		}
-		Composite composite = new Composite(shell, SWT.NONE);
-		data = new GridData();
-		data.horizontalAlignment = GridData.CENTER;
-		composite.setLayoutData (data);
-		composite.setLayout(new GridLayout(2, true));
-		buttons[1] = new Button(composite, SWT.PUSH);
-		buttons[1].setText(SWT.getMessage("SWT_OK")); //$NON-NLS-1$
-		buttons[1].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		buttons[1].addListener(SWT.Selection, listener);
-		buttons[2] = new Button(composite, SWT.PUSH);
-		buttons[2].setText(SWT.getMessage("SWT_Cancel")); //$NON-NLS-1$
-		buttons[2].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		buttons[2].addListener(SWT.Selection, listener);
-
-		shell.pack();
-		shell.open();
-		Display display = parent.getDisplay();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch()) display.sleep();
-		}
-	}
-
-	void promptUsernameAndPassword(String title, String text, String check, final String[] user, final String[] pass, final boolean[] checkValue, final boolean[] result) {
-		Shell parent = getParent();
-		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		shell.setText(title);
-		GridLayout gridLayout = new GridLayout();
-		shell.setLayout(gridLayout);
-		Label label = new Label(shell, SWT.WRAP);
-		label.setText(text);
-		GridData data = new GridData();
-		Monitor monitor = parent.getMonitor();
-		int maxWidth = monitor.getBounds().width * 2 / 3;
-		int width = label.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		data.widthHint = Math.min(width, maxWidth);
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		label.setLayoutData (data);
-
-		Label userLabel = new Label(shell, SWT.NONE);
-		userLabel.setText(SWT.getMessage("SWT_Username")); //$NON-NLS-1$
-
-		final Text userText = new Text(shell, SWT.BORDER);
-		if (user[0] != null) userText.setText(user[0]);
-		data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		userText.setLayoutData(data);
-
-		Label passwordLabel = new Label(shell, SWT.NONE);
-		passwordLabel.setText(SWT.getMessage("SWT_Password")); //$NON-NLS-1$
-
-		final Text passwordText = new Text(shell, SWT.PASSWORD | SWT.BORDER);
-		if (pass[0] != null) passwordText.setText(pass[0]);
-		data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		passwordText.setLayoutData(data);
-
-		final Button[] buttons = new Button[3];
-		Listener listener = event -> {
-			if (buttons[0] != null) checkValue[0] = buttons[0].getSelection();
-			user[0] = userText.getText();
-			pass[0] = passwordText.getText();
-			result[0] = event.widget == buttons[1];
-			shell.close();
-		};
-		if (check != null) {
-			buttons[0] = new Button(shell, SWT.CHECK);
-			buttons[0].setText(check);
-			buttons[0].setSelection(checkValue[0]);
-			data = new GridData ();
-			data.horizontalAlignment = GridData.BEGINNING;
-			buttons[0].setLayoutData (data);
-		}
-		Composite composite = new Composite(shell, SWT.NONE);
-		data = new GridData();
-		data.horizontalAlignment = GridData.CENTER;
-		composite.setLayoutData (data);
-		composite.setLayout(new GridLayout(2, true));
-		buttons[1] = new Button(composite, SWT.PUSH);
-		buttons[1].setText(SWT.getMessage("SWT_OK")); //$NON-NLS-1$
-		buttons[1].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		buttons[1].addListener(SWT.Selection, listener);
-		buttons[2] = new Button(composite, SWT.PUSH);
-		buttons[2].setText(SWT.getMessage("SWT_Cancel")); //$NON-NLS-1$
-		buttons[2].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		buttons[2].addListener(SWT.Selection, listener);
-
-		shell.setDefaultButton(buttons[1]);
-		shell.pack();
-		shell.open();
-		Display display = parent.getDisplay();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch()) display.sleep();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java
deleted file mode 100644
index d4ebfdadf2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-
-class PromptFactory {
-	XPCOMObject supports;
-	XPCOMObject factory;
-	int refCount = 0;
-
-PromptFactory () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 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 GetPrompt (args[0], args[1], args[2]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (factory != null) {
-		factory.dispose ();
-		factory = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return factory.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IPROMPTFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIPromptFactory */
-
-int GetPrompt (long /*int*/ aParent, long /*int*/ iid, long /*int*/ result) {
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, iid, nsID.sizeof);
-
-	if (guid.Equals (IIDStore.GetIID (nsIPrompt.class))) {
-		Prompter prompter = new Prompter ();
-		prompter.AddRef ();
-		prompter.setParent (aParent);
-		XPCOM.memmove (result, new long /*int*/[] {prompter.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IAUTHPROMPT2_IID)) {
-		PromptAuth2 promptAuth = new PromptAuth2();
-		promptAuth.AddRef ();
-		promptAuth.setParent (aParent);
-		XPCOM.memmove (result, new long /*int*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-
-	return XPCOM.NS_NOINTERFACE;
-}
-
-int LockFactory (int lock) {
-	return XPCOM.NS_OK;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
deleted file mode 100644
index e08ed4c4b1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
+++ /dev/null
@@ -1,672 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-class PromptService2 {
-	XPCOMObject supports;
-	XPCOMObject promptService;
-	XPCOMObject promptService2;
-	int refCount = 0;
-
-PromptService2 () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	promptService = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7}) {
-		@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 Alert (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);}
-	};
-
-	promptService2 = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7, 7, 9}) {
-		@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 Alert (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method12 (long /*int*/[] args) {return PromptAuth (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method13 (long /*int*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5], args[6], args[7], args[8]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (promptService != null) {
-		promptService.dispose ();
-		promptService = null;
-	}
-	if (promptService2 != null) {
-		promptService2.dispose ();
-		promptService2 = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return promptService2.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIPromptService.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IPROMPTSERVICE2_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {promptService2.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-Browser getBrowser (long /*int*/ aDOMWindow) {
-	if (aDOMWindow == 0) return null;
-	return Mozilla.getBrowser (aDOMWindow);
-}
-
-String getLabel (int buttonFlag, int index, long /*int*/ buttonTitle) {
-	String label = null;
-	int flag = (buttonFlag & (0xff * index)) / index;
-	switch (flag) {
-		case nsIPromptService.BUTTON_TITLE_CANCEL : label = SWT.getMessage ("SWT_Cancel"); break; //$NON-NLS-1$
-		case nsIPromptService.BUTTON_TITLE_NO : label = SWT.getMessage ("SWT_No"); break; //$NON-NLS-1$
-		case nsIPromptService.BUTTON_TITLE_OK : label = SWT.getMessage ("SWT_OK"); break; //$NON-NLS-1$
-		case nsIPromptService.BUTTON_TITLE_SAVE : label = SWT.getMessage ("SWT_Save"); break; //$NON-NLS-1$
-		case nsIPromptService.BUTTON_TITLE_YES : label = SWT.getMessage ("SWT_Yes"); break; //$NON-NLS-1$
-		case nsIPromptService.BUTTON_TITLE_IS_STRING : {
-			int length = XPCOM.strlen_PRUnichar (buttonTitle);
-			char[] dest = new char[length];
-			XPCOM.memmove (dest, buttonTitle, length * 2);
-			label = new String (dest);
-		}
-	}
-	return label;
-}
-
-/* nsIPromptService */
-
-int Alert (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText) {
-	final Browser browser = getBrowser (aParent);
-
-	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDialogTitle, length * 2);
-	String titleLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	String textLabel = new String (dest);
-
-	/*
-	* If mozilla is re-navigating to a page with a bad certificate in order
-	* to get its certificate info then do not show cert error message alerts.
-	*/
-	if (browser != null) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
-		if (mozilla.isRetrievingBadCert) return XPCOM.NS_OK;
-	}
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	MessageBox messageBox = new MessageBox (shell, SWT.OK | SWT.ICON_WARNING);
-	messageBox.setText (titleLabel);
-	messageBox.setMessage (textLabel);
-	messageBox.open ();
-	return XPCOM.NS_OK;
-}
-
-int AlertCheck (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState) {
-	Browser browser = getBrowser (aParent);
-
-	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDialogTitle, length * 2);
-	String titleLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	String textLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aCheckMsg);
-	dest = new char[length];
-	XPCOM.memmove (dest, aCheckMsg, length * 2);
-	String checkLabel = new String (dest);
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] check = new boolean[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-	dialog.alertCheck (titleLabel, textLabel, checkLabel, check);
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
-	return XPCOM.NS_OK;
-}
-
-int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, long /*int*/ checkboxLabel, long /*int*/ checkValue, long /*int*/ _retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int Confirm (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ _retval) {
-	Browser browser = getBrowser (aParent);
-
-	if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
-		XPCOM.memmove (_retval, new boolean[] {true});
-		return XPCOM.NS_OK;
-	}
-
-	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDialogTitle, length * 2);
-	String titleLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	String textLabel = new String (dest);
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	MessageBox messageBox = new MessageBox (shell, SWT.OK | SWT.CANCEL | SWT.ICON_QUESTION);
-	messageBox.setText (titleLabel);
-	messageBox.setMessage (textLabel);
-	int id = messageBox.open ();
-	boolean[] result = {id == SWT.OK};
-	XPCOM.memmove (_retval, result);
-	return XPCOM.NS_OK;
-}
-
-int ConfirmCheck (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int ConfirmEx (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, int aButtonFlags, long /*int*/ aButton0Title, long /*int*/ aButton1Title, long /*int*/ aButton2Title, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	Browser browser = getBrowser (aParent);
-
-	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDialogTitle, length * 2);
-	String titleLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	String textLabel = new String (dest);
-
-	String checkLabel = null;
-	if (aCheckMsg != 0) {
-		length = XPCOM.strlen_PRUnichar (aCheckMsg);
-		dest = new char[length];
-		XPCOM.memmove (dest, aCheckMsg, length * 2);
-		checkLabel = new String (dest);
-	}
-
-	String button0Label = getLabel (aButtonFlags, nsIPromptService.BUTTON_POS_0, aButton0Title);
-	String button1Label = getLabel (aButtonFlags, nsIPromptService.BUTTON_POS_1, aButton1Title);
-	String button2Label = getLabel (aButtonFlags, nsIPromptService.BUTTON_POS_2, aButton2Title);
-
-	int defaultIndex = 0;
-	if ((aButtonFlags & nsIPromptService.BUTTON_POS_1_DEFAULT) != 0) {
-		defaultIndex = 1;
-	} else if ((aButtonFlags & nsIPromptService.BUTTON_POS_2_DEFAULT) != 0) {
-		defaultIndex = 2;
-	}
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] check = new boolean[1];
-	int[] result = new int[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-	dialog.confirmEx (titleLabel, textLabel, checkLabel, button0Label, button1Label, button2Label, defaultIndex, check, result);
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
-	XPCOM.memmove (_retval, result, 4);
-	return XPCOM.NS_OK;
-}
-
-int Prompt (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aValue, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	Browser browser = getBrowser (aParent);
-	String titleLabel = null, textLabel, checkLabel = null;
-	String[] valueLabel = new String[1];
-	char[] dest;
-	int length;
-	if (aDialogTitle != 0) {
-		length = XPCOM.strlen_PRUnichar (aDialogTitle);
-		dest = new char[length];
-		XPCOM.memmove (dest, aDialogTitle, length * 2);
-		titleLabel = new String (dest);
-	}
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	textLabel = new String (dest);
-
-	long /*int*/[] valueAddr = new long /*int*/[1];
-	XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
-	if (valueAddr[0] != 0) {
-		length = XPCOM.strlen_PRUnichar (valueAddr[0]);
-		dest = new char[length];
-		XPCOM.memmove (dest, valueAddr[0], length * 2);
-		valueLabel[0] = new String (dest);
-	}
-
-	if (aCheckMsg != 0) {
-		length = XPCOM.strlen_PRUnichar (aCheckMsg);
-		if (length > 0) {
-			dest = new char[length];
-			XPCOM.memmove (dest, aCheckMsg, length * 2);
-			checkLabel = new String (dest);
-		}
-	}
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] check = new boolean[1], result = new boolean[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-	dialog.prompt (titleLabel, textLabel, checkLabel, valueLabel, check, result);
-
-	XPCOM.memmove (_retval, result);
-	if (result[0]) {
-		/*
-		* User selected OK. User name and password are returned as PRUnichar values. Any default
-		* value that we override must be freed using the nsIMemory service.
-		*/
-		if (valueLabel[0] != null) {
-			long /*int*/[] result2 = new long /*int*/[1];
-			int rc = XPCOM.NS_GetServiceManager (result2);
-			if (rc != XPCOM.NS_OK) SWT.error (rc);
-			if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-
-			nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
-			result2[0] = 0;
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIMemory.class), result2);
-			if (rc != XPCOM.NS_OK) SWT.error (rc);
-			if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-			serviceManager.Release ();
-
-			nsIMemory memory = new nsIMemory (result2[0]);
-			result2[0] = 0;
-
-			int cnt = valueLabel[0].length ();
-			char[] buffer = new char[cnt + 1];
-			valueLabel[0].getChars (0, cnt, buffer, 0);
-			int size = buffer.length * 2;
-			long /*int*/ ptr = memory.Alloc (size);
-			XPCOM.memmove (ptr, buffer, size);
-			XPCOM.memmove (aValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-
-			if (valueAddr[0] != 0) {
-				memory.Free (valueAddr[0]);
-			}
-			memory.Release ();
-		}
-	}
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
-	return XPCOM.NS_OK;
-}
-
-int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ checkboxLabel, long /*int*/ checkboxValue, long /*int*/ _retval) {
-	nsIAuthInformation auth = new nsIAuthInformation (authInfo);
-
-	Browser browser = getBrowser (aParent);
-	if (browser != null) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
-		/*
-		 * Do not invoke the listeners if this challenge has been failed too many
-		 * times because a listener is likely giving incorrect credentials repeatedly
-		 * and will do so indefinitely.
-		 */
-		if (mozilla.authCount++ < 3) {
-			for (int i = 0; i < mozilla.authenticationListeners.length; i++) {
-				AuthenticationEvent event = new AuthenticationEvent (browser);
-				event.location = mozilla.lastNavigateURL;
-				mozilla.authenticationListeners[i].authenticate (event);
-				if (!event.doit) {
-					XPCOM.memmove (_retval, new boolean[] {false});
-					return XPCOM.NS_OK;
-				}
-				if (event.user != null && event.password != null) {
-					nsEmbedString string = new nsEmbedString (event.user);
-					int rc = auth.SetUsername (string.getAddress ());
-					if (rc != XPCOM.NS_OK) SWT.error (rc);
-					string.dispose ();
-					string = new nsEmbedString (event.password);
-					rc = auth.SetPassword (string.getAddress ());
-					if (rc != XPCOM.NS_OK) SWT.error (rc);
-					string.dispose ();
-					XPCOM.memmove (_retval, new boolean[] {true});
-					return XPCOM.NS_OK;
-				}
-			}
-		}
-	}
-
-	/* no listener handled the challenge, so show an authentication dialog */
-
-	String checkLabel = null;
-	boolean[] checkValue = new boolean[1];
-	String[] userLabel = new String[1], passLabel = new String[1];
-
-	String title = SWT.getMessage ("SWT_Authentication_Required"); //$NON-NLS-1$
-
-	if (checkboxLabel != 0 && checkboxValue != 0) {
-		int length = XPCOM.strlen_PRUnichar (checkboxLabel);
-		char[] dest = new char[length];
-		XPCOM.memmove (dest, checkboxLabel, length * 2);
-		checkLabel = new String (dest);
-		XPCOM.memmove (checkValue, checkboxValue);
-	}
-
-	/* get initial username and password values */
-
-	nsEmbedString ptr = new nsEmbedString ();
-	int rc = auth.GetUsername (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	userLabel[0] = ptr.toString ();
-	ptr.dispose ();
-
-	ptr = new nsEmbedString ();
-	rc = auth.GetPassword (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	passLabel[0] = ptr.toString ();
-	ptr.dispose ();
-
-	/* compute the message text */
-
-	ptr = new nsEmbedString ();
-	rc = auth.GetRealm (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	String realm = ptr.toString ();
-	ptr.dispose ();
-
-	nsIChannel channel = new nsIChannel (aChannel);
-	long /*int*/[] uri = new long /*int*/[1];
-	rc = channel.GetURI (uri);
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-
-	nsIURI nsURI = new nsIURI (uri[0]);
-	long /*int*/ host = XPCOM.nsEmbedCString_new ();
-	rc = nsURI.GetHost (host);
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	int length = XPCOM.nsEmbedCString_Length (host);
-	long /*int*/ buffer = XPCOM.nsEmbedCString_get (host);
-	byte[] bytes = new byte[length];
-	XPCOM.memmove (bytes, buffer, length);
-	String hostString = new String (bytes);
-	XPCOM.nsEmbedCString_delete (host);
-	nsURI.Release ();
-
-	String message;
-	if (realm.length () > 0 && hostString.length () > 0) {
-		message = Compatibility.getMessage ("SWT_Enter_Username_and_Password", new String[] {realm, hostString}); //$NON-NLS-1$
-	} else {
-		message = ""; //$NON-NLS-1$
-	}
-
-	/* open the prompter */
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] result = new boolean[1];
-	dialog.promptUsernameAndPassword (title, message, checkLabel, userLabel, passLabel, checkValue, result);
-
-	XPCOM.memmove (_retval, result);
-	if (result[0]) {	/* User selected OK */
-		nsEmbedString string = new nsEmbedString (userLabel[0]);
-		rc = auth.SetUsername(string.getAddress ());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		string.dispose ();
-
-		string = new nsEmbedString (passLabel[0]);
-		rc = auth.SetPassword(string.getAddress ());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		string.dispose ();
-	}
-
-	if (checkboxValue != 0) XPCOM.memmove (checkboxValue, checkValue);
-	return XPCOM.NS_OK;
-}
-
-int PromptUsernameAndPassword (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aUsername, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	Browser browser = getBrowser (aParent);
-	String user = null, password = null;
-
-	if (browser != null) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
-		/*
-		 * Do not invoke the listeners if this challenge has been failed too many
-		 * times because a listener is likely giving incorrect credentials repeatedly
-		 * and will do so indefinitely.
-		 */
-		if (mozilla.authCount++ < 3) {
-			for (int i = 0; i < mozilla.authenticationListeners.length; i++) {
-				AuthenticationEvent event = new AuthenticationEvent (browser);
-				event.location = mozilla.lastNavigateURL;
-				mozilla.authenticationListeners[i].authenticate (event);
-				if (!event.doit) {
-					XPCOM.memmove (_retval, new boolean[] {false});
-					return XPCOM.NS_OK;
-				}
-				if (event.user != null && event.password != null) {
-					user = event.user;
-					password = event.password;
-					XPCOM.memmove (_retval, new boolean[] {true});
-					break;
-				}
-			}
-		}
-	}
-
-	if (user == null) {
-		/* no listener handled the challenge, so show an authentication dialog */
-
-		String titleLabel, textLabel, checkLabel = null;
-		String[] userLabel = new String[1], passLabel = new String[1];
-		char[] dest;
-		int length;
-		if (aDialogTitle != 0) {
-			length = XPCOM.strlen_PRUnichar (aDialogTitle);
-			dest = new char[length];
-			XPCOM.memmove (dest, aDialogTitle, length * 2);
-			titleLabel = new String (dest);
-		} else {
-			titleLabel = SWT.getMessage ("SWT_Authentication_Required");	//$NON-NLS-1$
-		}
-
-		length = XPCOM.strlen_PRUnichar (aText);
-		dest = new char[length];
-		XPCOM.memmove (dest, aText, length * 2);
-		textLabel = new String (dest);
-
-		long /*int*/[] userAddr = new long /*int*/[1];
-		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
-		if (userAddr[0] != 0) {
-			length = XPCOM.strlen_PRUnichar (userAddr[0]);
-			dest = new char[length];
-			XPCOM.memmove (dest, userAddr[0], length * 2);
-			userLabel[0] = new String (dest);
-		}
-
-		long /*int*/[] passAddr = new long /*int*/[1];
-		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
-		if (passAddr[0] != 0) {
-			length = XPCOM.strlen_PRUnichar (passAddr[0]);
-			dest = new char[length];
-			XPCOM.memmove (dest, passAddr[0], length * 2);
-			passLabel[0] = new String (dest);
-		}
-
-		if (aCheckMsg != 0) {
-			length = XPCOM.strlen_PRUnichar (aCheckMsg);
-			if (length > 0) {
-				dest = new char[length];
-				XPCOM.memmove (dest, aCheckMsg, length * 2);
-				checkLabel = new String (dest);
-			}
-		}
-
-		Shell shell = browser == null ? new Shell () : browser.getShell ();
-		PromptDialog dialog = new PromptDialog (shell);
-		boolean[] check = new boolean[1], result = new boolean[1];
-		if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-		dialog.promptUsernameAndPassword (titleLabel, textLabel, checkLabel, userLabel, passLabel, check, result);
-
-		XPCOM.memmove (_retval, result);
-		if (result[0]) {
-			/* User selected OK */
-			user = userLabel[0];
-			password = passLabel[0];
-		}
-		if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
-	}
-
-	if (user != null) {
-		/*
-		* User name and password are returned as PRUnichar values. Any default
-		* value that we override must be freed using the nsIMemory service.
-		*/
-		long /*int*/[] userAddr = new long /*int*/[1];
-		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
-		long /*int*/[] passAddr = new long /*int*/[1];
-		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
-
-		long /*int*/[] result = new long /*int*/[1];
-		int rc = XPCOM.NS_GetServiceManager (result);
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		if (result[0] == 0) SWT.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) SWT.error (rc);
-		if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-		serviceManager.Release ();
-
-		nsIMemory memory = new nsIMemory (result[0]);
-		result[0] = 0;
-		if (userAddr[0] != 0) memory.Free (userAddr[0]);
-		if (passAddr[0] != 0) memory.Free (passAddr[0]);
-		memory.Release ();
-
-		/* write the name and password values */
-
-		int cnt = user.length ();
-		char[] buffer = new char[cnt + 1];
-		user.getChars (0, cnt, buffer, 0);
-		int size = buffer.length * 2;
-		long /*int*/ ptr = C.malloc (size);
-		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-
-		cnt = password.length ();
-		buffer = new char[cnt + 1];
-		password.getChars (0, cnt, buffer, 0);
-		size = buffer.length * 2;
-		ptr = C.malloc (size);
-		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-	}
-
-	return XPCOM.NS_OK;
-}
-
-int PromptPassword (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int Select (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, int aCount, long /*int*/ aSelectList, long /*int*/ aOutSelection, long /*int*/ _retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java
deleted file mode 100644
index 2bd3885129..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-
-class PromptService2Factory {
-	XPCOMObject supports;
-	XPCOMObject factory;
-	int refCount = 0;
-
-PromptService2Factory () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 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 CreateInstance (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (factory != null) {
-		factory.dispose ();
-		factory = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return factory.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIFactory */
-
-int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, iid, nsID.sizeof);
-	if (guid.Equals (XPCOM.NS_IPROMPTSERVICE2_IID) || guid.Equals(IIDStore.GetIID (nsIPromptService.class))) {
-		PromptService2 promptService = new PromptService2 ();
-		promptService.AddRef ();
-		XPCOM.memmove (result, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IPROMPTFACTORY_IID)) {
-		PromptFactory promptFactory = new PromptFactory();
-		promptFactory.AddRef ();
-		XPCOM.memmove (result, new long /*int*/[] {promptFactory.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int LockFactory (int lock) {
-	return XPCOM.NS_OK;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java
deleted file mode 100644
index 39a707b44b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java
+++ /dev/null
@@ -1,622 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-class Prompter {
-	XPCOMObject supports;
-	XPCOMObject prompt;
-	int refCount = 0;
-	long /*int*/ parent;
-
-Prompter () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	prompt = new XPCOMObject (new int[] {2, 0, 0, 2, 4, 3, 5, 9, 6, 6, 7, 6}) {
-		@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 Alert (args[0], args[1] );}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3]);}
-		@Override
-		public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2]);}
-		@Override
-		public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4]);}
-		@Override
-		public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6], args[7], args[8]);}
-		@Override
-		public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5]);}
-		@Override
-		public long /*int*/ method9 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5]);}
-		@Override
-		public long /*int*/ method10 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		@Override
-		public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (prompt != null) {
-		prompt.dispose ();
-		prompt = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return prompt.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsIPrompt.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {prompt.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-Browser getBrowser () {
-	if (parent == 0) return null;
-	return Mozilla.getBrowser (parent);
-}
-
-String getLabel (int buttonFlag, int index, long /*int*/ buttonTitle) {
-	String label = null;
-	int flag = (buttonFlag & (0xff * index)) / index;
-	switch (flag) {
-		case nsIPrompt.BUTTON_TITLE_CANCEL: label = SWT.getMessage ("SWT_Cancel"); break; //$NON-NLS-1$
-		case nsIPrompt.BUTTON_TITLE_NO: label = SWT.getMessage ("SWT_No"); break; //$NON-NLS-1$
-		case nsIPrompt.BUTTON_TITLE_OK: label = SWT.getMessage ("SWT_OK"); break; //$NON-NLS-1$
-		case nsIPrompt.BUTTON_TITLE_SAVE: label = SWT.getMessage ("SWT_Save"); break; //$NON-NLS-1$
-		case nsIPrompt.BUTTON_TITLE_YES: label = SWT.getMessage ("SWT_Yes"); break; //$NON-NLS-1$
-		case nsIPrompt.BUTTON_TITLE_IS_STRING: {
-			int length = XPCOM.strlen_PRUnichar (buttonTitle);
-			char[] dest = new char[length];
-			XPCOM.memmove (dest, buttonTitle, length * 2);
-			label = new String (dest);
-		}
-	}
-	return label;
-}
-
-void setParent(long /*int*/ aParent) {
-	parent = aParent;
-}
-
-/* nsIPrompt */
-
-int Alert (long /*int*/ aDialogTitle, long /*int*/ aText) {
-	final Browser browser = getBrowser ();
-
-	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDialogTitle, length * 2);
-	String titleLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	String textLabel = new String (dest);
-
-	/*
-	* If mozilla is re-navigating to a page with a bad certificate in order
-	* to get its certificate info then do not show cert error message alerts.
-	*/
-	if (browser != null) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
-		if (mozilla.isRetrievingBadCert) return XPCOM.NS_OK;
-	}
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	MessageBox messageBox = new MessageBox (shell, SWT.OK | SWT.ICON_WARNING);
-	messageBox.setText (titleLabel);
-	messageBox.setMessage (textLabel);
-	messageBox.open ();
-	return XPCOM.NS_OK;
-}
-
-int AlertCheck (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState) {
-	Browser browser = getBrowser ();
-
-	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDialogTitle, length * 2);
-	String titleLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	String textLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aCheckMsg);
-	dest = new char[length];
-	XPCOM.memmove (dest, aCheckMsg, length * 2);
-	String checkLabel = new String (dest);
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] check = new boolean[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-	dialog.alertCheck (titleLabel, textLabel, checkLabel, check);
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
-	return XPCOM.NS_OK;
-}
-
-int Confirm (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ _retval) {
-	Browser browser = getBrowser ();
-
-	if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
-		XPCOM.memmove (_retval, new boolean[] {true});
-		return XPCOM.NS_OK;
-	}
-
-	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDialogTitle, length * 2);
-	String titleLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	String textLabel = new String (dest);
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	MessageBox messageBox = new MessageBox (shell, SWT.OK | SWT.CANCEL | SWT.ICON_QUESTION);
-	messageBox.setText (titleLabel);
-	messageBox.setMessage (textLabel);
-	int id = messageBox.open ();
-	boolean[] result = {id == SWT.OK};
-	XPCOM.memmove (_retval, result);
-	return XPCOM.NS_OK;
-}
-
-int ConfirmCheck (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int ConfirmEx (long /*int*/ aDialogTitle, long /*int*/ aText, int aButtonFlags, long /*int*/ aButton0Title, long /*int*/ aButton1Title, long /*int*/ aButton2Title, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	Browser browser = getBrowser ();
-
-	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-	char[] dest = new char[length];
-	XPCOM.memmove (dest, aDialogTitle, length * 2);
-	String titleLabel = new String (dest);
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	String textLabel = new String (dest);
-
-	String checkLabel = null;
-	if (aCheckMsg != 0) {
-		length = XPCOM.strlen_PRUnichar (aCheckMsg);
-		dest = new char[length];
-		XPCOM.memmove (dest, aCheckMsg, length * 2);
-		checkLabel = new String (dest);
-	}
-
-	String button0Label = getLabel (aButtonFlags, nsIPrompt.BUTTON_POS_0, aButton0Title);
-	String button1Label = getLabel (aButtonFlags, nsIPrompt.BUTTON_POS_1, aButton1Title);
-	String button2Label = getLabel (aButtonFlags, nsIPrompt.BUTTON_POS_2, aButton2Title);
-
-	int defaultIndex = 0;
-	if ((aButtonFlags & nsIPrompt.BUTTON_POS_1_DEFAULT) != 0) {
-		defaultIndex = 1;
-	} else if ((aButtonFlags & nsIPrompt.BUTTON_POS_2_DEFAULT) != 0) {
-		defaultIndex = 2;
-	}
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] check = new boolean[1];
-	int[] result = new int[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-	dialog.confirmEx (titleLabel, textLabel, checkLabel, button0Label, button1Label, button2Label, defaultIndex, check, result);
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
-	XPCOM.memmove (_retval, result, 4);
-	return XPCOM.NS_OK;
-}
-
-int Prompt (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aValue, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	Browser browser = getBrowser ();
-	String titleLabel = null, textLabel, checkLabel = null;
-	String[] valueLabel = new String[1];
-	char[] dest;
-	int length;
-	if (aDialogTitle != 0) {
-		length = XPCOM.strlen_PRUnichar (aDialogTitle);
-		dest = new char[length];
-		XPCOM.memmove (dest, aDialogTitle, length * 2);
-		titleLabel = new String (dest);
-	}
-
-	length = XPCOM.strlen_PRUnichar (aText);
-	dest = new char[length];
-	XPCOM.memmove (dest, aText, length * 2);
-	textLabel = new String (dest);
-
-	long /*int*/[] valueAddr = new long /*int*/[1];
-	XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
-	if (valueAddr[0] != 0) {
-		length = XPCOM.strlen_PRUnichar (valueAddr[0]);
-		dest = new char[length];
-		XPCOM.memmove (dest, valueAddr[0], length * 2);
-		valueLabel[0] = new String (dest);
-	}
-
-	if (aCheckMsg != 0) {
-		length = XPCOM.strlen_PRUnichar (aCheckMsg);
-		if (length > 0) {
-			dest = new char[length];
-			XPCOM.memmove (dest, aCheckMsg, length * 2);
-			checkLabel = new String (dest);
-		}
-	}
-
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] check = new boolean[1], result = new boolean[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-	dialog.prompt (titleLabel, textLabel, checkLabel, valueLabel, check, result);
-
-	XPCOM.memmove (_retval, result);
-	if (result[0]) {
-		/*
-		* User selected OK. User name and password are returned as PRUnichar values. Any default
-		* value that we override must be freed using the nsIMemory service.
-		*/
-		if (valueLabel[0] != null) {
-			long /*int*/[] result2 = new long /*int*/[1];
-			int rc = XPCOM.NS_GetServiceManager (result2);
-			if (rc != XPCOM.NS_OK) SWT.error (rc);
-			if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-
-			nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
-			result2[0] = 0;
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIMemory.class), result2);
-			if (rc != XPCOM.NS_OK) SWT.error (rc);
-			if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-			serviceManager.Release ();
-
-			nsIMemory memory = new nsIMemory (result2[0]);
-			result2[0] = 0;
-
-			int cnt = valueLabel[0].length ();
-			char[] buffer = new char[cnt + 1];
-			valueLabel[0].getChars (0, cnt, buffer, 0);
-			int size = buffer.length * 2;
-			long /*int*/ ptr = memory.Alloc (size);
-			XPCOM.memmove (ptr, buffer, size);
-			XPCOM.memmove (aValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-
-			if (valueAddr[0] != 0) {
-				memory.Free (valueAddr[0]);
-			}
-			memory.Release ();
-		}
-	}
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
-	return XPCOM.NS_OK;
-}
-
-int PromptAuth(long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ _retval) {
-	nsIAuthInformation auth = new nsIAuthInformation (authInfo);
-
-	Browser browser = getBrowser ();
-	if (browser != null) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
-		/*
-		 * Do not invoke the listeners if this challenge has been failed too many
-		 * times because a listener is likely giving incorrect credentials repeatedly
-		 * and will do so indefinitely.
-		 */
-		if (mozilla.authCount++ < 3) {
-			for (int i = 0; i < mozilla.authenticationListeners.length; i++) {
-				AuthenticationEvent event = new AuthenticationEvent (browser);
-				event.location = mozilla.lastNavigateURL;
-				mozilla.authenticationListeners[i].authenticate (event);
-				if (!event.doit) {
-					XPCOM.memmove (_retval, new boolean[] {false});
-					return XPCOM.NS_OK;
-				}
-				if (event.user != null && event.password != null) {
-					nsEmbedString string = new nsEmbedString (event.user);
-					int rc = auth.SetUsername (string.getAddress ());
-					if (rc != XPCOM.NS_OK) SWT.error (rc);
-					string.dispose ();
-					string = new nsEmbedString (event.password);
-					rc = auth.SetPassword (string.getAddress ());
-					if (rc != XPCOM.NS_OK) SWT.error (rc);
-					string.dispose ();
-					XPCOM.memmove (_retval, new boolean[] {true});
-					return XPCOM.NS_OK;
-				}
-			}
-		}
-	}
-
-	/* no listener handled the challenge, so show an authentication dialog */
-
-	String checkLabel = null;
-	boolean[] checkValue = new boolean[1];
-	String[] userLabel = new String[1], passLabel = new String[1];
-
-	String title = SWT.getMessage ("SWT_Authentication_Required"); //$NON-NLS-1$
-
-	/* get initial username and password values */
-
-	nsEmbedString ptr = new nsEmbedString ();
-	int rc = auth.GetUsername (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	userLabel[0] = ptr.toString ();
-	ptr.dispose ();
-
-	ptr = new nsEmbedString ();
-	rc = auth.GetPassword (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	passLabel[0] = ptr.toString ();
-	ptr.dispose ();
-
-	/* compute the message text */
-
-	ptr = new nsEmbedString ();
-	rc = auth.GetRealm (ptr.getAddress());
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	String realm = ptr.toString ();
-	ptr.dispose ();
-
-	nsIChannel channel = new nsIChannel (aChannel);
-	long /*int*/[] uri = new long /*int*/[1];
-	rc = channel.GetURI (uri);
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-
-	nsIURI nsURI = new nsIURI (uri[0]);
-	long /*int*/ host = XPCOM.nsEmbedCString_new ();
-	rc = nsURI.GetHost (host);
-	if (rc != XPCOM.NS_OK) SWT.error (rc);
-	int length = XPCOM.nsEmbedCString_Length (host);
-	long /*int*/ buffer = XPCOM.nsEmbedCString_get (host);
-	byte[] bytes = new byte[length];
-	XPCOM.memmove (bytes, buffer, length);
-	String hostString = new String (bytes);
-	XPCOM.nsEmbedCString_delete (host);
-	nsURI.Release ();
-
-	String message;
-	if (realm.length () > 0 && hostString.length () > 0) {
-		message = Compatibility.getMessage ("SWT_Enter_Username_and_Password", new String[] {realm, hostString}); //$NON-NLS-1$
-	} else {
-		message = ""; //$NON-NLS-1$
-	}
-
-	/* open the prompter */
-	Shell shell = browser == null ? new Shell () : browser.getShell ();
-	PromptDialog dialog = new PromptDialog (shell);
-	boolean[] result = new boolean[1];
-	dialog.promptUsernameAndPassword (title, message, checkLabel, userLabel, passLabel, checkValue, result);
-
-	XPCOM.memmove (_retval, result);
-	if (result[0]) {	/* User selected OK */
-		nsEmbedString string = new nsEmbedString (userLabel[0]);
-		rc = auth.SetUsername(string.getAddress ());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		string.dispose ();
-
-		string = new nsEmbedString (passLabel[0]);
-		rc = auth.SetPassword(string.getAddress ());
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		string.dispose ();
-	}
-
-	return XPCOM.NS_OK;
-}
-
-int PromptUsernameAndPassword (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aUsername, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	Browser browser = getBrowser ();
-	String user = null, password = null;
-
-	if (browser != null) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
-		/*
-		 * Do not invoke the listeners if this challenge has been failed too many
-		 * times because a listener is likely giving incorrect credentials repeatedly
-		 * and will do so indefinitely.
-		 */
-		if (mozilla.authCount++ < 3) {
-			for (int i = 0; i < mozilla.authenticationListeners.length; i++) {
-				AuthenticationEvent event = new AuthenticationEvent (browser);
-				event.location = mozilla.lastNavigateURL;
-				mozilla.authenticationListeners[i].authenticate (event);
-				if (!event.doit) {
-					XPCOM.memmove (_retval, new boolean[] {false});
-					return XPCOM.NS_OK;
-				}
-				if (event.user != null && event.password != null) {
-					user = event.user;
-					password = event.password;
-					XPCOM.memmove (_retval, new boolean[] {true});
-					break;
-				}
-			}
-		}
-	}
-
-	if (user == null) {
-		/* no listener handled the challenge, so show an authentication dialog */
-
-		String titleLabel, textLabel, checkLabel = null;
-		String[] userLabel = new String[1], passLabel = new String[1];
-		char[] dest;
-		int length;
-		if (aDialogTitle != 0) {
-			length = XPCOM.strlen_PRUnichar (aDialogTitle);
-			dest = new char[length];
-			XPCOM.memmove (dest, aDialogTitle, length * 2);
-			titleLabel = new String (dest);
-		} else {
-			titleLabel = SWT.getMessage ("SWT_Authentication_Required");	//$NON-NLS-1$
-		}
-
-		length = XPCOM.strlen_PRUnichar (aText);
-		dest = new char[length];
-		XPCOM.memmove (dest, aText, length * 2);
-		textLabel = new String (dest);
-
-		long /*int*/[] userAddr = new long /*int*/[1];
-		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
-		if (userAddr[0] != 0) {
-			length = XPCOM.strlen_PRUnichar (userAddr[0]);
-			dest = new char[length];
-			XPCOM.memmove (dest, userAddr[0], length * 2);
-			userLabel[0] = new String (dest);
-		}
-
-		long /*int*/[] passAddr = new long /*int*/[1];
-		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
-		if (passAddr[0] != 0) {
-			length = XPCOM.strlen_PRUnichar (passAddr[0]);
-			dest = new char[length];
-			XPCOM.memmove (dest, passAddr[0], length * 2);
-			passLabel[0] = new String (dest);
-		}
-
-		if (aCheckMsg != 0) {
-			length = XPCOM.strlen_PRUnichar (aCheckMsg);
-			if (length > 0) {
-				dest = new char[length];
-				XPCOM.memmove (dest, aCheckMsg, length * 2);
-				checkLabel = new String (dest);
-			}
-		}
-
-		Shell shell = browser == null ? new Shell () : browser.getShell ();
-		PromptDialog dialog = new PromptDialog (shell);
-		boolean[] check = new boolean[1], result = new boolean[1];
-		if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-		dialog.promptUsernameAndPassword (titleLabel, textLabel, checkLabel, userLabel, passLabel, check, result);
-
-		XPCOM.memmove (_retval, result);
-		if (result[0]) {
-			/* User selected OK */
-			user = userLabel[0];
-			password = passLabel[0];
-		}
-		if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
-	}
-
-	if (user != null) {
-		/*
-		* User name and password are returned as PRUnichar values. Any default
-		* value that we override must be freed using the nsIMemory service.
-		*/
-		long /*int*/[] userAddr = new long /*int*/[1];
-		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
-		long /*int*/[] passAddr = new long /*int*/[1];
-		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
-
-		long /*int*/[] result = new long /*int*/[1];
-		int rc = XPCOM.NS_GetServiceManager (result);
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		if (result[0] == 0) SWT.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) SWT.error (rc);
-		if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-		serviceManager.Release ();
-
-		nsIMemory memory = new nsIMemory (result[0]);
-		result[0] = 0;
-		if (userAddr[0] != 0) memory.Free (userAddr[0]);
-		if (passAddr[0] != 0) memory.Free (passAddr[0]);
-		memory.Release ();
-
-		/* write the name and password values */
-
-		int cnt = user.length ();
-		char[] buffer = new char[cnt + 1];
-		user.getChars (0, cnt, buffer, 0);
-		int size = buffer.length * 2;
-		long /*int*/ ptr = C.malloc (size);
-		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-
-		cnt = password.length ();
-		buffer = new char[cnt + 1];
-		password.getChars (0, cnt, buffer, 0);
-		size = buffer.length * 2;
-		ptr = C.malloc (size);
-		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-	}
-
-	return XPCOM.NS_OK;
-}
-
-int PromptPassword (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int Select (long /*int*/ aDialogTitle, long /*int*/ aText, int aCount, long /*int*/ aSelectList, long /*int*/ aOutSelection, long /*int*/ _retval) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java
deleted file mode 100644
index b93894f5cd..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2012 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.C;
-import org.eclipse.swt.internal.mozilla.*;
-
-class SimpleEnumerator {
-	XPCOMObject supports;
-	XPCOMObject simpleEnumerator;
-	int refCount = 0;
-	nsISupports[] values;
-	int index = 0;
-
-SimpleEnumerator (nsISupports[] values) {
-	this.values = values;
-	for (int i = 0; i < values.length; i++) {
-		values[i].AddRef ();
-	}
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	simpleEnumerator = new XPCOMObject (new int[] {2, 0, 0, 1, 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 HasMoreElements (args[0]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return GetNext (args[0]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (simpleEnumerator != null) {
-		simpleEnumerator.dispose ();
-		simpleEnumerator = null;
-	}
-	if (values != null) {
-		for (int i = 0; i < values.length; i++) {
-			values[i].Release ();
-		}
-		values = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return simpleEnumerator.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (IIDStore.GetIID (nsISimpleEnumerator.class))) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {simpleEnumerator.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-int HasMoreElements (long /*int*/ _retval) {
-	boolean more = values != null && index < values.length;
-	XPCOM.memmove (_retval, new boolean[] {more});
-	return XPCOM.NS_OK;
-}
-
-int GetNext (long /*int*/ _retval) {
-	if (values == null || index == values.length) return XPCOM.NS_ERROR_UNEXPECTED;
-	nsISupports value = values[index++];
-    value.AddRef ();
-    XPCOM.memmove (_retval, new long /*int*/[] {value.getAddress ()}, C.PTR_SIZEOF);
-    return XPCOM.NS_OK;
-}
-}
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java
deleted file mode 100644
index fc4ffc6e28..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-class WindowCreator2 {
-	XPCOMObject supports;
-	XPCOMObject windowCreator;
-	XPCOMObject windowCreator2;
-	int refCount = 0;
-
-WindowCreator2 () {
-	createCOMInterfaces ();
-}
-
-int AddRef () {
-	refCount++;
-	return refCount;
-}
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		@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 ();}
-	};
-
-	windowCreator = new XPCOMObject (new int[] {2, 0, 0, 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 CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
-	};
-
-	windowCreator2 = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {
-		@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 CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
-		@Override
-		public long /*int*/ method4 (long /*int*/[] args) {return CreateChromeWindow2 (args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
-	};
-}
-
-void disposeCOMInterfaces () {
-	if (supports != null) {
-		supports.dispose ();
-		supports = null;
-	}
-	if (windowCreator != null) {
-		windowCreator.dispose ();
-		windowCreator = null;
-	}
-
-	if (windowCreator2 != null) {
-		windowCreator2.dispose ();
-		windowCreator2 = null;
-	}
-}
-
-long /*int*/ getAddress () {
-	return windowCreator.getAddress ();
-}
-
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
-	if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-	nsID guid = new nsID ();
-	XPCOM.memmove (guid, riid, nsID.sizeof);
-
-	if (guid.Equals (XPCOM.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IWINDOWCREATOR_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF);
-		AddRef ();
-		return XPCOM.NS_OK;
-	}
-	if (guid.Equals (XPCOM.NS_IWINDOWCREATOR2_IID)) {
-		XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator2.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 Release () {
-	refCount--;
-	if (refCount == 0) disposeCOMInterfaces ();
-	return refCount;
-}
-
-/* nsIWindowCreator */
-
-int CreateChromeWindow (long /*int*/ parent, int chromeFlags, long /*int*/ _retval) {
-	return CreateChromeWindow2 (parent, chromeFlags, 0, 0, 0, _retval);
-}
-
-/* nsIWindowCreator2 */
-
-int CreateChromeWindow2 (long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, long /*int*/ cancel, long /*int*/ _retval) {
-	if (parent == 0 && (chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) == 0) {
-		return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-	}
-	Browser src = null;
-	if (parent != 0) {
-		nsIWebBrowserChrome browserChromeParent = new nsIWebBrowserChrome (parent);
-		long /*int*/[] aWebBrowser = new long /*int*/[1];
-		int rc = browserChromeParent.GetWebBrowser (aWebBrowser);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		if (aWebBrowser[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-		nsIWebBrowser webBrowser = new nsIWebBrowser (aWebBrowser[0]);
-		long /*int*/[] result = new long /*int*/[1];
-		rc = webBrowser.QueryInterface (IIDStore.GetIID (nsIBaseWindow.class), result);
-		if (rc != XPCOM.NS_OK) {
-			SWT.error (rc);
-		}
-		if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-		webBrowser.Release ();
-
-		nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
-		result[0] = 0;
-		long /*int*/[] aParentNativeWindow = new long /*int*/[1];
-		rc = baseWindow.GetParentNativeWindow (aParentNativeWindow);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		if (aParentNativeWindow[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-		baseWindow.Release ();
-
-		src = Mozilla.findBrowser (aParentNativeWindow[0]);
-	}
-	final Browser browser;
-	boolean doit = true;
-	if ((chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) != 0) {
-		/*
-		* Mozilla will request a new Browser in a modal window in order to emulate a native
-		* dialog that is not available to it (eg.- a print dialog on Linux).  For this
-		* reason modal requests are handled here so that the user is not exposed to them.
-		*/
-		int style = SWT.NONE;
-		if ((chromeFlags & nsIWebBrowserChrome.CHROME_WINDOW_POPUP) == 0) {
-			/* add dialog trim for all windows except pop-ups */
-			style |= SWT.DIALOG_TRIM;
-		}
-		if ((chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0) style |= SWT.APPLICATION_MODAL;
-		final Shell shell = src == null ?
-			new Shell (style) :
-			new Shell (src.getShell(), style);
-		shell.setLayout (new FillLayout ());
-		browser = new Browser (shell, src == null ? SWT.MOZILLA : src.getStyle () & SWT.MOZILLA);
-		browser.addVisibilityWindowListener (new VisibilityWindowListener () {
-			@Override
-			public void hide (WindowEvent event) {
-			}
-			@Override
-			public void show (WindowEvent event) {
-				if (event.location != null) shell.setLocation (event.location);
-				if (event.size != null) {
-					Point size = event.size;
-					shell.setSize (shell.computeSize (size.x, size.y));
-				}
-				shell.open ();
-			}
-		});
-		browser.addCloseWindowListener (event -> shell.close ());
-		if (uri != 0) {
-			nsIURI location = new nsIURI (uri);
-			long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
-			if (location.GetSpec (aSpec) == XPCOM.NS_OK) {
-				int length = XPCOM.nsEmbedCString_Length (aSpec);
-				if (length > 0) {
-					long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-					byte[] dest = new byte[length];
-					XPCOM.memmove (dest, buffer, length);
-					browser.setUrl (new String (dest));
-				}
-			}
-			XPCOM.nsEmbedCString_delete (aSpec);
-		}
-	} else {
-		WindowEvent event = new WindowEvent (src);
-		event.display = src.getDisplay ();
-		event.widget = src;
-		event.required = true;
-		for (int i = 0; i < src.webBrowser.openWindowListeners.length; i++) {
-			src.webBrowser.openWindowListeners[i].open (event);
-		}
-		browser = event.browser;
-
-		/* Ensure that the Browser provided by the client is valid for use */
-		doit = browser != null && !browser.isDisposed ();
-		if (doit) {
-			String platform = Platform.PLATFORM;
-			boolean isMozillaNativePlatform = platform.equals ("gtk"); //$NON-NLS-1$
-			doit = isMozillaNativePlatform || (browser.getStyle () & SWT.MOZILLA) != 0;
-		}
-	}
-	if (doit) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
-		mozilla.isChild = true;
-		long /*int*/ chromePtr = mozilla.webBrowserChrome.getAddress ();
-		nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (chromePtr);
-		webBrowserChrome.SetChromeFlags (chromeFlags);
-		webBrowserChrome.AddRef ();
-		XPCOM.memmove (_retval, new long /*int*/[] {chromePtr}, C.PTR_SIZEOF);
-	} else {
-		if (cancel != 0) {
-			XPCOM.memmove (cancel, new boolean[] {true});
-		}
-	}
-	return doit ? XPCOM.NS_OK : XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/Execute.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/Execute.java
deleted file mode 100644
index 04f6f91866..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/Execute.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Neil Rashbrook 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:
- *    Neil Rashbrook <neil@parkwaycc.co.uk> - Bug 429739
- *    Matthew Painter <matthew.painter@import.io>
- *******************************************************************************/
-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 int EvalAsChrome(nsIDOMWindow aWindow, nsEmbedString code, long /*int*/[] aVariant) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindow.getAddress(), code.getAddress(), aVariant);
- 	}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/IIDStore.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/IIDStore.java
deleted file mode 100644
index 941774cd66..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/IIDStore.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2014, 2016 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

- *******************************************************************************/

-package org.eclipse.swt.internal.mozilla;

-

-import java.util.HashMap;

-

-import org.eclipse.swt.internal.C;

-

-public abstract class IIDStore {

-	static HashMap<Class<?>,nsID[]> IIDs = new HashMap<> ();

-

-	public static nsID GetIID (Class<?> clazz) {

-		return GetIID (clazz, MozillaVersion.GetCurrentVersion ());

-	}

-

-	public static nsID GetIID (Class<?> clazz, int version) {

-		return GetIID (clazz, version, false);

-	}

-

-	public static nsID GetIID (Class<?> clazz, int version, boolean exact) {

-		if (version <= MozillaVersion.GetLatestVersion ()) {

-			nsID[] table = IIDs.get (clazz);

-			if (table == null) {

-				/* The nsI* class has not been loaded, so attempt to create a default instance to make this happen */

-				try {

-					Class<?> argType = C.PTR_SIZEOF == 4 ? Integer.TYPE : Long.TYPE;

-					clazz.getConstructor (new Class<?>[] {argType}).newInstance (new Object[] {0});

-					table = IIDs.get (clazz);

-				} catch (Exception e) {

-					/* clazz appears to not be an nsI* class, which is not valid */

-				}

-			}

-			if (table != null) {

-				if (exact) {

-					return table[version];

-				}

-				int defaultIIDIndex = MozillaVersion.GetLatestVersion () + 1;

-				if (version == MozillaVersion.GetCurrentVersion () && table[defaultIIDIndex] != null) {

-					return table[defaultIIDIndex]; /* the cached value */

-				}

-				for (int i = version; MozillaVersion.VERSION_BASE <= i; i--) {

-					if (table[i] != null) {

-						if (version == MozillaVersion.GetCurrentVersion ()) {

-							table[defaultIIDIndex] = table[i]; /* cache for future reference */

-						}

-						return table[i];

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	protected static void RegisterIID (Class<?> clazz, int version, nsID iid) {

-		if (version <= MozillaVersion.GetLatestVersion ()) {

-			nsID[] table = IIDs.get (clazz);

-			if (table == null) {

-				/*

-				 * Note that the table's final slot is used to cache the iid for

-				 * the current version since this is the most frequently used one.

-				 */

-				table = new nsID[MozillaVersion.GetLatestVersion () + 2];

-				IIDs.put (clazz, table);

-			}

-			table[version] = iid;

-		}

-	}

-}

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/MozillaVersion.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/MozillaVersion.java
deleted file mode 100644
index 620e996d44..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/MozillaVersion.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2014 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

- *******************************************************************************/

-package org.eclipse.swt.internal.mozilla;

-

-

-public class MozillaVersion {

-

-	public static final int VERSION_BASE = 0;

-	public static final int VERSION_XR1_8 = 1;

-	public static final int VERSION_XR1_9 = 2;

-	public static final int VERSION_XR1_9_1 = 3;

-	public static final int VERSION_XR1_9_2 = 4;

-	public static final int VERSION_XR10 = 5;

-	public static final int VERSION_XR24 = 6;

-	public static final int VERSION_XR31 = 7;

-

-	static final int VERSION_LATEST = VERSION_XR31;

-	static int CurrentVersion = -1;

-

-	public static boolean CheckVersion (int version) {

-		return CheckVersion (version, false);

-	}

-

-	public static boolean CheckVersion (int version, boolean exact) {

-		return exact ? version == CurrentVersion : version <= CurrentVersion;

-	}

-

-	public static int GetCurrentVersion () {

-		return CurrentVersion;

-	}

-

-	public static int GetLatestVersion () {

-		return VERSION_LATEST;

-	}

-

-	public static void SetCurrentVersion (int value) {

-		CurrentVersion = value;

-	}

-}

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
deleted file mode 100755
index 3a6c78980a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ /dev/null
@@ -1,2667 +0,0 @@
-/* ***** 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, 2014 IBM Corp.  All Rights Reserved.
- *    Neil Rashbrook <neil@parkwaycc.co.uk> - Bug 429739
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-import org.eclipse.swt.internal.*;
-
-/** @jniclass flags=cpp */
-public class XPCOM extends C {
-	public static final String CONTENT_MAYBETEXT = "application/x-vnd.mozilla.maybe-text"; //$NON-NLS-1$
-	public static final String CONTENT_MULTIPART = "multipart/x-mixed-replace"; //$NON-NLS-1$
-	public static final String DOMEVENT_FOCUS = "focus"; //$NON-NLS-1$
-	public static final String DOMEVENT_UNLOAD = "unload"; //$NON-NLS-1$
-	public static final String DOMEVENT_MOUSEDOWN = "mousedown"; //$NON-NLS-1$
-	public static final String DOMEVENT_MOUSEUP = "mouseup"; //$NON-NLS-1$
-	public static final String DOMEVENT_MOUSEMOVE = "mousemove"; //$NON-NLS-1$
-	public static final String DOMEVENT_MOUSEDRAG = "draggesture"; //$NON-NLS-1$
-	public static final String DOMEVENT_MOUSEWHEEL = "DOMMouseScroll"; //$NON-NLS-1$
-	public static final String DOMEVENT_MOUSEOVER = "mouseover"; //$NON-NLS-1$
-	public static final String DOMEVENT_MOUSEOUT = "mouseout"; //$NON-NLS-1$
-	public static final String DOMEVENT_KEYDOWN = "keydown"; //$NON-NLS-1$
-	public static final String DOMEVENT_KEYPRESS = "keypress"; //$NON-NLS-1$
-	public static final String DOMEVENT_KEYUP = "keyup"; //$NON-NLS-1$
-
-	/* CID constants */
-	public static final nsID EXTERNAL_CID = new nsID ("f2c59ad0-bd76-11dd-ad8b-0800200c9a66"); //$NON-NLS-1$
-	public static final nsID NS_APPSHELL_CID =	new nsID("2d96b3df-c051-11d1-a827-0040959a28c9"); //$NON-NLS-1$
-	public static final nsID NS_AUTHPROMPTER_CID = new nsID("e2112d6a-0e28-421f-b46a-25c0b308cbd0"); //$NON-NLS-1$
-	public static final nsID NS_CATEGORYMANAGER_CID = new nsID("16d222a6-1dd2-11b2-b693-f38b02c021b2"); //$NON-NLS-1$
-	public static final nsID NS_DOWNLOAD_CID = new nsID("e3fa9D0a-1dd1-11b2-bdef-8c720b597445"); //$NON-NLS-1$
-	public static final nsID NS_FILEPICKER_CID = new nsID("54ae32f8-1dd2-11b2-a209-df7c505370f8"); //$NON-NLS-1$
-	public static final nsID NS_HELPERAPPLAUNCHERDIALOG_CID = new nsID("e68578eb-6ec2-4169-ae19-8c6243f0abe1"); //$NON-NLS-1$
-	public static final nsID NS_INPUTSTREAMCHANNEL_CID = new nsID("6ddb050c-0d04-11d4-986e-00c04fa0cf4a"); //$NON-NLS-1$
-	public static final nsID NS_IOSERVICE_CID =	new nsID("9ac9e770-18bc-11d3-9337-00104ba0fd40"); //$NON-NLS-1$
-	public static final nsID NS_LOADGROUP_CID = new nsID("e1c61582-2a84-11d3-8cce-0060b0fc14a3"); //$NON-NLS-1$
-	public static final nsID NS_PROMPTER_CID = new nsID("f2112d6a-0e28-421f-b46a-25c0b308cbd0"); //$NON-NLS-1$
-	public static final nsID NS_PROMPTSERVICE_CID = new nsID("a2112d6a-0e28-421f-b46a-25c0b308cbd0"); //$NON-NLS-1$
-	public static final nsID NS_IWEBBROWSER_CID = new nsID ("F1EAC761-87E9-11d3-AF80-00A024FFC08C"); //$NON-NLS-1$
-	public static final nsID NS_IWEBBROWSER_31_CID = new nsID ("cda5863a-aa9c-411e-be49-ea0d525ab4b5"); //$NON-NLS-1$
-	public static final nsID NS_IXPCONNECT_CID = new nsID ("CB6593E0-F9B2-11d2-BDD6-000064657374"); //$NON-NLS-1$
-
-	/* IID constants */
-	public static final nsID NS_IAUTHPROMPT2_IID = new nsID ("651395eb-8612-4876-8ac0-a88d4dce9e1e"); //$NON-NLS-1$
-	public static final nsID NS_IBADCERTLISTENER2_IID = new nsID ("2c3d268c-ad82-49f3-99aa-e9ffddd7a0dc"); //$NON-NLS-1$
-	public static final nsID NS_ICONTEXTMENULISTENER_IID = new nsID ("3478b6b0-3875-11d4-94ef-0020183bf181"); //$NON-NLS-1$
-	public static final nsID NS_IDIRECTORYSERVICE_IID = new nsID ("57a66a60-d43a-11d3-8cc2-00609792278c"); //$NON-NLS-1$
-	public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID = new nsID ("bbf8cab0-d43a-11d3-8cc2-00609792278c"); //$NON-NLS-1$
-	public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID = new nsID ("2f977d4b-5485-11d4-87e2-0010a4e75ef2"); //$NON-NLS-1$
-	public static final nsID NS_IDOWNLOAD_IID = new nsID ("06cb92f2-1dd2-11b2-95f2-96dfdfb804a1"); //$NON-NLS-1$
-	public static final nsID NS_IDOWNLOAD_1_8_IID = new nsID ("9e1fd9f2-9727-4926-85cd-f16c375bba6d"); //$NON-NLS-1$
-	public static final nsID NS_IFACTORY_IID = new nsID ("00000001-0000-0000-c000-000000000046"); //$NON-NLS-1$
-	public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID = new nsID ("d7ebddf0-4c84-11d4-807a-00600811a9c3"); //$NON-NLS-1$
-	public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_1_9_IID = new nsID ("f3704fdc-8ae6-4eba-a3c3-f02958ac0649"); //$NON-NLS-1$
-	public static final nsID NS_IHTTPHEADERVISITOR_IID = new nsID("0cf40717-d7c1-4a94-8c1e-d6c9734101bb"); //$NON-NLS-1$
-	public static final nsID NS_IHTTPHEADERVISITOR_10_IID = new nsID("35412859-b9d9-423c-8866-2d4559fdd2be"); //$NON-NLS-1$
-	public static final nsID NS_IPROGRESSDIALOG_IID = new nsID("88a478b3-af65-440a-94dc-ed9b154d2990"); //$NON-NLS-1$
-	public static final nsID NS_IPROGRESSDIALOG_1_8_IID = new nsID("20e790a2-76c6-462d-851a-22ab6cbbe48b"); //$NON-NLS-1$
-	public static final nsID NS_IPROMPT_IID = new nsID("a63f70c0-148b-11d3-9333-00104ba0fd40"); //$NON-NLS-1$
-	public static final nsID NS_IPROMPTFACTORY_IID = new nsID ("2532b748-75db-4732-9173-78d3bf34f694"); //$NON-NLS-1$
-	public static final nsID NS_IPROMPTSERVICE_IID = new nsID ("1630c61a-325e-49ca-8759-a31b16c47aa5"); //$NON-NLS-1$
-	public static final nsID NS_IPROMPTSERVICE2_IID = new nsID ("cf86d196-dbee-4482-9dfa-3477aa128319"); //$NON-NLS-1$
-	public static final nsID NS_ISCRIPTOBJECTOWNER_IID = new nsID ("8f6bca7e-ce42-11d1-b724-00600891d8c9"); //$NON-NLS-1$
-	public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID = new nsID ("0dad9e8c-a12d-4dcb-9a6f-7d09839356e1"); //$NON-NLS-1$
-	public static final nsID NS_ISUPPORTS_IID = new nsID ("00000000-0000-0000-c000-000000000046"); //$NON-NLS-1$
-	public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID = new nsID ("9188bc86-f92e-11d2-81ef-0060083a0bcf"); //$NON-NLS-1$
-	public static final nsID NS_ITOOLTIPLISTENER_IID = new nsID ("44b78386-1dd2-11b2-9ad2-e4eee2ca1916"); //$NON-NLS-1$
-	public static final nsID NS_IURICONTENTLISTENER_IID = new nsID ("94928ab3-8b63-11d3-989d-001083010e9b"); //$NON-NLS-1$
-	public static final nsID NS_IWEAKREFERENCE_IID = new nsID ("9188bc85-f92e-11d2-81ef-0060083a0bcf"); //$NON-NLS-1$
-	public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID = new nsID ("d2206418-1dd1-11b2-8e55-acddcd2bcfb8"); //$NON-NLS-1$
-	public static final nsID NS_IWINDOWCREATOR_IID = new nsID ("30465632-a777-44cc-90f9-8145475ef999"); //$NON-NLS-1$
-	public static final nsID NS_IWINDOWCREATOR2_IID = new nsID ("f673ec81-a4b0-11d6-964b-eb5a2bf216fc"); //$NON-NLS-1$
-	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 String NS_CERTIFICATEDIALOGS_CONTRACTID = "@mozilla.org/nsCertificateDialogs;1"; //$NON-NLS-1$
-	public static final String NS_CONTEXTSTACK_CONTRACTID = "@mozilla.org/js/xpc/ContextStack;1"; //$NON-NLS-1$
-	public static final String NS_COOKIEMANAGER_CONTRACTID = "@mozilla.org/cookiemanager;1"; //$NON-NLS-1$
-	public static final String NS_COOKIESERVICE_CONTRACTID = "@mozilla.org/cookieService;1"; //$NON-NLS-1$
-	public static final String NS_DIRECTORYSERVICE_CONTRACTID = "@mozilla.org/file/directory_service;1"; //$NON-NLS-1$
-	public static final String NS_DOMSERIALIZER_CONTRACTID = "@mozilla.org/xmlextras/xmlserializer;1"; //$NON-NLS-1$
-	public static final String NS_DOWNLOAD_CONTRACTID = "@mozilla.org/download;1"; //$NON-NLS-1$
-	public static final String NS_FILEPICKER_CONTRACTID = "@mozilla.org/filepicker;1"; //$NON-NLS-1$
-	public static final String NS_FOCUSMANAGER_CONTRACTID = "@mozilla.org/focus-manager;1"; //$NON-NLS-1$
-	public static final String NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID = "@mozilla.org/helperapplauncherdialog;1"; //$NON-NLS-1$
-	public static final String NS_INTERFACEINFOMANAGER_CONTRACTID = "@mozilla.org/xpti/interfaceinfomanager-service;1";
-	public static final String NS_MEMORY_CONTRACTID = "@mozilla.org/xpcom/memory-service;1"; //$NON-NLS-1$
-	public static final String NS_MIMEINPUTSTREAM_CONTRACTID = "@mozilla.org/network/mime-input-stream;1"; //$NON-NLS-1$
-	public static final String NS_SCRIPTSECURITYMANAGER_CONTRACTID = "@mozilla.org/scriptsecuritymanager;1"; //$NON-NLS-1$
-	public static final String NS_OBSERVER_CONTRACTID = "@mozilla.org/observer-service;1"; //$NON-NLS-1$
-	public static final String NS_PREFLOCALIZEDSTRING_CONTRACTID = "@mozilla.org/pref-localizedstring;1"; //$NON-NLS-1$
-	public static final String NS_PREFSERVICE_CONTRACTID = "@mozilla.org/preferences-service;1"; //$NON-NLS-1$
-	public static final String NS_PROMPTER_CONTRACTID = "@mozilla.org/prompter;1"; //$NON-NLS-1$
-	public static final String NS_PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1"; //$NON-NLS-1$
-	public static final String NS_TRANSFER_CONTRACTID = "@mozilla.org/transfer;1"; //$NON-NLS-1$
-	public static final String NS_VARIANT_CONTRACTID = "@mozilla.org/variant;1"; //$NON-NLS-1$
-	public static final String NS_WEBNAVIGATIONINFO_CONTRACTID = "@mozilla.org/webnavigation-info;1"; //$NON-NLS-1$
-	public static final String NS_WINDOWWATCHER_CONTRACTID = "@mozilla.org/embedcomp/window-watcher;1"; //$NON-NLS-1$
-
-	/* directory service constants */
-	public static final String NS_APP_APPLICATION_REGISTRY_DIR = "AppRegD"; //$NON-NLS-1$
-	public static final String NS_APP_CACHE_PARENT_DIR = "cachePDir"; //$NON-NLS-1$
-	public static final String NS_APP_HISTORY_50_FILE = "UHist"; //$NON-NLS-1$
-	public static final String NS_APP_LOCALSTORE_50_FILE = "LclSt"; //$NON-NLS-1$
-	public static final String NS_APP_PLUGINS_DIR_LIST = "APluginsDL"; //$NON-NLS-1$
-	public static final String NS_APP_PREF_DEFAULTS_50_DIR = "PrfDef"; //$NON-NLS-1$
-	public static final String NS_APP_PREFS_50_DIR = "PrefD"; //$NON-NLS-1$
-	public static final String NS_APP_PREFS_50_FILE = "PrefF"; //$NON-NLS-1$
-	public static final String NS_APP_USER_CHROME_DIR = "UChrm"; //$NON-NLS-1$
-	public static final String NS_APP_USER_MIMETYPES_50_FILE = "UMimTyp"; //$NON-NLS-1$
-	public static final String NS_APP_USER_PROFILE_50_DIR = "ProfD"; //$NON-NLS-1$
-	public static final String NS_GRE_COMPONENT_DIR = "GreComsD"; //$NON-NLS-1$
-	public static final String NS_GRE_DIR = "GreD"; //$NON-NLS-1$
-	public static final String NS_OS_CURRENT_PROCESS_DIR = "CurProcD"; //$NON-NLS-1$
-	public static final String NS_OS_HOME_DIR = "Home"; //$NON-NLS-1$
-	public static final String NS_OS_TEMP_DIR = "TmpD"; //$NON-NLS-1$
-	public static final String NS_XPCOM_COMPONENT_DIR = "ComsD"; //$NON-NLS-1$
-	public static final String NS_XPCOM_CURRENT_PROCESS_DIR = "XCurProcD"; //$NON-NLS-1$
-	public static final String NS_XPCOM_INIT_CURRENT_PROCESS_DIR = "MozBinD"; //$NON-NLS-1$
-
-	/* XPCOM constants */
-	public static final int NS_OK =  0;
-	public static final int NS_COMFALSE = 1;
-	public static final int NS_BINDING_ABORTED = 0x804B0002;
-	public static final int NS_ERROR_BASE = 0xc1f30000;
-	public static final int NS_ERROR_NOT_INITIALIZED =  NS_ERROR_BASE + 1;
-	public static final int NS_ERROR_ALREADY_INITIALIZED = NS_ERROR_BASE + 2;
-	public static final int NS_ERROR_NOT_IMPLEMENTED =  0x80004001;
-	public static final int NS_NOINTERFACE =  0x80004002;
-	public static final int NS_ERROR_NO_INTERFACE =  NS_NOINTERFACE;
-	public static final int NS_ERROR_INVALID_POINTER =  0x80004003;
-	public static final int NS_ERROR_NULL_POINTER = NS_ERROR_INVALID_POINTER;
-	public static final int NS_ERROR_ABORT = 0x80004004;
-	public static final int NS_ERROR_FAILURE = 0x80004005;
-	public static final int NS_ERROR_UNEXPECTED = 0x8000ffff;
-	public static final int NS_ERROR_OUT_OF_MEMORY = 0x8007000e;
-	public static final int NS_ERROR_ILLEGAL_VALUE = 0x80070057;
-	public static final int NS_ERROR_INVALID_ARG = NS_ERROR_ILLEGAL_VALUE;
-	public static final int NS_ERROR_NO_AGGREGATION = 0x80040110;
-	public static final int NS_ERROR_NOT_AVAILABLE = 0x80040111;
-	public static final int NS_ERROR_FACTORY_NOT_REGISTERED = 0x80040154;
-	public static final int NS_ERROR_FACTORY_REGISTER_AGAIN = 0x80040155;
-	public static final int NS_ERROR_FACTORY_NOT_LOADED = 0x800401f8;
-	public static final int NS_ERROR_FACTORY_NO_SIGNATURE_SUPPORT = NS_ERROR_BASE + 0x101;
-	public static final int NS_ERROR_FACTORY_EXISTS = NS_ERROR_BASE + 0x100;
-	public static final int NS_ERROR_HTMLPARSER_UNRESOLVEDDTD = 0x804e03f3;
-	public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012;
-	public static final int NS_ERROR_FILE_UNRECOGNIZED_PATH = 0x80520001;
-	public static final int SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE = 0x805A1FE2;
-	public static final int SEC_ERROR_CA_CERT_INVALID = 0x805A1FDC;
-	public static final int SEC_ERROR_EXPIRED_CERTIFICATE = 0x805A1FF5;
-	public static final int SEC_ERROR_INADEQUATE_KEY_USAGE = 0x805A1FA6;
-	public static final int SEC_ERROR_UNKNOWN_ISSUER = 0x805A1FF3;
-	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 void memmove(long /*int*/ dest, boolean[] src) {
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
-		memmove (dest, new byte[] {src[0] ? (byte)1 : 0}, 1);
-	} else {
-		memmove (dest, new int[] {src[0] ? 1 : 0}, 4);
-	}
-}
-
-public static void memmove(boolean[] dest, long /*int*/ src) {
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
-		byte[] result = new byte[1];
-		memmove (result, src, 1);
-		dest[0] = result[0] != 0;
-	} else {
-		int[] result = new int[1];
-		memmove (result, src, 4);
-		dest[0] = result[0] != 0;
-	}
-}
-
-/**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
-public static final native void memmove(long /*int*/ dest, nsDynamicFunctionLoad src, long /*int*/ size);
-/**
- * @param dest cast=(void *)
- * @param src cast=(const void *)
- * @param nbytes cast=(size_t)
- */
-public static final native void memmove(nsID dest, long /*int*/ src, int nbytes);
-/**
- * @param dest cast=(void *)
- * @param src cast=(const void *)
- * @param nbytes cast=(size_t)
- */
-public static final native void memmove(long /*int*/ dest, nsID src, int nbytes);
-/** @method flags=no_gen */
-public static final native int strlen_PRUnichar(long /*int*/ s);
-
-/** @method flags=no_gen */
-public static final native long /*int*/ CALLBACK_GetScriptableFlags24(long /*int*/ func);
-/** @method flags=no_gen */
-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();
-	try {
-		return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=no_gen */
-public static final native int _JS_EvaluateUCScriptForPrincipals191(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_EvaluateUCScriptForPrincipals191(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_EvaluateUCScriptForPrincipals191(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @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();
-	try {
-		return _JS_GetGlobalObject(mozillaPath, cx);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @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();
-	try {
-		return _NS_Free(mozillaPath, aPtr);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param result cast=(nsIComponentManager**) */
-public static final native int _NS_GetComponentManager(long /*int*/[] result);
-public static final int NS_GetComponentManager(long /*int*/[] result) {
-	lock.lock();
-	try {
-		return _NS_GetComponentManager(result);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param result cast=(nsIServiceManager**) */
-public static final native int _NS_GetServiceManager(long /*int*/[] result);
-public static final int NS_GetServiceManager(long /*int*/[] result) {
-	lock.lock();
-	try {
-		return _NS_GetServiceManager(result);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param result cast=(nsIServiceManager **)
- * @param binDirectory cast=(nsIFile *)
- * @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
- */
-public static final native int _NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider);
-public static final int NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider) {
-	lock.lock();
-	try {
-		return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param path cast=(nsAString *),flags=struct
- * @param result cast=(nsILocalFile**)
- */
-public static final native int _NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result);
-public static final int NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result) {
-	lock.lock();
-	try {
-		return _NS_NewLocalFile(path, followLinks, result);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=new */
-public static final native long /*int*/ _nsEmbedCString_new();
-public static final long /*int*/ nsEmbedCString_new() {
-	lock.lock();
-	try {
-		return _nsEmbedCString_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=new
- * @param aString cast=(const char *)
- */
-public static final native long /*int*/ _nsEmbedCString_new(byte[] aString, int length);
-public static final long /*int*/ nsEmbedCString_new(byte[] aString, int length) {
-	lock.lock();
-	try {
-		return _nsEmbedCString_new(aString, length);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=new
- * @param aString cast=(const char *)
- */
-public static final native long /*int*/ _nsEmbedCString_new(long /*int*/ aString, int length);
-public static final long /*int*/ nsEmbedCString_new(long /*int*/ aString, int length) {
-	lock.lock();
-	try {
-		return _nsEmbedCString_new(aString, length);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=delete
- * @param ptr cast=(nsEmbedCString *)
- */
-public static final native void _nsEmbedCString_delete(long /*int*/ ptr);
-public static final void nsEmbedCString_delete(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		_nsEmbedCString_delete(ptr);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=cpp
- * @param ptr cast=(nsEmbedCString *)
- */
-public static final native int _nsEmbedCString_Length(long /*int*/ ptr);
-public static final int nsEmbedCString_Length(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		return _nsEmbedCString_Length(ptr);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=cpp
- * @param ptr cast=(nsIScriptGlobalObject *)
- */
-public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang);
-public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang) {
-	lock.lock();
-	try {
-		return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);
-	} finally {
-		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 *)
- */
-public static final native long /*int*/ _nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang);
-public static final long /*int*/ nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang) {
-	lock.lock();
-	try {
-		return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);
-	} finally {
-		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 *)
- */
-public static final native long /*int*/ _nsIScriptContext_GetNativeContext(long /*int*/ ptr);
-public static final long /*int*/ nsIScriptContext_GetNativeContext(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		return _nsIScriptContext_GetNativeContext(ptr);
-	} finally {
-		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 *)
- */
-public static final native long /*int*/ _nsEmbedCString_get(long /*int*/ ptr);
-public static final long /*int*/ nsEmbedCString_get(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		return _nsEmbedCString_get(ptr);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=delete
- * @param ptr cast=(nsID *)
- */
-public static final native void _nsID_delete(long /*int*/ ptr);
-public static final void nsID_delete(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		_nsID_delete(ptr);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=new */
-public static final native long /*int*/ _nsID_new();
-public static final long /*int*/ nsID_new() {
-	lock.lock();
-	try {
-		return _nsID_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=cpp
- * @param ptr cast=(nsID *)
- * @param other cast=(nsID *),flags=struct
- */
-public static final native int _nsID_Equals(long /*int*/ ptr, long /*int*/ other);
-public static final int nsID_Equals(long /*int*/ ptr, long /*int*/ other) {
-	lock.lock();
-	try {
-		return _nsID_Equals(ptr, other);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=new */
-public static final native long /*int*/ _nsEmbedString_new();
-public static final long /*int*/ nsEmbedString_new() {
-	lock.lock();
-	try {
-		return _nsEmbedString_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=new
- * @param aString cast=(PRUnichar *)
- */
-public static final native long /*int*/ _nsEmbedString_new(char[] aString);
-public static final long /*int*/ nsEmbedString_new(char[] aString) {
-	lock.lock();
-	try {
-		return _nsEmbedString_new(aString);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=delete
- * @param ptr cast=(nsEmbedString *)
- */
-public static final native void _nsEmbedString_delete(long /*int*/ ptr);
-public static final void nsEmbedString_delete(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		_nsEmbedString_delete(ptr);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=cpp
- * @param ptr cast=(nsEmbedString *)
- */
-public static final native int _nsEmbedString_Length(long /*int*/ ptr);
-public static final int nsEmbedString_Length(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		return _nsEmbedString_Length(ptr);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=cpp
- * @param ptr cast=(nsEmbedString *)
- */
-public static final native long /*int*/ _nsEmbedString_get(long /*int*/ ptr);
-public static final long /*int*/ nsEmbedString_get(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		return _nsEmbedString_get(ptr);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=cpp
- * @param ptr cast=(nsIMemory *)
- * @param size cast=(size_t)
- */
-public static final native long /*int*/ _nsIMemory_Alloc(long /*int*/ ptr, int size);
-public static final long /*int*/ nsIMemory_Alloc(long /*int*/ ptr, int size) {
-	lock.lock();
-	try {
-		return _nsIMemory_Alloc(ptr, size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=cpp
- * @param ptr1 cast=(nsIMemory *)
- * @param ptr2 cast=(void *)
- * @param size cast=(size_t)
- */
-public static final native long /*int*/ _nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size);
-public static final long /*int*/ nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size) {
-	lock.lock();
-	try {
-		return _nsIMemory_Realloc(ptr1, ptr2, size);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
-public static final native int _XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad);
-public static final int XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad) {
-	lock.lock();
-	try {
-		return _XPCOMGlueLoadXULFunctions(functionLoad);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param place cast=(const char *) */
-public static final native int _XPCOMGlueStartup(byte[] place);
-public static final int XPCOMGlueStartup(byte[] place) {
-	lock.lock();
-	try {
-		return _XPCOMGlueStartup(place);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native int _XPCOMGlueShutdown();
-public static final int XPCOMGlueShutdown() {
-	lock.lock();
-	try {
-		return _XPCOMGlueShutdown();
-	} finally {
-		lock.unlock();
-	}
-}
-
-public static final native int _Call(long /*int*/ ptr);
-public static final int Call(long /*int*/ ptr) {
-	lock.lock();
-	try {
-		return _Call(ptr);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param ptr cast=(nsWriteSegmentFun)
- * @param aInStream cast=(nsIInputStream *)
- * @param aClosure cast=(void *)
- * @param aFromSegment cast=(const char *)
- * @param aWriteCount cast=(PRUint32 *)
- */
-public static final native long /*int*/ _Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
-public static final long /*int*/ Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {
-	lock.lock();
-	try {
-		return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param ptr cast=(SWT_XREInitEmbedding)
- * @param aLibXULDirectory cast=(nsILocalFile *)
- * @param aAppDirectory cast=(nsILocalFile *)
- * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
- * @param aStaticComponents cast=(nsStaticModuleInfo const *)
- */
-public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount);
-public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount) {
-	lock.lock();
-	try {
-		return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param ptr cast=(SWT_XREInitEmbedding2)
- * @param aLibXULDirectory cast=(nsIFile *)
- * @param aAppDirectory cast=(nsIFile *)
- * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
- */
-public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider);
-public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider) {
-	lock.lock();
-	try {
-		return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, short[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, short[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, short[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, short[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, short arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, short arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, short arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, short arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, short arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, short arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0, float arg1, int[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0, float arg1, int[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0, float arg1, long[] arg2);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0, float arg1, long[] arg2) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2, long[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, long[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, long[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, long[] arg4);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, long[] arg4) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-	} finally {
-		lock.unlock();
-	}
-}
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14, float arg15, short arg16);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14, float arg15, short arg16) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-	} finally {
-		lock.unlock();
-	}
-}
-
-static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14, float arg15, short arg16);
-static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14, float arg15, short arg16) {
-	lock.lock();
-	try {
-		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-	} finally {
-		lock.unlock();
-	}
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java
deleted file mode 100644
index db1b8d89aa..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.internal.mozilla;
-
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.internal.*;
-
-public class XPCOMObject {
-	static boolean IsSolaris;
-	static {
-		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
-		IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
-	}
-
-	long /*int*/ ppVtable;
-
-	static private final int MAX_ARG_COUNT = 12;
-	static private final int MAX_VTABLE_LENGTH = 80;
-	static final int OS_OFFSET = IsSolaris ? 2 : 0;
-	static private Callback[][] Callbacks = new Callback[MAX_VTABLE_LENGTH + OS_OFFSET][MAX_ARG_COUNT];
-	static private Map<LONG, XPCOMObject> ObjectMap = new HashMap<> ();
-
-
-public XPCOMObject (int[] argCounts) {
-	long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length + OS_OFFSET];
-	synchronized (Callbacks) {
-		for (int i = 0, length = argCounts.length; i < length; i++) {
-			if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) {
-				Callbacks[i + OS_OFFSET][argCounts[i]] = new Callback (getClass (), "callback"+i, argCounts[i] + 1, true, XPCOM.NS_ERROR_FAILURE); //$NON-NLS-1$
-			}
-			callbackAddresses[i + OS_OFFSET] = Callbacks[i + OS_OFFSET][argCounts[i]].getAddress ();
-			if (callbackAddresses[i + OS_OFFSET] == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-		}
-	}
-
-	long /*int*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
-	XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
-	ppVtable = C.malloc (C.PTR_SIZEOF);
-	XPCOM.memmove (ppVtable, new long /*int*/[] {pVtable}, C.PTR_SIZEOF);
-	ObjectMap.put (new LONG (ppVtable), this);
-}
-
-public long /*int*/ getVtable () {
-	return ppVtable;
-}
-
-static long /*int*/ callback0 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method0 (args);
-}
-static long /*int*/ callback1 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method1 (args);
-}
-static long /*int*/ callback10 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method10 (args);
-}
-static long /*int*/ callback11 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method11 (args);
-}
-static long /*int*/ callback12 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method12 (args);
-}
-static long /*int*/ callback13 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method13 (args);
-}
-static long /*int*/ callback14 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method14 (args);
-}
-static long /*int*/ callback15 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method15 (args);
-}
-static long /*int*/ callback16 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method16 (args);
-}
-static long /*int*/ callback17 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method17 (args);
-}
-static long /*int*/ callback18 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method18 (args);
-}
-static long /*int*/ callback19 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method19 (args);
-}
-static long /*int*/ callback2 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method2 (args);
-}
-static long /*int*/ callback20 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method20 (args);
-}
-static long /*int*/ callback21 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method21 (args);
-}
-static long /*int*/ callback22 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method22 (args);
-}
-static long /*int*/ callback23 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method23 (args);
-}
-static long /*int*/ callback24 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method24 (args);
-}
-static long /*int*/ callback25 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method25 (args);
-}
-static long /*int*/ callback26 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method26 (args);
-}
-static long /*int*/ callback27 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method27 (args);
-}
-static long /*int*/ callback28 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method28 (args);
-}
-static long /*int*/ callback29 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method29 (args);
-}
-static long /*int*/ callback3 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method3 (args);
-}
-static long /*int*/ callback30 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method30 (args);
-}
-static long /*int*/ callback31 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method31 (args);
-}
-static long /*int*/ callback32 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method32 (args);
-}
-static long /*int*/ callback33 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method33 (args);
-}
-static long /*int*/ callback34 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method34 (args);
-}
-static long /*int*/ callback35 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method35 (args);
-}
-static long /*int*/ callback36 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method36 (args);
-}
-static long /*int*/ callback37 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method37 (args);
-}
-static long /*int*/ callback38 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method38 (args);
-}
-static long /*int*/ callback39 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method39 (args);
-}
-static long /*int*/ callback4 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method4 (args);
-}
-static long /*int*/ callback40 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method40 (args);
-}
-static long /*int*/ callback41 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method41 (args);
-}
-static long /*int*/ callback42 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method42 (args);
-}
-static long /*int*/ callback43 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method43 (args);
-}
-static long /*int*/ callback44 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method44 (args);
-}
-static long /*int*/ callback45 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method45 (args);
-}
-static long /*int*/ callback46 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method46 (args);
-}
-static long /*int*/ callback47 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method47 (args);
-}
-static long /*int*/ callback48 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method48 (args);
-}
-static long /*int*/ callback49 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method49 (args);
-}
-static long /*int*/ callback5 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method5 (args);
-}
-static long /*int*/ callback50 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method50 (args);
-}
-static long /*int*/ callback51 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method51 (args);
-}
-static long /*int*/ callback52 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method52 (args);
-}
-static long /*int*/ callback53 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method53 (args);
-}
-static long /*int*/ callback54 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method54 (args);
-}
-static long /*int*/ callback55 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method55 (args);
-}
-static long /*int*/ callback56 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method56 (args);
-}
-static long /*int*/ callback57 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method57 (args);
-}
-static long /*int*/ callback58 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method58 (args);
-}
-static long /*int*/ callback59 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method59 (args);
-}
-static long /*int*/ callback6 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method6 (args);
-}
-static long /*int*/ callback60 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method60 (args);
-}
-static long /*int*/ callback61 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method61 (args);
-}
-static long /*int*/ callback62 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method62 (args);
-}
-static long /*int*/ callback63 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method63 (args);
-}
-static long /*int*/ callback64 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method64 (args);
-}
-static long /*int*/ callback65 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method65 (args);
-}
-static long /*int*/ callback66 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method66 (args);
-}
-static long /*int*/ callback67 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method67 (args);
-}
-static long /*int*/ callback68 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method68 (args);
-}
-static long /*int*/ callback69 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method69 (args);
-}
-static long /*int*/ callback7 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method7 (args);
-}
-static long /*int*/ callback70 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method70 (args);
-}
-static long /*int*/ callback71 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method71 (args);
-}
-static long /*int*/ callback72 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method72 (args);
-}
-static long /*int*/ callback73 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method73 (args);
-}
-static long /*int*/ callback74 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method74 (args);
-}
-static long /*int*/ callback75 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method75 (args);
-}
-static long /*int*/ callback76 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method76 (args);
-}
-static long /*int*/ callback77 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method77 (args);
-}
-static long /*int*/ callback78 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method78 (args);
-}
-static long /*int*/ callback79 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method79 (args);
-}
-static long /*int*/ callback8 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method8 (args);
-}
-static long /*int*/ callback9 (long /*int*/[] callbackArgs) {
-	// find the object on which this call was invoked
-	long /*int*/ address = callbackArgs[0];
-	XPCOMObject object = ObjectMap.get (new LONG (address));
-	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
-	System.arraycopy (callbackArgs, 1, args, 0, args.length);
-	return object.method9 (args);
-}
-
-public void dispose() {
-	// free the memory for this reference
-	long /*int*/[] pVtable = new long /*int*/[1];
-	XPCOM.memmove (pVtable, ppVtable, C.PTR_SIZEOF);
-	C.free (pVtable[0]);
-	C.free (ppVtable);
-
-	// remove this ppVtable from the list
-	ObjectMap.remove (new LONG (ppVtable));
-
-	ppVtable = 0;
-}
-
-public long /*int*/ getAddress () {
-	return ppVtable;
-}
-
-public long /*int*/ method0 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method1 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method10 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method11 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method12 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method13 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method14 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method15 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method16 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method17 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method18 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method19 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method2 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method20 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method21 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method22 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method23 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method24 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method25 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method26 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method27 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method28 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method29 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method3 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method30 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method31 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method32 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method33 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method34 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method35 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method36 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method37 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method38 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method39 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method4 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method40 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method41 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method42 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method43 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method44 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method45 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method46 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method47 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method48 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method49 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method5 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method50 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method51 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method52 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method53 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method54 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method55 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method56 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method57 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method58 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method59 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method6 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method60 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method61 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method62 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method63 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method64 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method65 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method66 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method67 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method68 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method69 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method7 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method70 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method71 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method72 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method73 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method74 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method75 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method76 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method77 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method78 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method79 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method8 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-public long /*int*/ method9 (long /*int*/[] args) {
-	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-}
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREProperty.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREProperty.java
deleted file mode 100644
index c91599d200..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREProperty.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ***** 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) 2011, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla.init;
-
-/** @jniclass flags=cpp */
-public class GREProperty {
-	/** @field cast=(const char *) */
-	public long /*int*/ property;
-	/** @field cast=(const char *) */
-	public long /*int*/ value;
-    public static final int sizeof = XPCOMInit.GREProperty_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
deleted file mode 100644
index 32e4265079..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ***** 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.init;
-
-/** @jniclass flags=cpp */
-public class GREVersionRange {
-    /** @field cast=(const char *) */
-	public long /*int*/ lower;
-    public boolean lowerInclusive;
-    /** @field cast=(const char *) */
-	public long /*int*/ upper;
-    public boolean upperInclusive;
-    public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
deleted file mode 100644
index 306adcf3b3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ***** 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.init;
-
-import org.eclipse.swt.internal.Platform;
-
-/** @jniclass flags=cpp */
-public class XPCOMInit extends Platform {
-	public static final int PATH_MAX = 4096;
-
-public static final native int GREProperty_sizeof ();
-public static final native int GREVersionRange_sizeof ();
-
-/**
- * @param versions cast=(const GREVersionRange *)
- * @param properties cast=(const GREProperty *)
- * @param buffer cast=(char *)
- */
-public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, long /*int*/ buffer, int buflen);
-public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, long /*int*/ buffer, int buflen) {
-	lock.lock();
-	try {
-		return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param place cast=(const char *) */
-public static final native int _XPCOMGlueStartup (byte[] place);
-public static final int XPCOMGlueStartup (byte[] place) {
-	lock.lock();
-	try {
-		return _XPCOMGlueStartup(place);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native int _XPCOMGlueShutdown ();
-public static final int XPCOMGlueShutdown () {
-	lock.lock();
-	try {
-		return _XPCOMGlueShutdown();
-	} finally {
-		lock.unlock();
-	}
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
deleted file mode 100644
index 8861aebafe..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ***** 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 nsDynamicFunctionLoad {
-    /** @field cast=(const char *) */
-	public long /*int*/ functionName;
-	/** @field cast=(NSFuncPtr  *) */
-	public long /*int*/ function;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java
deleted file mode 100644
index 9495d7752e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ***** 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) 2004, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsEmbedString {
-	long /*int*/ handle;
-
-public nsEmbedString() {
-	handle = XPCOM.nsEmbedString_new();
-}
-
-public nsEmbedString(String string) {
-	if (string != null) {
-	   char[] aString = new char[string.length() + 1];
-	   string.getChars(0, string.length(), aString, 0);
-	   handle = XPCOM.nsEmbedString_new(aString);
-	}
-}
-
-public nsEmbedString(long /*int*/ handle) {
-	this.handle = handle;
-}
-
-public long /*int*/ getAddress() {
-	return handle;
-}
-
-@Override
-public String toString() {
-	if (handle == 0) return null;
-	int length = XPCOM.nsEmbedString_Length(handle);
-	long /*int*/ buffer = XPCOM.nsEmbedString_get(handle);
-	char[] dest = new char[length];
-	XPCOM.memmove(dest, buffer, length * 2);
-	return new String(dest);
-}
-
-public void dispose() {
-	if (handle == 0) return;
-	XPCOM.nsEmbedString_delete(handle);
-	handle = 0;
-}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
deleted file mode 100644
index 60c4efdb81..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIAppShell extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
-	static final String NS_IAPPSHELL_IID_STR = "a0757c31-eeac-11d1-9ec1-00aa002fb821";
-
-	static {
-		IIDStore.RegisterIID(nsIAppShell.class, MozillaVersion.VERSION_BASE, new nsID(NS_IAPPSHELL_IID_STR));
-	}
-
-	public nsIAppShell(long /*int*/ address) {
-		super(address);
-	}
-
-	public int Create(long /*int*/ argc, long /*int*/[] argv) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
-	}
-
-	public int Spinup() {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
deleted file mode 100644
index 08631abcd4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ***** 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 nsIAuthInformation extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
-	static final String NS_IAUTHINFORMATION_IID_STR = "0d73639c-2a92-4518-9f92-28f71fea5f20";
-
-	static {
-		IIDStore.RegisterIID(nsIAuthInformation.class, MozillaVersion.VERSION_BASE, new nsID(NS_IAUTHINFORMATION_IID_STR));
-	}
-
-	public nsIAuthInformation(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int AUTH_HOST = 1;
-	public static final int AUTH_PROXY = 2;
-	public static final int NEED_DOMAIN = 4;
-	public static final int ONLY_PASSWORD = 8;
-
-	public int GetRealm(long /*int*/ aRealm) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm);
-	}
-
-	public int GetUsername(long /*int*/ aUsername) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername);
-	}
-
-	public int SetUsername(long /*int*/ aUsername) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aUsername);
-	}
-
-	public int GetPassword(long /*int*/ aPassword) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPassword);
-	}
-
-	public int SetPassword(long /*int*/ aPassword) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
deleted file mode 100644
index ce11077d99..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIBaseWindow extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10() ? 22 : 24);
-
-	static final String NS_IBASEWINDOW_IID_STR ="046bc8a0-8015-11d3-af70-00a024ffc08c";
-	static final String NS_IBASEWINDOW_10_IID_STR = "7144ac8b-6702-4a4b-a73d-d1d4e9717e46";
-	static final String NS_IBASEWINDOW_24_IID_STR = "9da319f3-eee6-4504-81a5-6a19cf6215bf";
-
-	static {
-		IIDStore.RegisterIID(nsIBaseWindow.class, MozillaVersion.VERSION_BASE, new nsID(NS_IBASEWINDOW_IID_STR));
-		IIDStore.RegisterIID(nsIBaseWindow.class, MozillaVersion.VERSION_XR10, new nsID(NS_IBASEWINDOW_10_IID_STR));
-		IIDStore.RegisterIID(nsIBaseWindow.class, MozillaVersion.VERSION_XR24, new nsID(NS_IBASEWINDOW_24_IID_STR));
-	}
-
-	public nsIBaseWindow(long /*int*/ address) {
-		super(address);
-	}
-
-	public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) {
-		return XPCOM.VtblCall(this.getMethodIndex("initWindow"), getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
-	}
-
-	public int Create() {
-		return XPCOM.VtblCall(this.getMethodIndex("create"), getAddress());
-	}
-
-	public int Destroy() {
-		return XPCOM.VtblCall(this.getMethodIndex("destroy"), getAddress());
-	}
-
-	public int SetPositionAndSize(int x, int y, int cx, int cy, int fRepaint) {
-		return XPCOM.VtblCall(this.getMethodIndex("setPositionAndSize"), getAddress(), x, y, cx, cy, fRepaint);
-	}
-
-	public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) {
-		return XPCOM.VtblCall(this.getGetterIndex("parentNativeWindow"), getAddress(), aParentNativeWindow);
-	}
-
-	public int SetVisibility(int aVisibility) {
-		return XPCOM.VtblCall(this.getSetterIndex("visibility"), getAddress(), aVisibility);
-	}
-
-	public int SetFocus() {
-		return XPCOM.VtblCall(this.getMethodIndex("setFocus"), getAddress());
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java
deleted file mode 100644
index 4500585bc6..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ***** 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 nsICancelable extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
-	static final String NS_ICANCELABLE_IID_STR = "d94ac0a0-bb18-46b8-844e-84159064b0bd";
-
-	static {
-		IIDStore.RegisterIID(nsICancelable.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICANCELABLE_IID_STR));
-	}
-
-	public nsICancelable(long /*int*/ address) {
-		super(address);
-	}
-
-	public int Cancel(int aReason) {
-		return XPCOM.VtblCall(this.getMethodIndex("cancel"), getAddress(), aReason);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
deleted file mode 100644
index a097ea02b6..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsICategoryManager extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
-
-	static final String NS_ICATEGORYMANAGER_IID_STR = "3275b2cd-af6d-429a-80d7-f0c5120342ac";
-
-	static {
-		IIDStore.RegisterIID(nsICategoryManager.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICATEGORYMANAGER_IID_STR));
-	}
-
-	public nsICategoryManager(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getCategoryEntry"), getAddress(), aCategory, aEntry, _retval);
-	}
-
-	public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("addCategoryEntry"), getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
deleted file mode 100644
index 429a28472e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsICertOverrideService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
-
-	static final String NS_ICERTOVERRIDESERVICE_IID_STR = "31738d2a-77d3-4359-84c9-4be2f38fb8c5";
-
-	static {
-		IIDStore.RegisterIID(nsICertOverrideService.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICERTOVERRIDESERVICE_IID_STR));
-	}
-
-	public nsICertOverrideService(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int ERROR_UNTRUSTED = 1;
-	public static final int ERROR_MISMATCH = 2;
-	public static final int ERROR_TIME = 4;
-
-	public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) {
-		return XPCOM.VtblCall(this.getMethodIndex("rememberValidityOverride"), getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
deleted file mode 100644
index 5dae0d6dde..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ***** 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 nsICertificateDialogs extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 5 : 6);
-
-	static final String NS_ICERTIFICATEDIALOGS_IID_STR = "a03ca940-09be-11d5-ac5d-000064657374";
-	static final String NS_ICERTIFICATEDIALOGS_24_IID_STR = "da871dab-f69e-4173-ab26-99fcd47b0e85";
-
-	static {
-		IIDStore.RegisterIID(nsICertificateDialogs.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICERTIFICATEDIALOGS_IID_STR));
-		IIDStore.RegisterIID(nsICertificateDialogs.class, MozillaVersion.VERSION_XR24, new nsID(NS_ICERTIFICATEDIALOGS_24_IID_STR));
-	}
-
-	public nsICertificateDialogs(long /*int*/ address) {
-		super(address);
-	}
-
-	public int ViewCert(long /*int*/ ctx, long /*int*/ cert) {
-		return XPCOM.VtblCall(this.getMethodIndex("viewCert"), getAddress(), ctx, cert);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
deleted file mode 100644
index 2a55ba3d9b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIChannel extends nsIRequest {
-
-	static final int LAST_METHOD_ID = nsIRequest.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24)? 21 : (IsXULRunner10() ? 19 : 16));
-
-	static final String NS_ICHANNEL_IID_STR = "c63a055a-a676-4e71-bf3c-6cfa11082018";
-	static final String NS_ICHANNEL_10_IID_STR = "06f6ada3-7729-4e72-8d3f-bf8ba630ff9b";
-	static final String NS_ICHANNEL_24_IID_STR = "2a8a7237-c1e2-4de7-b669-2002af29e42d";
-
-	public nsIChannel(long /*int*/ address) {
-		super(address);
-	}
-
-	static {
-		IIDStore.RegisterIID(nsIChannel.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICHANNEL_IID_STR));
-		IIDStore.RegisterIID(nsIChannel.class, MozillaVersion.VERSION_XR10, new nsID(NS_ICHANNEL_10_IID_STR));
-		IIDStore.RegisterIID(nsIChannel.class, MozillaVersion.VERSION_XR24, new nsID(NS_ICHANNEL_24_IID_STR));
-	}
-
-	public int GetURI(long /*int*/[] aURI) {
-		return XPCOM.VtblCall(this.getGetterIndex("URI"), getAddress(), aURI);
-	}
-
-	public int SetNotificationCallbacks(long /*int*/ aNotificationCallbacks) {
-		return XPCOM.VtblCall(this.getSetterIndex("notificationCallbacks"), getAddress(), aNotificationCallbacks);
-	}
-
-	public static final int LOAD_DOCUMENT_URI = 65536;
-	public static final int LOAD_RETARGETED_DOCUMENT_URI = 131072;
-	public static final int LOAD_REPLACE = 262144;
-	public static final int LOAD_INITIAL_DOCUMENT_URI = 524288;
-	public static final int LOAD_TARGETED = 1048576;
-	public static final int LOAD_CALL_CONTENT_SNIFFERS = 2097152;
-	public static final int LOAD_CLASSIFY_URI = 4194304;
-	public static final int DISPOSITION_INLINE = 0;
-	public static final int DISPOSITION_ATTACHMENT = 1;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
deleted file mode 100644
index fd86892805..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ***** 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 nsIClassInfo extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
-	static final String NS_ICLASSINFO_IID_STR = "986c11d0-f340-11d4-9075-0010a4e73d9a";
-
-	static {
-		IIDStore.RegisterIID(nsIClassInfo.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICLASSINFO_IID_STR));
-	}
-
-	public nsIClassInfo(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int SINGLETON = 1;
-	public static final int THREADSAFE = 2;
-	public static final int MAIN_THREAD_ONLY = 4;
-	public static final int DOM_OBJECT = 8;
-	public static final int PLUGIN_OBJECT = 16;
-	public static final int EAGER_CLASSINFO = 32;
-	public static final int CONTENT_NODE = 64;
-//	public static final int RESERVED = 2147483648;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
deleted file mode 100644
index 0b9b062511..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIComponentManager extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 7 : (IsXULRunner24() ? 6 : 4));
-
-	static final String NS_ICOMPONENTMANAGER_IID_STR = "a88e5a60-205a-4bb1-94e1-2628daf51eae";
-	static final String NS_ICOMPONENTMANAGER_24_IID_STR = "1d940426-5fe5-42c3-84ae-a300f2d9ebd5";
-	static final String NS_ICOMPONENTMANAGER_31_IID_STR = "d604ffc3-1ba3-4f6c-b65f-1ed4199364c3";
-
-	static {
-		IIDStore.RegisterIID(nsIComponentManager.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICOMPONENTMANAGER_IID_STR));
-		IIDStore.RegisterIID(nsIComponentManager.class, MozillaVersion.VERSION_XR24, new nsID(NS_ICOMPONENTMANAGER_24_IID_STR));
-		IIDStore.RegisterIID(nsIComponentManager.class, MozillaVersion.VERSION_XR31, new nsID(NS_ICOMPONENTMANAGER_31_IID_STR));
-	}
-
-	public nsIComponentManager(long /*int*/ address) {
-		super(address);
-	}
-
-	public int CreateInstance(nsID aClass, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
-		return XPCOM.VtblCall(this.getMethodIndex("createInstance"), getAddress(), aClass, aDelegate, aIID, result);
-	}
-
-	public int CreateInstanceByContractID(byte[] aContractID, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
-		return XPCOM.VtblCall(this.getMethodIndex("createInstanceByContractID"), getAddress(), aContractID, aDelegate, aIID, result);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
deleted file mode 100644
index 28a674124d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsIComponentRegistrar extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 12;
-
-	static final String NS_ICOMPONENTREGISTRAR_IID_STR = "2417cbfe-65ad-48a6-b4b6-eb84db174392";
-
-	static {
-		IIDStore.RegisterIID(nsIComponentRegistrar.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICOMPONENTREGISTRAR_IID_STR));
-	}
-
-	public nsIComponentRegistrar(long /*int*/ address) {
-		super(address);
-	}
-
-	public int AutoRegister(long /*int*/ aSpec) {
-		return XPCOM.VtblCall(this.getMethodIndex("autoRegister"), getAddress(), aSpec);
-	}
-
-	public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) {
-		return XPCOM.VtblCall(this.getMethodIndex("registerFactory"), getAddress(), aClass, aClassName, aContractID, aFactory);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
deleted file mode 100644
index 0a6acb7cab..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ***** 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 nsICookie extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
-	static final String NS_ICOOKIE_IID_STR = "e9fcb9a4-d376-458f-b720-e65e7df593bc";
-	static final String NS_ICOOKIE_24_IID_STR = "8684966b-1877-4f0f-8155-be4490b96bf7";
-
-	static {
-		IIDStore.RegisterIID(nsICookie.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICOOKIE_IID_STR));
-		IIDStore.RegisterIID(nsICookie.class, MozillaVersion.VERSION_XR24, new nsID(NS_ICOOKIE_24_IID_STR));
-	}
-
-	public nsICookie(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetName(long /*int*/ aName) {
-		return XPCOM.VtblCall(this.getGetterIndex("name"), getAddress(), aName);
-	}
-
-	public int GetHost(long /*int*/ aHost) {
-		return XPCOM.VtblCall(this.getGetterIndex("host"), getAddress(), aHost);
-	}
-
-	public int GetPath(long /*int*/ aPath) {
-		return XPCOM.VtblCall(this.getGetterIndex("path"), getAddress(), aPath);
-	}
-
-	public int GetExpires(long[] aExpires) {
-		return XPCOM.VtblCall(this.getGetterIndex("expires"), getAddress(), aExpires);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
deleted file mode 100644
index 7d74fa5bc3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsICookieManager extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
-	static final String NS_ICOOKIEMANAGER_IID_STR = "aaab6710-0f2c-11d5-a53b-0010a401eb10";
-
-	static {
-		IIDStore.RegisterIID(nsICookieManager.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICOOKIEMANAGER_IID_STR));
-	}
-
-	public nsICookieManager(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetEnumerator(long /*int*/[] aEnumerator) {
-		return XPCOM.VtblCall(this.getGetterIndex("enumerator"), getAddress(), aEnumerator);
-	}
-
-	public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) {
-		return XPCOM.VtblCall(this.getMethodIndex("remove"), getAddress(), aDomain, aName, aPath, aBlocked);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java
deleted file mode 100644
index bf0c728f0e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ***** 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 nsICookieService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
-	static final String NS_ICOOKIESERVICE_IID_STR = "011c3190-1434-11d6-a618-0010a401eb10";
-	static final String NS_ICOOKIESERVICE_1_9_IID_STR = "2aaa897a-293c-4d2b-a657-8c9b7136996d";
-
-	public nsICookieService(long /*int*/ address) {
-		super(address);
-	}
-
-	static {
-		IIDStore.RegisterIID(nsICookieService.class, MozillaVersion.VERSION_BASE, new nsID(NS_ICOOKIESERVICE_IID_STR));
-		IIDStore.RegisterIID(nsICookieService.class, MozillaVersion.VERSION_XR1_9, new nsID(NS_ICOOKIESERVICE_1_9_IID_STR));
-	}
-
-	public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getCookieString"), getAddress(), aURI, aChannel, _retval);
-	}
-
-	public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
-		return XPCOM.VtblCall(this.getMethodIndex("setCookieString"), getAddress(), aURI, aPrompt, aCookie, aChannel);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
deleted file mode 100644
index 03fec4651b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ***** 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;
-
-/** @jniclass flags=cpp */
-public class nsID {
-
-	public int m0;
-	public short m1;
-	public short m2;
-	public byte[] m3 = new byte[8];
-	public static final int sizeof = 16;
-
-	static final String zeros = "00000000"; //$NON-NLS-1$
-
-public nsID() {
-}
-
-public nsID(String id) {
-	Parse(id);
-}
-
-public boolean Equals(nsID other) {
-	long /*int*/ ptr = XPCOM.nsID_new ();
-	XPCOM.memmove (ptr, this, nsID.sizeof);
-	long /*int*/ otherPtr = XPCOM.nsID_new ();
-	XPCOM.memmove (otherPtr, other, nsID.sizeof);
-	boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
-	XPCOM.nsID_delete (ptr);
-	XPCOM.nsID_delete (otherPtr);
-	return result;
-}
-
-public void Parse(String aIDStr) {
-	if(aIDStr == null) throw new Error ();
-	int i = 0;
-	for (; i < 8; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m0 = (m0 << 4) + digit;
-	}
-	if (aIDStr.charAt (i++) != '-') throw new Error ();
-	for (; i < 13; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m1 = (short)((m1 << 4) + digit);
-	}
-	if (aIDStr.charAt (i++) != '-') throw new Error ();
-	for (; i < 18; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m2 = (short)((m2 << 4) + digit);
-	}
-	if (aIDStr.charAt (i++) != '-') throw new Error ();
-	for (; i < 21; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m3[0] = (byte)((m3[0] << 4) + digit);
-	}
-	for (; i < 23; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m3[1] = (byte)((m3[1] << 4) + digit);
-	}
-	if (aIDStr.charAt (i++) != '-') throw new Error ();
-	for (; i < 26; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m3[2] = (byte)((m3[2] << 4) + digit);
-	}
-	for (; i < 28; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m3[3] = (byte)((m3[3] << 4) + digit);
-	}
-	for (; i < 30; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m3[4] = (byte)((m3[4] << 4) + digit);
-	}
-	for (; i < 32; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m3[5] = (byte)((m3[5] << 4) + digit);
-	}
-	for (; i < 34; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m3[6] = (byte)((m3[6] << 4) + digit);
-	}
-	for (; i < 36; i++) {
-		int digit = Character.digit (aIDStr.charAt (i), 16);
-		if (digit == -1) throw new Error ();
-		m3[7] = (byte)((m3[7] << 4) + digit);
-	}
-}
-
-static String toHex (int v, int length) {
-	String t = Integer.toHexString (v).toUpperCase ();
-	int tlen = t.length ();
-	if (tlen > length) {
-		t = t.substring (tlen - length);
-	}
-	return zeros.substring (0, Math.max (0, length - tlen)) + t;
-}
-
-@Override
-public String toString () {
-	return '{' + toHex (m0, 8) + '-' +
-    	toHex (m1, 4) + '-' +
-    	toHex (m2, 4) + '-' +
-    	toHex (m3[0], 2) + toHex (m3[1], 2) + '-' +
-    	toHex (m3[2], 2) + toHex (m3[3], 2) + toHex (m3[4], 2) + toHex (m3[5], 2) + toHex (m3[6], 2) + toHex (m3[7], 2) + '}';
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
deleted file mode 100644
index a5627deae6..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ***** 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) 2011, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDOMDocument extends nsIDOMNode {
-
-	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner31 () ? 64 : (IsXULRunner24() ? 68 : (IsXULRunner10() ? 61 : 17)));
-
-	static final String NS_IDOMDOCUMENT_IID_STR = "a6cf9075-15b3-11d2-932e-00805f8add32";
-	static final String NS_IDOMDOCUMENT_10_IID_STR = "5c3bff4d-ae7f-4c93-948c-519589672c30";
-	static final String NS_IDOMDOCUMENT_24_IID_STR = "75996de6-6b0f-43e5-ae79-c98fa669da9a";
-	static final String NS_IDOMDOCUMENT_31_IID_STR = "d24d1118-a527-4d5a-9c4e-fb07dfc2fc27";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMDocument.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMDOCUMENT_IID_STR));
-		IIDStore.RegisterIID(nsIDOMDocument.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOMDOCUMENT_10_IID_STR));
-		IIDStore.RegisterIID(nsIDOMDocument.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOMDOCUMENT_24_IID_STR));
-		IIDStore.RegisterIID(nsIDOMDocument.class, MozillaVersion.VERSION_XR31, new nsID(NS_IDOMDOCUMENT_31_IID_STR));
-	}
-
-	public nsIDOMDocument(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetDocumentElement(long /*int*/[] aDocumentElement) {
-		return XPCOM.VtblCall(this.getGetterIndex("documentElement"), getAddress(), aDocumentElement);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
deleted file mode 100644
index e0ef1262b5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDOMEvent extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 25 : (IsXULRunner10() ? 12 : 10));
-
-	static final String NS_IDOMEVENT_IID_STR = "a66b7b80-ff46-bd97-0080-5f8ae38add32";
-	static final String NS_IDOMEVENT_10_IID_STR = "e85cff74-951f-45c1-be0c-89442ea2f500";
-	static final String NS_IDOMEVENT_24_IID_STR = "02d54f52-a1f5-4ad2-b560-36f14012935e";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMEvent.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMEVENT_IID_STR));
-		IIDStore.RegisterIID(nsIDOMEvent.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOMEVENT_10_IID_STR));
-		IIDStore.RegisterIID(nsIDOMEvent.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOMEVENT_24_IID_STR));
-	}
-
-	public nsIDOMEvent(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int CAPTURING_PHASE = 1;
-	public static final int AT_TARGET = 2;
-	public static final int BUBBLING_PHASE = 3;
-
-	public int GetType(long /*int*/ aType) {
-		return XPCOM.VtblCall(this.getGetterIndex("type"), getAddress(), aType);
-	}
-
-	public int GetCurrentTarget(long /*int*/[] aCurrentTarget) {
-		return XPCOM.VtblCall(this.getGetterIndex("currentTarget"), getAddress(), aCurrentTarget);
-	}
-
-	public int PreventDefault() {
-		return XPCOM.VtblCall(this.getMethodIndex("preventDefault"), getAddress());
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
deleted file mode 100644
index f6a8afbb7e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDOMEventTarget extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 5 : 3);
-
-	static final String NS_IDOMEVENTTARGET_IID_STR = "1c773b30-d1cf-11d2-bd95-00805f8ae3f4";
-	static final String NS_IDOMEVENTTARGET_10_IID_STR = "1797d5a4-b12a-428d-9eef-a0e13839728c";
-	static final String NS_IDOMEVENTTARGET_24_IID_STR = "31e92e56-4d23-4a4a-9cfe-a6d12cf434bc";
-	static final String NS_IDOMEVENTTARGET_31_IID_STR = "b128448c-7b53-4769-92cb-cd6eafee676c";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMEventTarget.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMEVENTTARGET_IID_STR));
-		IIDStore.RegisterIID(nsIDOMEventTarget.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOMEVENTTARGET_10_IID_STR));
-		IIDStore.RegisterIID(nsIDOMEventTarget.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOMEVENTTARGET_24_IID_STR));
-		IIDStore.RegisterIID(nsIDOMEventTarget.class, MozillaVersion.VERSION_XR31, new nsID(NS_IDOMEVENTTARGET_31_IID_STR));
-	}
-
-	public nsIDOMEventTarget(long /*int*/ address) {
-		super(address);
-	}
-
-	public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
-		if (IsXULRVersionOrLater(MozillaVersion.VERSION_XR10)) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(this.getMethodIndex("addEventListener"), getAddress(), type, listener, useCapture);
-	}
-
-	public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture, int wantsUntrusted, int _argc) {
-		if (!IsXULRVersionOrLater(MozillaVersion.VERSION_XR10)) return AddEventListener(type, listener, useCapture);
-		return XPCOM.VtblCall(this.getMethodIndex("addEventListener"), getAddress(), type, listener, useCapture, wantsUntrusted, _argc);
-	}
-
-	public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
-		return XPCOM.VtblCall(this.getMethodIndex("removeEventListener"), getAddress(), type, listener, useCapture);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
deleted file mode 100644
index 77ed03732f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDOMKeyEvent extends nsIDOMUIEvent {
-
-	static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 10 : 7);
-
-	static final String NS_IDOMKEYEVENT_IID_STR = "028e0e6e-8b01-11d3-aae7-0010838a3123";
-	static final String NS_IDOMKEYEVENT_10_IID_STR = "def974c3-b491-481b-bc67-29174af4b26a";
-	static final String NS_IDOMKEYEVENT_24_IID_STR = "91a3d7f2-223b-4e09-a566-634e7ee0a31d";
-	static final String NS_IDOMKEYEVENT_31_IID_STR = "d2b3e35f-8627-4732-a92d-cda54c8f8054";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMKeyEvent.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMKEYEVENT_IID_STR));
-		IIDStore.RegisterIID(nsIDOMKeyEvent.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOMKEYEVENT_10_IID_STR));
-		IIDStore.RegisterIID(nsIDOMKeyEvent.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOMKEYEVENT_24_IID_STR));
-		IIDStore.RegisterIID(nsIDOMKeyEvent.class, MozillaVersion.VERSION_XR31, new nsID(NS_IDOMKEYEVENT_31_IID_STR));
-	}
-
-	public nsIDOMKeyEvent(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int DOM_VK_CANCEL = 3;
-	public static final int DOM_VK_HELP = 6;
-	public static final int DOM_VK_BACK_SPACE = 8;
-	public static final int DOM_VK_TAB = 9;
-	public static final int DOM_VK_CLEAR = 12;
-	public static final int DOM_VK_RETURN = 13;
-	public static final int DOM_VK_ENTER = 14;
-	public static final int DOM_VK_SHIFT = 16;
-	public static final int DOM_VK_CONTROL = 17;
-	public static final int DOM_VK_ALT = 18;
-	public static final int DOM_VK_PAUSE = 19;
-	public static final int DOM_VK_CAPS_LOCK = 20;
-	public static final int DOM_VK_ESCAPE = 27;
-	public static final int DOM_VK_SPACE = 32;
-	public static final int DOM_VK_PAGE_UP = 33;
-	public static final int DOM_VK_PAGE_DOWN = 34;
-	public static final int DOM_VK_END = 35;
-	public static final int DOM_VK_HOME = 36;
-	public static final int DOM_VK_LEFT = 37;
-	public static final int DOM_VK_UP = 38;
-	public static final int DOM_VK_RIGHT = 39;
-	public static final int DOM_VK_DOWN = 40;
-	public static final int DOM_VK_PRINTSCREEN = 44;
-	public static final int DOM_VK_INSERT = 45;
-	public static final int DOM_VK_DELETE = 46;
-	public static final int DOM_VK_0 = 48;
-	public static final int DOM_VK_1 = 49;
-	public static final int DOM_VK_2 = 50;
-	public static final int DOM_VK_3 = 51;
-	public static final int DOM_VK_4 = 52;
-	public static final int DOM_VK_5 = 53;
-	public static final int DOM_VK_6 = 54;
-	public static final int DOM_VK_7 = 55;
-	public static final int DOM_VK_8 = 56;
-	public static final int DOM_VK_9 = 57;
-	public static final int DOM_VK_SEMICOLON = 59;
-	public static final int DOM_VK_EQUALS = 61;
-	public static final int DOM_VK_A = 65;
-	public static final int DOM_VK_B = 66;
-	public static final int DOM_VK_C = 67;
-	public static final int DOM_VK_D = 68;
-	public static final int DOM_VK_E = 69;
-	public static final int DOM_VK_F = 70;
-	public static final int DOM_VK_G = 71;
-	public static final int DOM_VK_H = 72;
-	public static final int DOM_VK_I = 73;
-	public static final int DOM_VK_J = 74;
-	public static final int DOM_VK_K = 75;
-	public static final int DOM_VK_L = 76;
-	public static final int DOM_VK_M = 77;
-	public static final int DOM_VK_N = 78;
-	public static final int DOM_VK_O = 79;
-	public static final int DOM_VK_P = 80;
-	public static final int DOM_VK_Q = 81;
-	public static final int DOM_VK_R = 82;
-	public static final int DOM_VK_S = 83;
-	public static final int DOM_VK_T = 84;
-	public static final int DOM_VK_U = 85;
-	public static final int DOM_VK_V = 86;
-	public static final int DOM_VK_W = 87;
-	public static final int DOM_VK_X = 88;
-	public static final int DOM_VK_Y = 89;
-	public static final int DOM_VK_Z = 90;
-	public static final int DOM_VK_NUMPAD0 = 96;
-	public static final int DOM_VK_NUMPAD1 = 97;
-	public static final int DOM_VK_NUMPAD2 = 98;
-	public static final int DOM_VK_NUMPAD3 = 99;
-	public static final int DOM_VK_NUMPAD4 = 100;
-	public static final int DOM_VK_NUMPAD5 = 101;
-	public static final int DOM_VK_NUMPAD6 = 102;
-	public static final int DOM_VK_NUMPAD7 = 103;
-	public static final int DOM_VK_NUMPAD8 = 104;
-	public static final int DOM_VK_NUMPAD9 = 105;
-	public static final int DOM_VK_MULTIPLY = 106;
-	public static final int DOM_VK_ADD = 107;
-	public static final int DOM_VK_SEPARATOR = 108;
-	public static final int DOM_VK_SUBTRACT = 109;
-	public static final int DOM_VK_DECIMAL = 110;
-	public static final int DOM_VK_DIVIDE = 111;
-	public static final int DOM_VK_F1 = 112;
-	public static final int DOM_VK_F2 = 113;
-	public static final int DOM_VK_F3 = 114;
-	public static final int DOM_VK_F4 = 115;
-	public static final int DOM_VK_F5 = 116;
-	public static final int DOM_VK_F6 = 117;
-	public static final int DOM_VK_F7 = 118;
-	public static final int DOM_VK_F8 = 119;
-	public static final int DOM_VK_F9 = 120;
-	public static final int DOM_VK_F10 = 121;
-	public static final int DOM_VK_F11 = 122;
-	public static final int DOM_VK_F12 = 123;
-	public static final int DOM_VK_F13 = 124;
-	public static final int DOM_VK_F14 = 125;
-	public static final int DOM_VK_F15 = 126;
-	public static final int DOM_VK_F16 = 127;
-	public static final int DOM_VK_F17 = 128;
-	public static final int DOM_VK_F18 = 129;
-	public static final int DOM_VK_F19 = 130;
-	public static final int DOM_VK_F20 = 131;
-	public static final int DOM_VK_F21 = 132;
-	public static final int DOM_VK_F22 = 133;
-	public static final int DOM_VK_F23 = 134;
-	public static final int DOM_VK_F24 = 135;
-	public static final int DOM_VK_NUM_LOCK = 144;
-	public static final int DOM_VK_SCROLL_LOCK = 145;
-	public static final int DOM_VK_COMMA = 188;
-	public static final int DOM_VK_PERIOD = 190;
-	public static final int DOM_VK_SLASH = 191;
-	public static final int DOM_VK_BACK_QUOTE = 192;
-	public static final int DOM_VK_OPEN_BRACKET = 219;
-	public static final int DOM_VK_BACK_SLASH = 220;
-	public static final int DOM_VK_CLOSE_BRACKET = 221;
-	public static final int DOM_VK_QUOTE = 222;
-	public static final int DOM_VK_META = 224;
-
-	/* the following constants are defined in Mozilla 10 */
-	public static final int DOM_VK_KANA = 21;
-	public static final int DOM_VK_HANGUL = 21;
-	public static final int DOM_VK_JUNJA = 23;
-	public static final int DOM_VK_FINAL = 24;
-	public static final int DOM_VK_HANJA = 25;
-	public static final int DOM_VK_KANJI = 25;
-	public static final int DOM_VK_CONVERT = 28;
-	public static final int DOM_VK_NONCONVERT = 29;
-	public static final int DOM_VK_ACCEPT = 30;
-	public static final int DOM_VK_MODECHANGE = 31;
-	public static final int DOM_VK_SELECT = 41;
-	public static final int DOM_VK_PRINT = 42;
-	public static final int DOM_VK_EXECUTE = 43;
-	public static final int DOM_VK_CONTEXT_MENU = 93;
-	public static final int DOM_VK_SLEEP = 95;
-
-	public int GetCharCode(int[] aCharCode) {
-		return XPCOM.VtblCall(this.getGetterIndex("charCode"), getAddress(), aCharCode);
-	}
-
-	public int GetKeyCode(int[] aKeyCode) {
-		return XPCOM.VtblCall(this.getGetterIndex("keyCode"), getAddress(), aKeyCode);
-	}
-
-	public int GetAltKey(int[] aAltKey) {
-		return XPCOM.VtblCall(this.getGetterIndex("altKey"), getAddress(), aAltKey);
-	}
-
-	public int GetCtrlKey(int[] aCtrlKey) {
-		return XPCOM.VtblCall(this.getGetterIndex("ctrlKey"), getAddress(), aCtrlKey);
-	}
-
-	public int GetShiftKey(int[] aShiftKey) {
-		return XPCOM.VtblCall(this.getGetterIndex("shiftKey"), getAddress(), aShiftKey);
-	}
-
-	public int GetMetaKey(int[] aMetaKey) {
-		return XPCOM.VtblCall(this.getGetterIndex("metaKey"), getAddress(), aMetaKey);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
deleted file mode 100644
index dd40610fcb..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDOMMouseEvent extends nsIDOMUIEvent {
-
-	static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 18 : (IsXULRunner10() ? 14 : 11));
-
-	static final String NS_IDOMMOUSEEVENT_IID_STR = "ff751edc-8b02-aae7-0010-8301838a3123";
-	static final String NS_IDOMMOUSEEVENT_10_IID_STR = "7f57aa45-6792-4d8b-ba5b-201533cf0b2f";
-	static final String NS_IDOMMOUSEEVENT_24_IID_STR = "afb2e57b-2822-4969-b2a9-0cada6859534";
-	static final String NS_IDOMMOUSEEVENT_31_IID_STR = "df068636-9a5b-11e3-b71f-2c27d728e7f9";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMMouseEvent.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMMOUSEEVENT_IID_STR));
-		IIDStore.RegisterIID(nsIDOMMouseEvent.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOMMOUSEEVENT_10_IID_STR));
-		IIDStore.RegisterIID(nsIDOMMouseEvent.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOMMOUSEEVENT_24_IID_STR));
-		IIDStore.RegisterIID(nsIDOMMouseEvent.class, MozillaVersion.VERSION_XR31, new nsID(NS_IDOMMOUSEEVENT_31_IID_STR));
-	}
-
-	public nsIDOMMouseEvent(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetScreenX(int[] aScreenX) {
-		return XPCOM.VtblCall(this.getGetterIndex("screenX"), getAddress(), aScreenX);
-	}
-
-	public int GetScreenY(int[] aScreenY) {
-		return XPCOM.VtblCall(this.getGetterIndex("screenY"), getAddress(), aScreenY);
-	}
-
-	public int GetCtrlKey(int[] aCtrlKey) {
-		return XPCOM.VtblCall(this.getGetterIndex("ctrlKey"), getAddress(), aCtrlKey);
-	}
-
-	public int GetShiftKey(int[] aShiftKey) {
-		return XPCOM.VtblCall(this.getGetterIndex("shiftKey"), getAddress(), aShiftKey);
-	}
-
-	public int GetAltKey(int[] aAltKey) {
-		return XPCOM.VtblCall(this.getGetterIndex("altKey"), getAddress(), aAltKey);
-	}
-
-	public int GetMetaKey(int[] aMetaKey) {
-		return XPCOM.VtblCall(this.getGetterIndex("metaKey"), getAddress(), aMetaKey);
-	}
-
-	public int GetButton(short[] aButton) {
-		return XPCOM.VtblCall(this.getGetterIndex("button"), getAddress(), aButton);
-	}
-
-	public int GetRelatedTarget(long /*int*/[] aRelatedTarget) {
-		return XPCOM.VtblCall(this.getGetterIndex("relatedTarget"), getAddress(), aRelatedTarget);
-	}
-
-	/* the following constants are defined in Mozilla 10 */
-	public static final int MOZ_SOURCE_UNKNOWN = 0;
-	public static final int MOZ_SOURCE_MOUSE = 1;
-	public static final int MOZ_SOURCE_PEN = 2;
-	public static final int MOZ_SOURCE_ERASER = 3;
-	public static final int MOZ_SOURCE_CURSOR = 4;
-	public static final int MOZ_SOURCE_TOUCH = 5;
-	public static final int MOZ_SOURCE_KEYBOARD = 6;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java
deleted file mode 100644
index 71ab302410..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ***** 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) 2011, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDOMNode extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 34 : (IsXULRunner10() ? 36 : 25));
-
-	static final String NS_IDOMNODE_IID_STR = "a6cf907c-15b3-11d2-932e-00805f8add32";
-	static final String NS_IDOMNODE_10_IID_STR = "ce82fb71-60f2-4c38-be31-de5f2f90dada";
-	static final String NS_IDOMNODE_24_IID_STR = "56545150-a001-484e-9ed4-cb319eebd7b3";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMNode.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMNODE_IID_STR));
-		IIDStore.RegisterIID(nsIDOMNode.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOMNODE_10_IID_STR));
-		IIDStore.RegisterIID(nsIDOMNode.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOMNODE_24_IID_STR));
-	}
-
-	public nsIDOMNode(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int ELEMENT_NODE = 1;
-	public static final int ATTRIBUTE_NODE = 2;
-	public static final int TEXT_NODE = 3;
-	public static final int CDATA_SECTION_NODE = 4;
-	public static final int ENTITY_REFERENCE_NODE = 5;
-	public static final int ENTITY_NODE = 6;
-	public static final int PROCESSING_INSTRUCTION_NODE = 7;
-	public static final int COMMENT_NODE = 8;
-	public static final int DOCUMENT_NODE = 9;
-	public static final int DOCUMENT_TYPE_NODE = 10;
-	public static final int DOCUMENT_FRAGMENT_NODE = 11;
-	public static final int NOTATION_NODE = 12;
-
-	/* the following constants are available as of Mozilla 10 */
-	public static final int DOCUMENT_POSITION_DISCONNECTED = 1;
-	public static final int DOCUMENT_POSITION_PRECEDING = 2;
-	public static final int DOCUMENT_POSITION_FOLLOWING = 4;
-	public static final int DOCUMENT_POSITION_CONTAINS = 8;
-	public static final int DOCUMENT_POSITION_CONTAINED_BY = 16;
-	public static final int DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
deleted file mode 100644
index e050dc6232..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ***** 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 nsIDOMSerializer extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
-	static final String NS_IDOMSERIALIZER_IID_STR = "a6cf9123-15b3-11d2-932e-00805f8add32";
-	static final String NS_IDOMSERIALIZER_1_8_IID_STR = "9fd4ba15-e67c-4c98-b52c-7715f62c9196";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMSerializer.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMSERIALIZER_IID_STR));
-		IIDStore.RegisterIID(nsIDOMSerializer.class, MozillaVersion.VERSION_XR1_8, new nsID(NS_IDOMSERIALIZER_1_8_IID_STR));
-	}
-
-	public nsIDOMSerializer(long /*int*/ address) {
-		super(address);
-	}
-
-	public int SerializeToString(long /*int*/ root, long /*int*/[] _retval) {
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_8)) { /* >= 1.8.x */
-			return XPCOM.NS_COMFALSE;
-		}
-		return XPCOM.VtblCall(this.getMethodIndex("serializeToString"), getAddress(), root, _retval);
-	}
-
-	public int SerializeToString(long /*int*/ root, long /*int*/ _retval) {
-		if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR1_8)) { /* 1.4.x */
-			return XPCOM.NS_COMFALSE;
-		}
-		return XPCOM.VtblCall(this.getMethodIndex("serializeToString"), getAddress(), root, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
deleted file mode 100644
index c2732b5267..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDOMUIEvent extends nsIDOMEvent {
-
-	static final int LAST_METHOD_ID = nsIDOMEvent.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR10) ? 13 : 3);
-
-	static final String NS_IDOMUIEVENT_IID_STR = "a6cf90c3-15b3-11d2-932e-00805f8add32";
-	static final String NS_IDOMUIEVENT_10_IID_STR = "af3f130e-0c22-4613-a150-780a46c22e3a";
-	static final String NS_IDOMUIEVENT_24_IID_STR = "d73852f8-7bd6-477d-8233-117dbf83860b";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMUIEvent.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMUIEVENT_IID_STR));
-		IIDStore.RegisterIID(nsIDOMUIEvent.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOMUIEVENT_10_IID_STR));
-		IIDStore.RegisterIID(nsIDOMUIEvent.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOMUIEVENT_24_IID_STR));
-	}
-
-	public nsIDOMUIEvent(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetDetail(int[] aDetail) {
-		return XPCOM.VtblCall(this.getGetterIndex("detail"), getAddress(), aDetail);
-	}
-
-	/* the following constants are defined in Mozilla 10 */
-	public static final int SCROLL_PAGE_UP = -32768;
-	public static final int SCROLL_PAGE_DOWN = 32768;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
deleted file mode 100644
index 6fe672e473..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDOMWindow extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 144 : (IsXULRunner24() ? 140 : (IsXULRunner10() ? 129 : 17)));
-
-	static final String NS_IDOMWINDOW_IID_STR = "a6cf906b-15b3-11d2-932e-00805f8add32";
-	static final String NS_IDOMWINDOW_10_IID_STR = "8f577294-d572-4473-94b1-d2c5a74a2a74";
-	static final String NS_IDOMWINDOW_24_IID_STR = "be62660a-e3f6-409c-a4a9-378364a9526f";
-	static final String NS_IDOMWINDOW_31_IID_STR = "1b4a23a2-2ccf-4690-9da7-f3a7a8308381";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMWindow.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMWINDOW_IID_STR));
-		IIDStore.RegisterIID(nsIDOMWindow.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOMWINDOW_10_IID_STR));
-		IIDStore.RegisterIID(nsIDOMWindow.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOMWINDOW_24_IID_STR));
-		IIDStore.RegisterIID(nsIDOMWindow.class, MozillaVersion.VERSION_XR31, new nsID(NS_IDOMWINDOW_31_IID_STR));
-	}
-
-	public nsIDOMWindow(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetDocument(long /*int*/[] aDocument) {
-		return XPCOM.VtblCall(this.getGetterIndex("document"), getAddress(), aDocument);
-	}
-
-	public int GetTop(long /*int*/[] aTop) {
-		if (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24)) return GetRealTop(aTop);
-		return XPCOM.VtblCall(this.getGetterIndex("top"), getAddress(), aTop);
-	}
-
-	public int GetRealTop(long /*int*/[] aTop) {
-		if (!IsXULRVersionOrLater(MozillaVersion.VERSION_XR24)) return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-		return XPCOM.VtblCall(this.getGetterIndex("realTop"), getAddress(), aTop);
-	}
-
-	public int GetFrames(long /*int*/[] aFrames) {
-		return XPCOM.VtblCall(this.getGetterIndex("frames"), getAddress(), aFrames);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
deleted file mode 100644
index 9f475ddfb8..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsIDOMWindowCollection extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
-	static final String NS_IDOMWINDOWCOLLECTION_IID_STR = "a6cf906f-15b3-11d2-932e-00805f8add32";
-
-	static {
-		IIDStore.RegisterIID(nsIDOMWindowCollection.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR));
-	}
-
-	public nsIDOMWindowCollection(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetLength(int[] aLength) {
-		return XPCOM.VtblCall(this.getGetterIndex("length"), getAddress(), aLength);
-	}
-
-	public int Item(int index, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("item"), getAddress(), index, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java
deleted file mode 100644
index 914721345b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ***** 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 nsIDataType extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 0;
-
-	static final String NS_IDATATYPE_IID_STR = "4d12e540-83d7-11d5-90ed-0010a4e73d9a";
-
-	static {
-		IIDStore.RegisterIID(nsIDataType.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDATATYPE_IID_STR));
-	}
-
-	public nsIDataType(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final short VTYPE_INT8 = 0;
-	public static final short VTYPE_INT16 = 1;
-	public static final short VTYPE_INT32 = 2;
-	public static final short VTYPE_INT64 = 3;
-	public static final short VTYPE_UINT8 = 4;
-	public static final short VTYPE_UINT16 = 5;
-	public static final short VTYPE_UINT32 = 6;
-	public static final short VTYPE_UINT64 = 7;
-	public static final short VTYPE_FLOAT = 8;
-	public static final short VTYPE_DOUBLE = 9;
-	public static final short VTYPE_BOOL = 10;
-	public static final short VTYPE_CHAR = 11;
-	public static final short VTYPE_WCHAR = 12;
-	public static final short VTYPE_VOID = 13;
-	public static final short VTYPE_ID = 14;
-	public static final short VTYPE_DOMSTRING = 15;
-	public static final short VTYPE_CHAR_STR = 16;
-	public static final short VTYPE_WCHAR_STR = 17;
-	public static final short VTYPE_INTERFACE = 18;
-	public static final short VTYPE_INTERFACE_IS = 19;
-	public static final short VTYPE_ARRAY = 20;
-	public static final short VTYPE_STRING_SIZE_IS = 21;
-	public static final short VTYPE_WSTRING_SIZE_IS = 22;
-	public static final short VTYPE_UTF8STRING = 23;
-	public static final short VTYPE_CSTRING = 24;
-	public static final short VTYPE_ASTRING = 25;
-	public static final short VTYPE_EMPTY_ARRAY = 254;
-	public static final short VTYPE_EMPTY = 255;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
deleted file mode 100644
index 45242e9f37..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIDocShell extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 146 : 51);
-
-	static final String NS_IDOCSHELL_IID_STR = "69e5de00-7b8b-11d3-af61-00a024ffc08c";
-	static final String NS_IDOCSHELL_1_8_IID_STR = "9f0c7461-b9a4-47f6-b88c-421dce1bce66";
-	static final String NS_IDOCSHELL_1_9_IID_STR = "7d1cf6b9-daa3-476d-8f9f-9eb2a971a95c";
-	static final String NS_IDOCSHELL_1_9_1_IID_STR = "dc4daea1-b43d-406f-bd62-c2ee879192ad";
-	static final String NS_IDOCSHELL_1_9_2_IID_STR = "8adfb831-1053-4a19-884d-bcdad7277b4b";
-	static final String NS_IDOCSHELL_10_IID_STR = "0666adf8-8738-4ca7-a917-0348f47d2f40";
-	static final String NS_IDOCSHELL_24_IID_STR = "f453d2ee-bac7-46f9-a553-df918f0cc0d0";
-	static final String NS_IDOCSHELL_31_IID_STR = "e46d924d-c20f-4add-8cf5-1e1c817b2181";
-
-	static {
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_BASE, new nsID(NS_IDOCSHELL_IID_STR));
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_XR1_8, new nsID(NS_IDOCSHELL_1_8_IID_STR));
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_XR1_9, new nsID(NS_IDOCSHELL_1_9_IID_STR));
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_XR1_9_1, new nsID(NS_IDOCSHELL_1_9_1_IID_STR));
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_XR1_9_2, new nsID(NS_IDOCSHELL_1_9_2_IID_STR));
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_XR10, new nsID(NS_IDOCSHELL_10_IID_STR));
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_XR24, new nsID(NS_IDOCSHELL_24_IID_STR));
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_XR31, new nsID(NS_IDOCSHELL_31_IID_STR));
-	}
-
-	public nsIDocShell(long /*int*/ address) {
-		super(address);
-	}
-
-	public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
-		return XPCOM.VtblCall(this.getMethodIndex("loadStream"), getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
deleted file mode 100644
index 5442a7a234..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIEmbeddingSiteWindow extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 9 : 8);
-
-	static final String NS_IEMBEDDINGSITEWINDOW_IID_STR = "3e5432cd-9568-4bd1-8cbe-d50aba110743";
-	static final String NS_IEMBEDDINGSITEWINDOW_24_IID_STR = "0b976267-4aaa-4f36-a2d4-27b5ca8d73bb";
-
-	static {
-		IIDStore.RegisterIID(nsIEmbeddingSiteWindow.class, MozillaVersion.VERSION_BASE, new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR));
-		IIDStore.RegisterIID(nsIEmbeddingSiteWindow.class, MozillaVersion.VERSION_XR24, new nsID(NS_IEMBEDDINGSITEWINDOW_24_IID_STR));
-	}
-
-	public nsIEmbeddingSiteWindow(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int DIM_FLAGS_POSITION = 1;
-	public static final int DIM_FLAGS_SIZE_INNER = 2;
-	public static final int DIM_FLAGS_SIZE_OUTER = 4;
-
-	public int GetSiteWindow(long /*int*/[] aSiteWindow) {
-		return XPCOM.VtblCall(this.getGetterIndex("siteWindow"), getAddress(), aSiteWindow);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
deleted file mode 100644
index d80b652c50..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIFile extends nsISupports {
-
-	/*
-	 * Note: The following value is likely wrong for XULRunner 24 because nsIFile is referenced
-	 * (which initializes this value) before it has been determined whether XULRunner 24
-	 * is being used or not.  However this does not currently cause a problem because the
-	 * only reference to it is nsILocalFile.LAST_METHOD_ID, which is currently not used.
-	 */
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 62 : 45);
-
-	static final String NS_IFILE_IID_STR = "c8c0a080-0868-11d3-915f-d9d889d48e3c";
-	static final String NS_IFILE_24_IID_STR = "272a5020-64f5-485c-a8c4-44b2882ae0a2";
-	static final String NS_IFILE_31_IID_STR = "a99a6a06-f90d-4659-8fce-c2f87feb1167";
-
-	static {
-		IIDStore.RegisterIID(nsIFile.class, MozillaVersion.VERSION_BASE, new nsID(NS_IFILE_IID_STR));
-		IIDStore.RegisterIID(nsIFile.class, MozillaVersion.VERSION_XR24, new nsID(NS_IFILE_24_IID_STR));
-		IIDStore.RegisterIID(nsIFile.class, MozillaVersion.VERSION_XR31, new nsID(NS_IFILE_31_IID_STR));
-	}
-
-	public nsIFile(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int NORMAL_FILE_TYPE = 0;
-	public static final int DIRECTORY_TYPE = 1;
-
-	public int Create(int type, int permissions) {
-		/*
-		 * Finding the method index by name using getMethodIndex() fails if
-		 * mozilla profile directory is missing. Hence, use method index
-		 * directly to support nsIFile.Create operation in the absence of
-		 * profile directory.
-		 */
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
-	}
-
-	public int GetLeafName(long /*int*/ aLeafName) {
-		return XPCOM.VtblCall(this.getGetterIndex("leafName"), getAddress(), aLeafName);
-	}
-
-	public int GetPath(long /*int*/ aPath) {
-		return XPCOM.VtblCall(this.getGetterIndex("path"), getAddress(), aPath);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
deleted file mode 100644
index 1e09e743a2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ***** 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) 2005, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIFilePicker extends nsISupports {
-
-	static final String NS_IFILEPICKER_IID_STR = "c47de916-1dd1-11b2-8141-82507fa02b21";
-	static final String NS_IFILEPICKER_1_8_IID_STR = "80faf095-c807-4558-a2cc-185ed70754ea";
-	static final String NS_IFILEPICKER_10_IID_STR = "f2c0e216-5d07-4df4-bbcb-37683077ae7e";
-	static final String NS_IFILEPICKER_24_IID_STR = "a6a24df3-d20a-4b6a-96d4-4736b10a51b7";
-	static final String NS_IFILEPICKER_31_IID_STR = "0d79adad-b244-49a5-9997-2a8cad93fc44";
-
-	static {
-		IIDStore.RegisterIID(nsIFilePicker.class, MozillaVersion.VERSION_BASE, new nsID(NS_IFILEPICKER_IID_STR));
-		IIDStore.RegisterIID(nsIFilePicker.class, MozillaVersion.VERSION_XR1_8, new nsID(NS_IFILEPICKER_1_8_IID_STR));
-		IIDStore.RegisterIID(nsIFilePicker.class, MozillaVersion.VERSION_XR10, new nsID(NS_IFILEPICKER_10_IID_STR));
-		IIDStore.RegisterIID(nsIFilePicker.class, MozillaVersion.VERSION_XR24, new nsID(NS_IFILEPICKER_24_IID_STR));
-		IIDStore.RegisterIID(nsIFilePicker.class, MozillaVersion.VERSION_XR31, new nsID(NS_IFILEPICKER_31_IID_STR));
-	}
-
-	public nsIFilePicker(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int modeOpen = 0;
-	public static final int modeSave = 1;
-	public static final int modeGetFolder = 2;
-	public static final int modeOpenMultiple = 3;
-	public static final int returnOK = 0;
-	public static final int returnCancel = 1;
-	public static final int returnReplace = 2;
-	public static final int filterAll = 1;
-	public static final int filterHTML = 2;
-	public static final int filterText = 4;
-	public static final int filterImages = 8;
-	public static final int filterXML = 16;
-	public static final int filterXUL = 32;
-	public static final int filterApps = 64;
-
-	/* the following constants are available as of mozilla 10 */
-	public static final int filterAllowURLs = 128;
-	public static final int filterAudio = 256;
-	public static final int filterVideo = 512;
-
-	/* outgoing functions removed because this is an implemented interface */
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java
deleted file mode 100644
index f20e74bb80..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ***** 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) 2011, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIFocusManager extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR10) ? 18 : 17);
-
-	static final String NS_IFOCUSMANAGER_IID_STR = "cd6040a8-243f-412a-8a16-0bf2aa1083b9";
-	static final String NS_IFOCUSMANAGER_10_IID_STR = "51db277b-7ee7-4bce-9b84-fd2efcd2c8bd";
-
-	static {
-		IIDStore.RegisterIID(nsIFocusManager.class, MozillaVersion.VERSION_BASE, new nsID(NS_IFOCUSMANAGER_IID_STR));
-		IIDStore.RegisterIID(nsIFocusManager.class, MozillaVersion.VERSION_XR10, new nsID(NS_IFOCUSMANAGER_10_IID_STR));
-	}
-
-	public nsIFocusManager(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetFocusedElement(long /*int*/[] aFocusedElement) {
-		return XPCOM.VtblCall(this.getGetterIndex("focusedElement"), getAddress(), aFocusedElement);
-	}
-
-	public int SetFocus(long /*int*/ aElement, int aFlags) {
-		return XPCOM.VtblCall(this.getMethodIndex("setFocus"), getAddress(), aElement, aFlags);
-	}
-
-	public static final int FLAG_RAISE = 1;
-	public static final int FLAG_NOSCROLL = 2;
-	public static final int FLAG_NOSWITCHFRAME = 4;
-	public static final int FLAG_BYMOUSE = 4096;
-	public static final int FLAG_BYKEY = 8192;
-	public static final int FLAG_BYMOVEFOCUS = 16384;
-	public static final int MOVEFOCUS_FORWARD = 1;
-	public static final int MOVEFOCUS_BACKWARD = 2;
-	public static final int MOVEFOCUS_FORWARDDOC = 3;
-	public static final int MOVEFOCUS_BACKWARDDOC = 4;
-	public static final int MOVEFOCUS_FIRST = 5;
-	public static final int MOVEFOCUS_LAST = 6;
-	public static final int MOVEFOCUS_ROOT = 7;
-	public static final int MOVEFOCUS_CARET = 8;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
deleted file mode 100644
index 4c04845797..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsIHelperAppLauncher extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
-	public static final String NS_IHELPERAPPLAUNCHER_IID_STR = "9503d0fe-4c9d-11d4-98d0-001083010e9b";
-
-	static {
-		IIDStore.RegisterIID(nsIHelperAppLauncher.class, MozillaVersion.VERSION_BASE, new nsID(NS_IHELPERAPPLAUNCHER_IID_STR));
-	}
-
-	public nsIHelperAppLauncher(long /*int*/ address) {
-		super(address);
-	}
-
-	public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
-		return XPCOM.VtblCall(this.getMethodIndex("saveToDisk"), getAddress(), aNewFileLocation, aRememberThisPreference);
-	}
-
-	public int Cancel() {
-		return XPCOM.VtblCall(this.getMethodIndex("cancel"), getAddress());
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
deleted file mode 100644
index 2098779332..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ***** 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 nsIHelperAppLauncher_1_8 extends nsICancelable {
-
-	static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + (MozillaVersion.CheckVersion(MozillaVersion.VERSION_XR1_9) ? 10 : 9);
-
-	static final String NS_IHELPERAPPLAUNCHER_IID_STR = "99a0882d-2ff9-4659-9952-9ac531ba5592";
-	static final String NS_IHELPERAPPLAUNCHER_1_9_IID_STR = "cc75c21a-0a79-4f68-90e1-563253d0c555";
-	static final String NS_IHELPERAPPLAUNCHER_10_IID_STR = "d9a19faf-497b-408c-b995-777d956b72c0";
-	static final String NS_IHELPERAPPLAUNCHER_24_IID_STR = "acf2a516-7d7f-4771-8b22-6c4a559c088e";
-
-	static {
-		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_BASE, new nsID(NS_IHELPERAPPLAUNCHER_IID_STR));
-		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_XR1_9, new nsID(NS_IHELPERAPPLAUNCHER_1_9_IID_STR));
-		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_XR10, new nsID(NS_IHELPERAPPLAUNCHER_10_IID_STR));
-		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_XR24, new nsID(NS_IHELPERAPPLAUNCHER_24_IID_STR));
-	}
-
-	/*
-	 * This method is overridden in this Class because its Java Class name is different from the actual XULRunner Interface name.
-	 * This would cause getMethodIndex() to fail as getClass().getSimpleName() returns the Java Class name.
-	 */
-	@Override
-	protected String getClassName() {
-		return "nsIHelperAppLauncher";
-	}
-
-	public nsIHelperAppLauncher_1_8(long /*int*/ address) {
-		super(address);
-	}
-
-	public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
-		return XPCOM.VtblCall(this.getMethodIndex("saveToDisk"), getAddress(), aNewFileLocation, aRememberThisPreference);
-	}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java
deleted file mode 100644
index ad12f22b0a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ***** 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) 2011, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIHttpChannel extends nsIChannel {
-
-	static final int LAST_METHOD_ID = nsIChannel.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 20 : 19);
-
-	static final String NS_IHTTPCHANNEL_IID_STR = "9277fe09-f0cc-4cd9-bbce-581dd94b0260";
-	static final String NS_IHTTPCHANNEL_24_IID_STR = "a01362a0-5c45-11e2-bcfd-0800200c9a66";
-
-	static {
-		IIDStore.RegisterIID(nsIHttpChannel.class, MozillaVersion.VERSION_BASE, new nsID(NS_IHTTPCHANNEL_IID_STR));
-		IIDStore.RegisterIID(nsIHttpChannel.class, MozillaVersion.VERSION_XR24, new nsID(NS_IHTTPCHANNEL_24_IID_STR));
-	}
-
-	public nsIHttpChannel(long /*int*/ address) {
-		super(address);
-	}
-
-	public int VisitRequestHeaders(long /*int*/ aVisitor) {
-		return XPCOM.VtblCall(this.getMethodIndex("visitRequestHeaders"), getAddress(), aVisitor);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
deleted file mode 100644
index 6bff6a3464..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ***** 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 nsIIOService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
-
-	static final String NS_IIOSERVICE_IID_STR = "bddeda3f-9020-4d12-8c70-984ee9f7935e";
-
-	static {
-		IIDStore.RegisterIID(nsIIOService.class, MozillaVersion.VERSION_BASE, new nsID(NS_IIOSERVICE_IID_STR));
-	}
-
-	public nsIIOService(long /*int*/ address) {
-		super(address);
-	}
-
-	public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("newURI"), getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
deleted file mode 100644
index 50029131bf..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIInputStream extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
-	static final String NS_IINPUTSTREAM_IID_STR = "fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a";
-	static final String NS_IINPUTSTREAM_24_IID_STR = "53cdbc97-c2d7-4e30-b2c3-45b2ee79db18";
-
-	static {
-		IIDStore.RegisterIID(nsIInputStream.class, MozillaVersion.VERSION_BASE, new nsID(NS_IINPUTSTREAM_IID_STR));
-		IIDStore.RegisterIID(nsIInputStream.class, MozillaVersion.VERSION_XR24, new nsID(NS_IINPUTSTREAM_24_IID_STR));
-	}
-
-	public nsIInputStream(long /*int*/ address) {
-		super(address);
-	}
-
-	public int Available(int[] _retval) {
-		if (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24)) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(this.getMethodIndex("available"), getAddress(), _retval);
-	}
-
-	public int Available(long[] _retval) {
-		if (!IsXULRVersionOrLater(MozillaVersion.VERSION_XR24)) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(this.getMethodIndex("available"), getAddress(), _retval);
-	}
-
-	public int Read(byte[] aBuf, int aCount, int[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("read"), getAddress(), aBuf, aCount, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceInfo.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceInfo.java
deleted file mode 100644
index 7c27876034..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceInfo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ***** 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 nsIInterfaceInfo extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + ((IsXULRVersionOrLater (MozillaVersion.VERSION_XR10)) ? 21 : 20);
-
-	static final String NS_IINTERFACEINFO_IID_STR = "215dbe04-94a7-11d2-ba58-00805f8a5dd7";
-	static final String NS_IINTERFACEINFO_10_IID_STR = "1affa260-8965-4612-869a-78af4ccfb287";
-
-	static {
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_BASE, new nsID(NS_IINTERFACEINFO_IID_STR));
-		IIDStore.RegisterIID(nsIDocShell.class, MozillaVersion.VERSION_XR10, new nsID(NS_IINTERFACEINFO_10_IID_STR));
-	}
-
-	public nsIInterfaceInfo(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetMethodInfoForName(byte[] methodName, int [] index, long /*int*/[] result) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + ((IsXULRVersionOrLater (MozillaVersion.VERSION_XR10)) ? 9 : 8), getAddress(), methodName, index, result);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceInfoManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceInfoManager.java
deleted file mode 100644
index a04ed9136a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceInfoManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ***** 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 nsIInterfaceInfoManager extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
-	static final String NS_IINTERFACEINFOMANAGER_IID_STR = "8B161900-BE2B-11d2-9831-006008962422";
-	static final String NS_IINTERFACEINFOMANAGER_24_IID_STR = "1d53d8d9-1d92-428f-b5cc-198b55e897d7";
-
-	static {
-		IIDStore.RegisterIID(nsIInterfaceInfoManager.class, MozillaVersion.VERSION_BASE, new nsID(NS_IINTERFACEINFOMANAGER_IID_STR));
-		IIDStore.RegisterIID(nsIInterfaceInfoManager.class, MozillaVersion.VERSION_XR24, new nsID(NS_IINTERFACEINFOMANAGER_24_IID_STR));
-	}
-
-	public nsIInterfaceInfoManager(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetInfoForIID(nsID iid, long /*int*/[] result) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, result);
-	}
-
-	public int GetInfoForName(byte[] aName, long /*int*/[] result) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aName, result);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
deleted file mode 100644
index 41d972f064..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ***** 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 nsIInterfaceRequestor extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
-	static final String NS_IINTERFACEREQUESTOR_IID_STR = "033a1470-8b2a-11d3-af88-00a024ffc08c";
-
-	static {
-		IIDStore.RegisterIID(nsIInterfaceRequestor.class, MozillaVersion.VERSION_BASE, new nsID(NS_IINTERFACEREQUESTOR_IID_STR));
-	}
-
-	public nsIInterfaceRequestor(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetInterface(nsID uuid, long /*int*/[] result) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
deleted file mode 100644
index a013d80d88..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsIJSContextStack extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	static final String NS_IJSCONTEXTSTACK_IID_STR = "c67d8270-3189-11d3-9885-006008962422";
-
-	static {
-		IIDStore.RegisterIID(nsIJSContextStack.class, MozillaVersion.VERSION_BASE, new nsID(NS_IJSCONTEXTSTACK_IID_STR));
-	}
-
-	public nsIJSContextStack(long /*int*/ address) {
-		super(address);
-	}
-
-	public int Pop(long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("pop"), getAddress(), _retval);
-	}
-
-	public int Push(long /*int*/ cx) {
-		return XPCOM.VtblCall(this.getMethodIndex("push"), getAddress(), cx);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
deleted file mode 100644
index 9807cd623c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsILocalFile extends nsIFile {
-
-	static final int LAST_METHOD_ID = nsIFile.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 0 : 17);
-
-	static final String NS_ILOCALFILE_IID_STR = "aa610f20-a889-11d3-8c81-000064657374";
-	static final String NS_ILOCALFILE_24_IID_STR = "ce4ef184-7660-445e-9e59-6731bdc65505";
-
-	static {
-		IIDStore.RegisterIID(nsILocalFile.class, MozillaVersion.VERSION_BASE, new nsID(NS_ILOCALFILE_IID_STR));
-		IIDStore.RegisterIID(nsILocalFile.class, MozillaVersion.VERSION_XR24, new nsID(NS_ILOCALFILE_24_IID_STR));
-	}
-
-	public nsILocalFile(long /*int*/ address) {
-		super(address);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
deleted file mode 100644
index 66eae1e48b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ***** 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 nsIMIMEInputStream extends nsIInputStream {
-
-	static final int LAST_METHOD_ID = nsIInputStream.LAST_METHOD_ID + 4;
-
-	static final String NS_IMIMEINPUTSTREAM_IID_STR = "dcbce63c-1dd1-11b2-b94d-91f6d49a3161";
-
-	static {
-		IIDStore.RegisterIID(nsIMIMEInputStream.class, MozillaVersion.VERSION_BASE, new nsID(NS_IMIMEINPUTSTREAM_IID_STR));
-	}
-
-	public nsIMIMEInputStream(long /*int*/ address) {
-		super(address);
-	}
-
-	public int SetAddContentLength(int aAddContentLength) {
-		return XPCOM.VtblCall(this.getSetterIndex("addContentLength"), getAddress(), aAddContentLength);
-	}
-
-	public int AddHeader(byte[] name, byte[] value) {
-		return XPCOM.VtblCall(this.getMethodIndex("addHeader"), getAddress(), name, value);
-	}
-
-	public int SetData(long /*int*/ stream) {
-		return XPCOM.VtblCall(this.getMethodIndex("setData"), getAddress(), stream);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
deleted file mode 100644
index fc91208d0d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ***** 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 nsIMemory extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 6 : 5);
-
-	static final String NS_IMEMORY_IID_STR = "59e7e77a-38e4-11d4-8cf5-0060b0fc14a3";
-	static final String NS_IMEMORY_24_IID_STR = "6aef11c4-8615-44a6-9711-98f43805693d";
-
-	static {
-		IIDStore.RegisterIID(nsIMemory.class, MozillaVersion.VERSION_BASE, new nsID(NS_IMEMORY_IID_STR));
-		IIDStore.RegisterIID(nsIMemory.class, MozillaVersion.VERSION_XR24, new nsID(NS_IMEMORY_24_IID_STR));
-	}
-
-	public nsIMemory(long /*int*/ address) {
-		super(address);
-	}
-
-	public long /*int*/ Alloc(int size) {
-		return XPCOM.nsIMemory_Alloc(getAddress(), size);
-	}
-
-	public int Free(long /*int*/ ptr) {
-		return XPCOM.VtblCall(this.getMethodIndex("free"), getAddress(), ptr);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
deleted file mode 100644
index 616929382b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ***** 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 nsIObserverService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	static final String NS_IOBSERVERSERVICE_IID_STR = "d07f5192-e3d1-11d2-8acd-00105a1b8860";
-
-	static {
-		IIDStore.RegisterIID(nsIObserverService.class, MozillaVersion.VERSION_BASE, new nsID(NS_IOBSERVERSERVICE_IID_STR));
-	}
-
-	public nsIObserverService(long /*int*/ address) {
-		super(address);
-	}
-
-	public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) {
-		return XPCOM.VtblCall(this.getMethodIndex("notifyObservers"), getAddress(), aSubject, aTopic, someData);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
deleted file mode 100644
index f0b01da0a9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIPrefBranch extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 21 : 18);
-
-	static final String NS_IPREFBRANCH_IID_STR = "56c35506-f14b-11d3-99d3-ddbfac2ccf65";
-	static final String NS_IPREFBRANCH_10_IID_STR = "e162bfa0-01bd-4e9f-9843-8fb2efcd6d1f";
-	static final String NS_IPREFBRANCH_24_IID_STR = "55d25e49-793f-4727-a69f-de8b15f4b985";
-
-	static {
-		IIDStore.RegisterIID(nsIPrefBranch.class, MozillaVersion.VERSION_BASE, new nsID(NS_IPREFBRANCH_IID_STR));
-		IIDStore.RegisterIID(nsIPrefBranch.class, MozillaVersion.VERSION_XR10, new nsID(NS_IPREFBRANCH_10_IID_STR));
-		IIDStore.RegisterIID(nsIPrefBranch.class, MozillaVersion.VERSION_XR24, new nsID(NS_IPREFBRANCH_24_IID_STR));
-	}
-
-	public nsIPrefBranch(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int PREF_INVALID = 0;
-	public static final int PREF_STRING = 32;
-	public static final int PREF_INT = 64;
-	public static final int PREF_BOOL = 128;
-
-	public int SetBoolPref(byte[] aPrefName, int aValue) {
-		return XPCOM.VtblCall(this.getMethodIndex("setBoolPref"), getAddress(), aPrefName, aValue);
-	}
-
-	public int GetIntPref(byte[] aPrefName, int[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getIntPref"), getAddress(), aPrefName, _retval);
-	}
-
-	public int SetIntPref(byte[] aPrefName, int aValue) {
-		return XPCOM.VtblCall(this.getMethodIndex("setIntPref"), getAddress(), aPrefName, aValue);
-	}
-
-	public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) {
-		return XPCOM.VtblCall(this.getMethodIndex("getComplexValue"), getAddress(), aPrefName, aType, aValue);
-	}
-
-	public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) {
-		return XPCOM.VtblCall(this.getMethodIndex("setComplexValue"), getAddress(), aPrefName, aType, aValue);
-	}
-
-	public int ClearUserPref(byte[] aPrefName) {
-		return XPCOM.VtblCall(this.getMethodIndex("clearUserPref"), getAddress(), aPrefName);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
deleted file mode 100644
index 5a61bcb3ae..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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) 2006, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIPrefLocalizedString extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	static final String NS_IPREFLOCALIZEDSTRING_IID_STR = "ae419e24-1dd1-11b2-b39a-d3e5e7073802";
-
-	static {
-		IIDStore.RegisterIID(nsIPrefLocalizedString.class, MozillaVersion.VERSION_BASE, new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR));
-	}
-
-	public nsIPrefLocalizedString(long /*int*/ address) {
-		super(address);
-	}
-
-	public int ToString(long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("toString"), getAddress(), _retval);
-	}
-
-	public int SetDataWithLength(int length, char[] data) {
-		return XPCOM.VtblCall(this.getMethodIndex("setDataWithLength"), getAddress(), length, data);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java
deleted file mode 100644
index 2e5fde8e41..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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) 2006, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIPrefService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
-
-	static final String NS_IPREFSERVICE_IID_STR = "decb9cc7-c08f-4ea5-be91-a8fc637ce2d2";
-
-	static {
-		IIDStore.RegisterIID(nsIPrefService.class, MozillaVersion.VERSION_BASE, new nsID(NS_IPREFSERVICE_IID_STR));
-	}
-
-	public nsIPrefService(long /*int*/ address) {
-		super(address);
-	}
-
-	public int SavePrefFile(long /*int*/ aFile) {
-		return XPCOM.VtblCall(this.getMethodIndex("savePrefFile"), getAddress(), aFile);
-	}
-
-	public int GetBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getBranch"), getAddress(), aPrefRoot, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
deleted file mode 100644
index 8f62ad2a4c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIPrincipal extends nsISerializable {
-
-	static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + (IsXULRunner31 () ? 19 : (IsXULRunner24() ? 21 : (IsXULRunner10() ? 26 : 23)));
-
-	static final String NS_IPRINCIPAL_IID_STR = "b8268b9a-2403-44ed-81e3-614075c92034";
-	static final String NS_IPRINCIPAL_10_IID_STR = "b406a2db-e547-4c95-b8e2-ad09ecb54ce0";
-	static final String NS_IPRINCIPAL_24_IID_STR = "dbda8bb0-3023-4aec-ad98-8e9931a29d70";
-	static final String NS_IPRINCIPAL_31_IID_STR = "204555e7-04ad-4cc8-9f0e-840615cc43e8";
-
-	static {
-		IIDStore.RegisterIID(nsIPrincipal.class, MozillaVersion.VERSION_BASE, new nsID(NS_IPRINCIPAL_IID_STR));
-		IIDStore.RegisterIID(nsIPrincipal.class, MozillaVersion.VERSION_XR10, new nsID(NS_IPRINCIPAL_10_IID_STR));
-		IIDStore.RegisterIID(nsIPrincipal.class, MozillaVersion.VERSION_XR24, new nsID(NS_IPRINCIPAL_24_IID_STR));
-		IIDStore.RegisterIID(nsIPrincipal.class, MozillaVersion.VERSION_XR31, new nsID(NS_IPRINCIPAL_31_IID_STR));
-	}
-
-	public nsIPrincipal(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int ENABLE_DENIED = 1;
-	public static final int ENABLE_UNKNOWN = 2;
-	public static final int ENABLE_WITH_USER_PERMISSION = 3;
-	public static final int ENABLE_GRANTED = 4;
-
-	public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) {
-		if (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24)) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(this.getMethodIndex("getJSPrincipals"), getAddress(), cx, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrompt.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrompt.java
deleted file mode 100644
index 5a41f4c433..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrompt.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ***** 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) 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIPrompt extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
-	static final String NS_IPROMPT_IID_STR = "a63f70c0-148b-11d3-9333-00104ba0fd40";
-
-	static {
-		IIDStore.RegisterIID(nsIPrompt.class, MozillaVersion.VERSION_BASE, new nsID(NS_IPROMPT_IID_STR));
-	}
-
-	public nsIPrompt(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int BUTTON_POS_0 = 1;
-	public static final int BUTTON_POS_1 = 256;
-	public static final int BUTTON_POS_2 = 65536;
-	public static final int BUTTON_TITLE_OK = 1;
-	public static final int BUTTON_TITLE_CANCEL = 2;
-	public static final int BUTTON_TITLE_YES = 3;
-	public static final int BUTTON_TITLE_NO = 4;
-	public static final int BUTTON_TITLE_SAVE = 5;
-	public static final int BUTTON_TITLE_DONT_SAVE = 6;
-	public static final int BUTTON_TITLE_REVERT = 7;
-	public static final int BUTTON_TITLE_IS_STRING = 127;
-	public static final int BUTTON_POS_0_DEFAULT = 0;
-	public static final int BUTTON_POS_1_DEFAULT = 16777216;
-	public static final int BUTTON_POS_2_DEFAULT = 33554432;
-	public static final int BUTTON_DELAY_ENABLE = 67108864;
-	public static final int STD_OK_CANCEL_BUTTONS = 513;
-	public static final int STD_YES_NO_BUTTONS = 1027;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
deleted file mode 100644
index f36324d9dc..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIPromptService extends nsISupports {
-
-	public static final String NS_IPROMPTSERVICE_IID_STR = "1630c61a-325e-49ca-8759-a31b16c47aa5";
-
-	static {
-		IIDStore.RegisterIID(nsIPromptService.class, MozillaVersion.VERSION_BASE, new nsID(NS_IPROMPTSERVICE_IID_STR));
-	}
-
-	public nsIPromptService(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int BUTTON_POS_0 = 1;
-	public static final int BUTTON_POS_1 = 256;
-	public static final int BUTTON_POS_2 = 65536;
-	public static final int BUTTON_TITLE_OK = 1;
-	public static final int BUTTON_TITLE_CANCEL = 2;
-	public static final int BUTTON_TITLE_YES = 3;
-	public static final int BUTTON_TITLE_NO = 4;
-	public static final int BUTTON_TITLE_SAVE = 5;
-	public static final int BUTTON_TITLE_DONT_SAVE = 6;
-	public static final int BUTTON_TITLE_REVERT = 7;
-	public static final int BUTTON_TITLE_IS_STRING = 127;
-	public static final int BUTTON_POS_0_DEFAULT = 0;
-	public static final int BUTTON_POS_1_DEFAULT = 16777216;
-	public static final int BUTTON_POS_2_DEFAULT = 33554432;
-	public static final int BUTTON_DELAY_ENABLE = 67108864;
-	public static final int STD_OK_CANCEL_BUTTONS = 513;
-	public static final int STD_YES_NO_BUTTONS = 1027;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
deleted file mode 100644
index 5d863fc275..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ***** 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 nsIProperties extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
-	static final String NS_IPROPERTIES_IID_STR = "78650582-4e93-4b60-8e85-26ebd3eb14ca";
-
-	static {
-		IIDStore.RegisterIID(nsIProperties.class, MozillaVersion.VERSION_BASE, new nsID(NS_IPROPERTIES_IID_STR));
-	}
-
-	public nsIProperties(long /*int*/ address) {
-		super(address);
-	}
-
-	public int Get(byte[] prop, nsID iid, long /*int*/[] result) {
-		return XPCOM.VtblCall(this.getMethodIndex("get"), getAddress(), prop, iid, result);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
deleted file mode 100644
index 4d65bf5594..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ***** 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 nsIRequest extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
-
-	static final String NS_IREQUEST_IID_STR = "ef6bfbd2-fd46-48d8-96b7-9f8f0fd387fe";
-
-	static {
-		IIDStore.RegisterIID(nsIRequest.class, MozillaVersion.VERSION_BASE, new nsID(NS_IREQUEST_IID_STR));
-	}
-
-	public nsIRequest(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetName(long /*int*/ aName) {
-		return XPCOM.VtblCall(this.getGetterIndex("name"), getAddress(), aName);
-	}
-
-	public static final int LOAD_NORMAL = 0;
-	public static final int LOAD_BACKGROUND = 1;
-	public static final int INHIBIT_CACHING = 128;
-	public static final int INHIBIT_PERSISTENT_CACHING = 256;
-	public static final int LOAD_BYPASS_CACHE = 512;
-	public static final int LOAD_FROM_CACHE = 1024;
-	public static final int VALIDATE_ALWAYS = 2048;
-	public static final int VALIDATE_NEVER = 4096;
-	public static final int VALIDATE_ONCE_PER_SESSION = 8192;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
deleted file mode 100644
index 7c59b8c7f2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsISSLStatus extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + ((IsXULRunner10() || IsXULRunner24() || IsXULRunner31()) ? 8 : 7);
-
-	static final String NS_ISSLSTATUS_IID_STR = "cfede939-def1-49be-81ed-d401b3a07d1c";
-	static final String NS_ISSLSTATUS_10_IID_STR = "3f1fcd83-c5a9-4cd1-a250-7676ca7c7e34";
-
-	static {
-		IIDStore.RegisterIID(nsISSLStatus.class, MozillaVersion.VERSION_BASE, new nsID(NS_ISSLSTATUS_IID_STR));
-		IIDStore.RegisterIID(nsISSLStatus.class, MozillaVersion.VERSION_XR10, new nsID(NS_ISSLSTATUS_10_IID_STR));
-	}
-
-	public nsISSLStatus(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetServerCert(long /*int*/[] aServerCert) {
-		return XPCOM.VtblCall(this.getGetterIndex("serverCert"), getAddress(), aServerCert);
-	}
-
-	public int GetIsDomainMismatch(int[] aIsDomainMismatch) {
-		return XPCOM.VtblCall(this.getGetterIndex("isDomainMismatch"), getAddress(), aIsDomainMismatch);
-	}
-
-	public int GetIsNotValidAtThisTime(int[] aIsNotValidAtThisTime) {
-		return XPCOM.VtblCall(this.getGetterIndex("isNotValidAtThisTime"), getAddress(), aIsNotValidAtThisTime);
-	}
-
-	public int GetIsUntrusted(int[] aIsUntrusted) {
-		return XPCOM.VtblCall(this.getGetterIndex("isUntrusted"), getAddress(), aIsUntrusted);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptContext.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptContext.java
deleted file mode 100644
index f450ac6a4f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptContext.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ***** 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) 2014 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIScriptContext extends nsISupports {
-
-	static final String NS_ISCRIPTCONTEXT_1_9_IID_STR = "e7b9871d-3adc-4bf7-850d-7fb9554886bf";
-	static final String NS_ISCRIPTCONTEXT_1_9_2_IID_STR = "87482b5e-e019-4df5-9bc2-b2a51b1f2d28";
-	static final String NS_ISCRIPTCONTEXT_10_IID_STR = "2e583bf4-3c1f-432d-8283-8dee7eccc88b";
-	static final String NS_ISCRIPTCONTEXT_24_IID_STR = "ef0c91ce-14f6-41c9-a577-a6ebdc6d447b";
-	static final String NS_ISCRIPTCONTEXT_31_IID_STR = "274840b6-7349-4798-be24-bd75a64699b7";
-
-	static {
-		IIDStore.RegisterIID(nsIScriptContext.class, MozillaVersion.VERSION_BASE, new nsID(NS_ISCRIPTCONTEXT_1_9_IID_STR));
-		IIDStore.RegisterIID(nsIScriptContext.class, MozillaVersion.VERSION_XR1_9_2, new nsID(NS_ISCRIPTCONTEXT_1_9_2_IID_STR));
-		IIDStore.RegisterIID(nsIScriptContext.class, MozillaVersion.VERSION_XR10, new nsID(NS_ISCRIPTCONTEXT_10_IID_STR));
-		IIDStore.RegisterIID(nsIScriptContext.class, MozillaVersion.VERSION_XR24, new nsID(NS_ISCRIPTCONTEXT_24_IID_STR));
-		IIDStore.RegisterIID(nsIScriptContext.class, MozillaVersion.VERSION_XR31, new nsID(NS_ISCRIPTCONTEXT_31_IID_STR));
-	}
-
-	public nsIScriptContext(long /*int*/ address) {
-		super(address);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptGlobalObject.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptGlobalObject.java
deleted file mode 100644
index 5987798d68..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptGlobalObject.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ***** 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) 2014 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIScriptGlobalObject extends nsISupports {
-
-	static final String NS_ISCRIPTGLOBALOBJECT_1_9_IID_STR = "6afecd40-0b9a-4cfd-8c42-0f645cd91829";
-	static final String NS_ISCRIPTGLOBALOBJECT_1_9_2_IID_STR = "e9f3f2c1-2d94-4722-bbd4-2bf6fdf42f48";
-	static final String NS_ISCRIPTGLOBALOBJECT_10_IID_STR = "08f73284-26e3-4fa6-bf89-8326f92a94b3";
-	static final String NS_ISCRIPTGLOBALOBJECT_24_IID_STR = "de24b30a-12c6-4e5f-a85e-90cdfb6c5451";
-	static final String NS_ISCRIPTGLOBALOBJECT_31_IID_STR = "876f83bd-6314-460a-a045-1c8f462fb8e1";
-
-	static {
-		IIDStore.RegisterIID(nsIScriptGlobalObject.class, MozillaVersion.VERSION_BASE, new nsID(NS_ISCRIPTGLOBALOBJECT_1_9_IID_STR));
-		IIDStore.RegisterIID(nsIScriptGlobalObject.class, MozillaVersion.VERSION_XR1_9_2, new nsID(NS_ISCRIPTGLOBALOBJECT_1_9_2_IID_STR));
-		IIDStore.RegisterIID(nsIScriptGlobalObject.class, MozillaVersion.VERSION_XR10, new nsID(NS_ISCRIPTGLOBALOBJECT_10_IID_STR));
-		IIDStore.RegisterIID(nsIScriptGlobalObject.class, MozillaVersion.VERSION_XR24, new nsID(NS_ISCRIPTGLOBALOBJECT_24_IID_STR));
-		IIDStore.RegisterIID(nsIScriptGlobalObject.class, MozillaVersion.VERSION_XR31, new nsID(NS_ISCRIPTGLOBALOBJECT_31_IID_STR));
-	}
-
-	public nsIScriptGlobalObject(long /*int*/ address) {
-		super(address);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java
deleted file mode 100644
index 3a20a5936b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ***** 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) 2012, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
-
-	static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 21 : (IsXULRunner10() ? 27 : 26));
-
-	static final String NS_ISCRIPTSECURITYMANAGER_IID_STR = "3fffd8e8-3fea-442e-a0ed-2ba81ae197d5";
-	static final String NS_ISCRIPTSECURITYMANAGER_191_IID_STR = "f8e350b9-9f31-451a-8c8f-d10fea26b780";
-	static final String NS_ISCRIPTSECURITYMANAGER_10_IID_STR = "50eda256-4dd2-4c7c-baed-96983910af9f";
-	static final String NS_ISCRIPTSECURITYMANAGER_24_IID_STR = "ae486501-ec57-4ec8-a565-6880ca4ae6c4";
-
-	static {
-		IIDStore.RegisterIID(nsIScriptSecurityManager.class, MozillaVersion.VERSION_BASE, new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR));
-		IIDStore.RegisterIID(nsIScriptSecurityManager.class, MozillaVersion.VERSION_XR1_9_1, new nsID(NS_ISCRIPTSECURITYMANAGER_191_IID_STR));
-		IIDStore.RegisterIID(nsIScriptSecurityManager.class, MozillaVersion.VERSION_XR10, new nsID(NS_ISCRIPTSECURITYMANAGER_10_IID_STR));
-		IIDStore.RegisterIID(nsIScriptSecurityManager.class, MozillaVersion.VERSION_XR24, new nsID(NS_ISCRIPTSECURITYMANAGER_24_IID_STR));
-	}
-
-	public nsIScriptSecurityManager(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int STANDARD = 0;
-	public static final int LOAD_IS_AUTOMATIC_DOCUMENT_REPLACEMENT = 1;
-	public static final int ALLOW_CHROME = 2;
-	public static final int DISALLOW_INHERIT_PRINCIPAL = 4;
-	public static final int DISALLOW_SCRIPT_OR_DATA = 4;
-	public static final int DISALLOW_SCRIPT = 8;
-
-	public int GetSystemPrincipal(long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getSystemPrincipal"), getAddress(), _retval);
-	}
-
-	public int GetSubjectPrincipal(long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getSubjectPrincipal"), getAddress(), _retval);
-	}
-	public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ object, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 14 : (IsXULRunner10() ? 10 : 11)), getAddress(), cx, object, _retval);
-	}
-//	public int GetSystemPrincipal(long /*int*/[] _retval) {
-//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner24 ? 8 : (IsXULRunner10 ? 10 : 11)), getAddress(), _retval);
-//	}
-//	public int GetSystemPrincipal(long /*int*/[] _retval) {
-//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner24 ? 8 : (IsXULRunner10 ? 10 : 11)), getAddress(), _retval);
-//	}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java
deleted file mode 100644
index 97a8107869..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ***** 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) 2011, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsISeekableStream extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
-	static final String NS_ISEEKABLESTREAM_IID_STR = "8429d350-1040-4661-8b71-f2a6ba455980";
-
-	static {
-		IIDStore.RegisterIID(nsISeekableStream.class, MozillaVersion.VERSION_BASE, new nsID(NS_ISEEKABLESTREAM_IID_STR));
-	}
-
-	public nsISeekableStream(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int NS_SEEK_SET = 0;
-	public static final int NS_SEEK_CUR = 1;
-	public static final int NS_SEEK_END = 2;
-
-	public int Seek(int whence, long offset) {
-		return XPCOM.VtblCall(this.getMethodIndex("seek"), getAddress(), whence, offset);
-	}
-
-	public int Tell(long[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("tell"), getAddress(), _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java
deleted file mode 100644
index bf769d51c7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ***** 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 nsISerializable extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
-	static final String NS_ISERIALIZABLE_IID_STR = "91cca981-c26d-44a8-bebe-d9ed4891503a";
-
-	static {
-		IIDStore.RegisterIID(nsISerializable.class, MozillaVersion.VERSION_BASE, new nsID(NS_ISERIALIZABLE_IID_STR));
-	}
-
-	public nsISerializable(long /*int*/ address) {
-		super(address);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
deleted file mode 100644
index 6adfdc7ab5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsIServiceManager extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	static final String NS_ISERVICEMANAGER_IID_STR = "8bb35ed9-e332-462d-9155-4a002ab5c958";
-
-	static {
-		IIDStore.RegisterIID(nsIServiceManager.class, MozillaVersion.VERSION_BASE, new nsID(NS_ISERVICEMANAGER_IID_STR));
-	}
-
-	public nsIServiceManager(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetService(nsID aClass, nsID aIID, long /*int*/[] result) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
-	}
-
-	public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
deleted file mode 100644
index c7ff14e41d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsISimpleEnumerator extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
-	static final String NS_ISIMPLEENUMERATOR_IID_STR = "d1899240-f9d2-11d2-bdd6-000064657374";
-
-	static {
-		IIDStore.RegisterIID(nsISimpleEnumerator.class, MozillaVersion.VERSION_BASE, new nsID(NS_ISIMPLEENUMERATOR_IID_STR));
-	}
-
-	public nsISimpleEnumerator(long /*int*/ address) {
-		super(address);
-	}
-
-	public int HasMoreElements(int[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("hasMoreElements"), getAddress(), _retval);
-	}
-
-	public int GetNext(long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getNext"), getAddress(), _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
deleted file mode 100644
index bca6cd9328..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-import org.eclipse.swt.*;
-
-
-public class nsISupports {
-
-	static final boolean IsSolaris;
-	static {
-		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
-		IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
-	}
-
-	static final int FIRST_METHOD_ID = IsSolaris ? 2 : 0;
-	static final int LAST_METHOD_ID = FIRST_METHOD_ID + 2;
-
-	protected static boolean IsXULRunner10 () {
-		return MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10, true);
-	}
-
-	protected static boolean IsXULRunner24 () {
-		return MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR24, true);
-	}
-
-	protected static boolean IsXULRunner31 () {
-		return MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR31, true);
-	}
-
-	protected static boolean IsXULRVersionOrLater (int version) {
-		return MozillaVersion.CheckVersion (version, false);
-	}
-
-	public static final String NS_ISUPPORTS_IID_STR = "00000000-0000-0000-c000-000000000046";
-
-	static {
-		IIDStore.RegisterIID (nsISupports.class, MozillaVersion.VERSION_BASE, new nsID (NS_ISUPPORTS_IID_STR));
-	}
-
-	private static byte[] toByteArray (String str) {
-		byte[] bytes = new byte[str.length() + 1];
-		for (int i = str.length (); i-- > 0; )
-			bytes[i] = (byte)str.charAt (i);
-		return bytes;
-	}
-
-	protected int getGetterIndex (String attribute) {
-		return getMethodIndex (attribute);
-	}
-
-	protected int getSetterIndex (String attribute) {
-		return getMethodIndex (attribute) + 1;
-	}
-
-	protected String getClassName() {
-		return getClass ().getSimpleName ();
-	}
-
-	protected int getMethodIndex (String methodString) {
-		long /*int*/[] result = new long /*int*/[1];
-		result[0] = 0;
-		int rc = XPCOM.NS_GetServiceManager (result);
-		if (rc != XPCOM.NS_OK) {
-			throw new SWTError(rc);
-		}
-
-		nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-		result[0] = 0;
-		rc = serviceManager.GetServiceByContractID (toByteArray (XPCOM.NS_INTERFACEINFOMANAGER_CONTRACTID), IIDStore.GetIID (nsIInterfaceInfoManager.class), result);
-		serviceManager.Release ();
-		if (rc != XPCOM.NS_OK) {
-			throw new SWTError(rc);
-		}
-
-		nsIInterfaceInfoManager iim = new nsIInterfaceInfoManager (result[0]);
-		result[0] = 0;
-		rc = iim.GetInfoForName (toByteArray (getClassName()), result);
-		iim.Release ();
-		if (rc != XPCOM.NS_OK) {
-			throw new SWTError(rc);
-		}
-
-		nsIInterfaceInfo info = new nsIInterfaceInfo (result[0]);
-		int[] index = new int [1];
-		long /*int*/[] dummy = new long /*int*/[1];
-		rc = info.GetMethodInfoForName (toByteArray (methodString), index, dummy);
-		info.Release ();
-		if (rc != XPCOM.NS_OK) {
-			throw new SWTError(rc);
-		}
-
-		return index[0];
-	}
-
-	long /*int*/ address;
-
-	public nsISupports(long /*int*/ address) {
-		this.address = address;
-	}
-
-	public long /*int*/ getAddress() {
-		return this.address;
-	}
-
-	public int QueryInterface(nsID uuid, long /*int*/[] result) {
-		return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
-	}
-
-	public int AddRef() {
-		return XPCOM.VtblCall(FIRST_METHOD_ID + 1, getAddress());
-	}
-
-	public int Release() {
-		return XPCOM.VtblCall(FIRST_METHOD_ID + 2, getAddress());
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java
deleted file mode 100644
index 2de8837997..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ***** 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 nsITransfer extends nsIWebProgressListener2 {
-
-	static final int LAST_METHOD_ID = nsIWebProgressListener2.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR24) ? 2 : 1);
-
-	static final String NS_ITRANSFER_IID_STR = "23c51569-e9a1-4a92-adeb-3723db82ef7c";
-	static final String NS_ITRANSFER_24_IID_STR = "b1c81100-9d66-11e2-9e96-0800200c9a66";
-
-	static {
-		IIDStore.RegisterIID(nsITransfer.class, MozillaVersion.VERSION_BASE, new nsID(NS_ITRANSFER_IID_STR));
-		IIDStore.RegisterIID(nsITransfer.class, MozillaVersion.VERSION_XR24, new nsID(NS_ITRANSFER_24_IID_STR));
-	}
-
-	public nsITransfer(long /*int*/ address) {
-		super(address);
-	}
-}
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
deleted file mode 100644
index a8f9fd756f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIURI extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRVersionOrLater(MozillaVersion.VERSION_XR10) ? 32 : 26);
-
-	static final String NS_IURI_IID_STR = "07a22cc0-0ce5-11d3-9331-00104ba0fd40";
-	static final String NS_IURI_10_IID_STR = "395fe045-7d18-4adb-a3fd-af98c8a1af11";
-
-	static {
-		IIDStore.RegisterIID(nsIURI.class, MozillaVersion.VERSION_BASE, new nsID(NS_IURI_IID_STR));
-		IIDStore.RegisterIID(nsIURI.class, MozillaVersion.VERSION_XR10, new nsID(NS_IURI_10_IID_STR));
-	}
-
-	public nsIURI(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetSpec(long /*int*/ aSpec) {
-		return XPCOM.VtblCall(this.getGetterIndex("spec"), getAddress(), aSpec);
-	}
-
-	public int GetHost(long /*int*/ aHost) {
-		return XPCOM.VtblCall(this.getGetterIndex("host"), getAddress(), aHost);
-	}
-
-	public int GetPath(long /*int*/ aPath) {
-		return XPCOM.VtblCall(this.getGetterIndex("path"), getAddress(), aPath);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java
deleted file mode 100644
index ba2d372352..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ***** 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) 2011, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIUploadChannel extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
-	static final String NS_IUPLOADCHANNEL_IID_STR = "ddf633d8-e9a4-439d-ad88-de636fd9bb75";
-	static final String NS_IUPLOADCHANNEL_24_IID_STR = "5cfe15bd-5adb-4a7f-9e55-4f5a67d15794";
-
-	static {
-		IIDStore.RegisterIID(nsIUploadChannel.class, MozillaVersion.VERSION_BASE, new nsID(NS_IUPLOADCHANNEL_IID_STR));
-		IIDStore.RegisterIID(nsIUploadChannel.class, MozillaVersion.VERSION_XR24, new nsID(NS_IUPLOADCHANNEL_24_IID_STR));
-	}
-
-	public nsIUploadChannel(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetUploadStream(long /*int*/[] aUploadStream) {
-		return XPCOM.VtblCall(this.getGetterIndex("uploadStream"), getAddress(), aUploadStream);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
deleted file mode 100644
index b49540f899..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIVariant extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + ((IsXULRunner10() || IsXULRunner24() || IsXULRunner31()) ? 27 : 26);
-
-	static final String NS_IVARIANT_IID_STR = "6c9eb060-8c6a-11d5-90f3-0010a4e73d9a";
-	static final String NS_IVARIANT_10_IID_STR = "81e4c2de-acac-4ad6-901a-b5fb1b851a0d";
-
-	static {
-		IIDStore.RegisterIID(nsIVariant.class, MozillaVersion.VERSION_BASE, new nsID(NS_IVARIANT_IID_STR));
-		IIDStore.RegisterIID(nsIVariant.class, MozillaVersion.VERSION_XR10, new nsID(NS_IVARIANT_10_IID_STR));
-	}
-
-	public nsIVariant(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetDataType(short[] aDataType) {
-		return XPCOM.VtblCall(this.getGetterIndex("dataType"), getAddress(), aDataType);
-	}
-
-	public int GetAsInt32(int[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getAsInt32"), getAddress(), _retval);
-	}
-
-	public int GetAsDouble(long /*int*/ _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getAsDouble"), getAddress(), _retval);
-	}
-
-	public int GetAsBool(int[] _retval) {
-		/* mozilla's representation of boolean changed from 4 bytes to 1 byte as of XULRunner 4.x */
-		if (nsISupports.IsXULRVersionOrLater(MozillaVersion.VERSION_XR10)) {
-			byte[] byteValue = new byte[1];
-			int rc = XPCOM.VtblCall(this.getMethodIndex("getAsBool"), getAddress(), byteValue);
-			_retval[0] = (int)byteValue[0];
-			return rc;
-		}
-		return XPCOM.VtblCall(this.getMethodIndex("getAsBool"), getAddress(), _retval);
-	}
-
-	public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) {
-		return XPCOM.VtblCall(this.getMethodIndex("getAsArray"), getAddress(), type, iid, count, ptr);
-	}
-
-	public int GetAsWStringWithSize(int[] size, long /*int*/[] str) {
-		return XPCOM.VtblCall(this.getMethodIndex("getAsWStringWithSize"), getAddress(), size, str);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
deleted file mode 100644
index 46cea5081f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIWebBrowser extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + ((IsXULRunner10() || IsXULRunner24() || IsXULRunner31()) ? 9 : 7);
-
-	static final String NS_IWEBBROWSER_IID_STR = "69e5df00-7b8b-11d3-af61-00a024ffc08c";
-	static final String NS_IWEBBROWSER_10_IID_STR = "33e9d001-caab-4ba9-8961-54902f197202";
-
-	static {
-		IIDStore.RegisterIID(nsIWebBrowser.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBBROWSER_IID_STR));
-		IIDStore.RegisterIID(nsIWebBrowser.class, MozillaVersion.VERSION_XR10, new nsID(NS_IWEBBROWSER_10_IID_STR));
-	}
-
-	public nsIWebBrowser(long /*int*/ address) {
-		super(address);
-	}
-
-	public int AddWebBrowserListener(long /*int*/ aListener, nsID aIID) {
-		return XPCOM.VtblCall(this.getMethodIndex("addWebBrowserListener"), getAddress(), aListener, aIID);
-	}
-
-	public int RemoveWebBrowserListener(long /*int*/ aListener, nsID aIID) {
-		return XPCOM.VtblCall(this.getMethodIndex("removeWebBrowserListener"), getAddress(), aListener, aIID);
-	}
-
-	public int SetContainerWindow(long /*int*/ aContainerWindow) {
-		return XPCOM.VtblCall(this.getSetterIndex("containerWindow"), getAddress(), aContainerWindow);
-	}
-
-	public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
-		return XPCOM.VtblCall(this.getSetterIndex("parentURIContentListener"), getAddress(), aParentURIContentListener);
-	}
-
-	public int GetContentDOMWindow(long /*int*/[] aContentDOMWindow) {
-		return XPCOM.VtblCall(this.getGetterIndex("contentDOMWindow"), getAddress(), aContentDOMWindow);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
deleted file mode 100644
index 4ca82b84b0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIWebBrowserChrome extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
-
-	static final String NS_IWEBBROWSERCHROME_IID_STR = "ba434c60-9d52-11d3-afb0-00a024ffc08c";
-	static final String NS_IWEBBROWSERCHROME_24_IID_STR = "e8c414c4-dc38-4ba3-ab4e-ec4cbbe22907";
-
-	static {
-		IIDStore.RegisterIID(nsIWebBrowserChrome.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBBROWSERCHROME_IID_STR));
-		IIDStore.RegisterIID(nsIWebBrowserChrome.class, MozillaVersion.VERSION_XR24, new nsID(NS_IWEBBROWSERCHROME_24_IID_STR));
-	}
-
-	public nsIWebBrowserChrome(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int STATUS_SCRIPT = 1;
-	public static final int STATUS_SCRIPT_DEFAULT = 2;
-	public static final int STATUS_LINK = 3;
-
-	public int GetWebBrowser(long /*int*/[] aWebBrowser) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
-	}
-
-	public static final int CHROME_DEFAULT = 1;
-	public static final int CHROME_WINDOW_BORDERS = 2;
-	public static final int CHROME_WINDOW_CLOSE = 4;
-	public static final int CHROME_WINDOW_RESIZE = 8;
-	public static final int CHROME_MENUBAR = 16;
-	public static final int CHROME_TOOLBAR = 32;
-	public static final int CHROME_LOCATIONBAR = 64;
-	public static final int CHROME_STATUSBAR = 128;
-	public static final int CHROME_PERSONAL_TOOLBAR = 256;
-	public static final int CHROME_SCROLLBARS = 512;
-	public static final int CHROME_TITLEBAR = 1024;
-	public static final int CHROME_EXTRA = 2048;
-	public static final int CHROME_WITH_SIZE = 4096;
-	public static final int CHROME_WITH_POSITION = 8192;
-	public static final int CHROME_WINDOW_MIN = 16384;
-	public static final int CHROME_WINDOW_POPUP = 32768;
-	public static final int CHROME_WINDOW_RAISED = 33554432;
-	public static final int CHROME_WINDOW_LOWERED = 67108864;
-	public static final int CHROME_CENTER_SCREEN = 134217728;
-	public static final int CHROME_DEPENDENT = 268435456;
-	public static final int CHROME_MODAL = 536870912;
-	public static final int CHROME_OPENAS_DIALOG = 1073741824;
-	public static final int CHROME_OPENAS_CHROME = -2147483648;
-	public static final int CHROME_ALL = 4094;
-
-	public int SetChromeFlags(int aChromeFlags) {
-		return XPCOM.VtblCall(this.getSetterIndex("chromeFlags"), getAddress(), aChromeFlags);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
deleted file mode 100644
index 8308b658ce..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsIWebBrowserFocus extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
-	static final String NS_IWEBBROWSERFOCUS_IID_STR = "9c5d3c58-1dd1-11b2-a1c9-f3699284657a";
-
-	static {
-		IIDStore.RegisterIID(nsIWebBrowserFocus.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBBROWSERFOCUS_IID_STR));
-	}
-
-	public nsIWebBrowserFocus(long /*int*/ address) {
-		super(address);
-	}
-
-	public int Activate() {
-		return XPCOM.VtblCall(this.getMethodIndex("activate"), getAddress());
-	}
-
-	public int Deactivate() {
-		return XPCOM.VtblCall(this.getMethodIndex("deactivate"), getAddress());
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
deleted file mode 100644
index 386870e73e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ***** 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 nsIWebBrowserSetup extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
-	static final String NS_IWEBBROWSERSETUP_IID_STR = "f15398a0-8018-11d3-af70-00a024ffc08c";
-
-	static {
-		IIDStore.RegisterIID(nsIWebBrowserSetup.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBBROWSERSETUP_IID_STR));
-	}
-
-	public nsIWebBrowserSetup(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int SETUP_ALLOW_PLUGINS = 1;
-	public static final int SETUP_ALLOW_JAVASCRIPT = 2;
-	public static final int SETUP_ALLOW_META_REDIRECTS = 3;
-	public static final int SETUP_ALLOW_SUBFRAMES = 4;
-	public static final int SETUP_ALLOW_IMAGES = 5;
-	public static final int SETUP_FOCUS_DOC_BEFORE_CONTENT = 6;
-	public static final int SETUP_USE_GLOBAL_HISTORY = 256;
-	public static final int SETUP_IS_CHROME_WRAPPER = 7;
-
-	public int SetProperty(int aId, int aValue) {
-		return XPCOM.VtblCall(this.getMethodIndex("setProperty"), getAddress(), aId, aValue);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
deleted file mode 100644
index 4f48396427..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ***** 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 nsIWebBrowserStream extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
-	static final String NS_IWEBBROWSERSTREAM_IID_STR = "86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
-
-	static {
-		IIDStore.RegisterIID(nsIWebBrowserStream.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBBROWSERSTREAM_IID_STR));
-	}
-
-	public nsIWebBrowserStream(long /*int*/ address) {
-		super(address);
-	}
-
-	public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {
-		return XPCOM.VtblCall(this.getMethodIndex("openStream"), getAddress(), aBaseURI, aContentType);
-	}
-
-	public int AppendToStream(long /*int*/ aData, int aLen) {
-		return XPCOM.VtblCall(this.getMethodIndex("appendToStream"), getAddress(), aData, aLen);
-	}
-
-	public int CloseStream() {
-		return XPCOM.VtblCall(this.getMethodIndex("closeStream"), getAddress());
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
deleted file mode 100644
index 4e6c0a6573..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ***** 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 nsIWebNavigation extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 14 : 13);
-
-	static final String NS_IWEBNAVIGATION_IID_STR = "f5d9e7b0-d930-11d3-b057-00a024ffc08c";
-	static final String NS_IWEBNAVIGATION_24_IID_STR = "28404f7e-0f17-4dc3-a21a-2074d8659b02";
-	static final String NS_IWEBNAVIGATION_31_IID_STR = "b7568a50-4c50-442c-a6be-3a340a48d89a";
-
-	static {
-		IIDStore.RegisterIID(nsIWebNavigation.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBNAVIGATION_IID_STR));
-		IIDStore.RegisterIID(nsIWebNavigation.class, MozillaVersion.VERSION_XR24, new nsID(NS_IWEBNAVIGATION_24_IID_STR));
-		IIDStore.RegisterIID(nsIWebNavigation.class, MozillaVersion.VERSION_XR31, new nsID(NS_IWEBNAVIGATION_31_IID_STR));
-	}
-
-	public nsIWebNavigation(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetCanGoBack(int[] aCanGoBack) {
-		return XPCOM.VtblCall(this.getGetterIndex("canGoBack"), getAddress(), aCanGoBack);
-	}
-
-	public int GetCanGoForward(int[] aCanGoForward) {
-		return XPCOM.VtblCall(this.getGetterIndex("canGoForward"), getAddress(), aCanGoForward);
-	}
-
-	public int GoBack() {
-		return XPCOM.VtblCall(this.getMethodIndex("goBack"), getAddress());
-	}
-
-	public int GoForward() {
-		return XPCOM.VtblCall(this.getMethodIndex("goForward"), getAddress());
-	}
-
-	public static final int LOAD_FLAGS_MASK = 65535;
-	public static final int LOAD_FLAGS_NONE = 0;
-	public static final int LOAD_FLAGS_IS_REFRESH = 16;
-	public static final int LOAD_FLAGS_IS_LINK = 32;
-	public static final int LOAD_FLAGS_BYPASS_HISTORY = 64;
-	public static final int LOAD_FLAGS_REPLACE_HISTORY = 128;
-	public static final int LOAD_FLAGS_BYPASS_CACHE = 256;
-	public static final int LOAD_FLAGS_BYPASS_PROXY = 512;
-	public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
-
-	public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) {
-		return XPCOM.VtblCall(this.getMethodIndex("loadURI"), getAddress(), uri, loadFlags, referrer, postData, headers);
-	}
-
-	public int Reload(int reloadFlags) {
-		return XPCOM.VtblCall(this.getMethodIndex("reload"), getAddress(), reloadFlags);
-	}
-
-	public static final int STOP_NETWORK = 1;
-	public static final int STOP_CONTENT = 2;
-	public static final int STOP_ALL = 3;
-
-	public int Stop(int stopFlags) {
-		return XPCOM.VtblCall(this.getMethodIndex("stop"), getAddress(), stopFlags);
-	}
-
-	public int GetCurrentURI(long /*int*/[] aCurrentURI) {
-		return XPCOM.VtblCall(this.getGetterIndex("currentURI"), getAddress(), aCurrentURI);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
deleted file mode 100644
index ebb4a1db43..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ***** 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 nsIWebNavigationInfo extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
-	static final String NS_IWEBNAVIGATIONINFO_IID_STR = "62a93afb-93a1-465c-84c8-0432264229de";
-
-	static {
-		IIDStore.RegisterIID(nsIWebNavigationInfo.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBNAVIGATIONINFO_IID_STR));
-	}
-
-	public nsIWebNavigationInfo(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int UNSUPPORTED = 0;
-	public static final int IMAGE = 1;
-	public static final int PLUGIN = 2;
-	public static final int OTHER = 32768;
-
-	public int IsTypeSupported(long /*int*/ aType, long /*int*/ aWebNav, int[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("isTypeSupported"), getAddress(), aType, aWebNav, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
deleted file mode 100644
index 1c4d10a038..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ***** 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 nsIWebProgress extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 7 : (IsXULRunner24() ? 6 : 4));
-
-	static final String NS_IWEBPROGRESS_IID_STR = "570f39d0-efd0-11d3-b093-00a024ffc08c";
-	static final String NS_IWEBPROGRESS_24_IID_STR = "1c3437b0-9e2c-11e2-9e96-0800200c9a66";
-	static final String NS_IWEBPROGRESS_31_IID_STR = "bd0efb3b-1c81-4fb0-b16d-576a2be48a95";
-
-	static {
-		IIDStore.RegisterIID(nsIWebProgress.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBPROGRESS_IID_STR));
-		IIDStore.RegisterIID(nsIWebProgress.class, MozillaVersion.VERSION_XR24, new nsID(NS_IWEBPROGRESS_24_IID_STR));
-		IIDStore.RegisterIID(nsIWebProgress.class, MozillaVersion.VERSION_XR31, new nsID(NS_IWEBPROGRESS_31_IID_STR));
-	}
-
-	public nsIWebProgress(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int NOTIFY_STATE_REQUEST = 1;
-	public static final int NOTIFY_STATE_DOCUMENT = 2;
-	public static final int NOTIFY_STATE_NETWORK = 4;
-	public static final int NOTIFY_STATE_WINDOW = 8;
-	public static final int NOTIFY_STATE_ALL = 15;
-	public static final int NOTIFY_PROGRESS = 16;
-	public static final int NOTIFY_STATUS = 32;
-	public static final int NOTIFY_SECURITY = 64;
-	public static final int NOTIFY_LOCATION = 128;
-	public static final int NOTIFY_ALL = 255;
-
-	public int GetDOMWindow(long /*int*/[] aDOMWindow) {
-		return XPCOM.VtblCall(this.getGetterIndex("DOMWindow"), getAddress(), aDOMWindow);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
deleted file mode 100644
index 489d50e94c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIWebProgressListener extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
-	static final String NS_IWEBPROGRESSLISTENER_IID_STR = "570f39d1-efd0-11d3-b093-00a024ffc08c";
-	static final String NS_IWEBPROGRESSLISTENER_24_IID_STR = "a0cda7e4-c6ca-11e0-b6a5-001320257da5";
-
-	static {
-		IIDStore.RegisterIID(nsIWebProgressListener.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBPROGRESSLISTENER_IID_STR));
-		IIDStore.RegisterIID(nsIWebProgressListener.class, MozillaVersion.VERSION_XR24, new nsID(NS_IWEBPROGRESSLISTENER_24_IID_STR));
-	}
-
-	public nsIWebProgressListener(long /*int*/ address) {
-		super(address);
-	}
-
-	public static final int STATE_START = 1;
-	public static final int STATE_REDIRECTING = 2;
-	public static final int STATE_TRANSFERRING = 4;
-	public static final int STATE_NEGOTIATING = 8;
-	public static final int STATE_STOP = 16;
-	public static final int STATE_IS_REQUEST = 65536;
-	public static final int STATE_IS_DOCUMENT = 131072;
-	public static final int STATE_IS_NETWORK = 262144;
-	public static final int STATE_IS_WINDOW = 524288;
-	public static final int STATE_IS_INSECURE = 4;
-	public static final int STATE_IS_BROKEN = 1;
-	public static final int STATE_IS_SECURE = 2;
-	public static final int STATE_SECURE_HIGH = 262144;
-	public static final int STATE_SECURE_MED = 65536;
-	public static final int STATE_SECURE_LOW = 131072;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
deleted file mode 100644
index 554f77cf87..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ***** 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 nsIWebProgressListener2 extends nsIWebProgressListener {
-
-	static final int LAST_METHOD_ID = nsIWebProgressListener.LAST_METHOD_ID + 1;
-
-	static final String NS_IWEBPROGRESSLISTENER2_IID_STR = "3f24610d-1e1f-4151-9d2e-239884742324";
-	static final String NS_IWEBPROGRESSLISTENER2_24_IID_STR = "dde39de0-e4e0-11da-8ad9-0800200c9a66";
-
-	static {
-		IIDStore.RegisterIID(nsIWebProgressListener2.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR));
-	}
-
-	public nsIWebProgressListener2(long /*int*/ address) {
-		super(address);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
deleted file mode 100644
index 10ff19bf43..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ***** 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 nsIWindowWatcher extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 12 : 11);
-
-	static final String NS_IWINDOWWATCHER_IID_STR = "002286a8-494b-43b3-8ddd-49e3fc50622b";
-	static final String NS_IWINDOWWATCHER_31_IID_STR = "67bc1691-fbaf-484a-a15b-c96212b45034";
-
-	static {
-		IIDStore.RegisterIID(nsIWindowWatcher.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWINDOWWATCHER_IID_STR));
-		IIDStore.RegisterIID(nsIWindowWatcher.class, MozillaVersion.VERSION_XR31, new nsID(NS_IWINDOWWATCHER_31_IID_STR));
-	}
-
-	public nsIWindowWatcher(long /*int*/ address) {
-		super(address);
-	}
-
-	public int SetWindowCreator(long /*int*/ creator) {
-		return XPCOM.VtblCall(this.getMethodIndex("setWindowCreator"), getAddress(), creator);
-	}
-
-	public int GetChromeForWindow(long /*int*/ aWindow, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("getChromeForWindow"), getAddress(), aWindow, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
deleted file mode 100644
index 5a834a380c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ***** 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, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIWritableVariant extends nsIVariant {
-
-	static final int LAST_METHOD_ID = nsIVariant.LAST_METHOD_ID + 31;
-
-	static final String NS_IWRITABLEVARIANT_IID_STR = "5586a590-8c82-11d5-90f3-0010a4e73d9a";
-
-	static {
-		IIDStore.RegisterIID(nsIWritableVariant.class, MozillaVersion.VERSION_BASE, new nsID(NS_IWRITABLEVARIANT_IID_STR));
-	}
-
-	public nsIWritableVariant(long /*int*/ address) {
-		super(address);
-	}
-
-	public int SetAsDouble(double aValue) {
-		return XPCOM.VtblCall(this.getMethodIndex("setAsDouble"), getAddress(), aValue);
-	}
-
-	public int SetAsBool(int aValue) {
-		/* mozilla's representation of boolean changed from 4 bytes to 1 byte as of XULRunner 4.x */
-		if (IsXULRVersionOrLater(MozillaVersion.VERSION_XR10)) {
-			return XPCOM.VtblCall(this.getMethodIndex("setAsBool"), getAddress(), (byte)aValue);
-		}
-		return XPCOM.VtblCall(this.getMethodIndex("setAsBool"), getAddress(), aValue);
-	}
-
-	public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) {
-		return XPCOM.VtblCall(this.getMethodIndex("setAsArray"), getAddress(), type, iid, count, ptr);
-	}
-
-	public int SetAsWStringWithSize(int size, char[] str) {
-		return XPCOM.VtblCall(this.getMethodIndex("setAsWStringWithSize"), getAddress(), size, str);
-	}
-
-	public int SetAsEmpty() {
-		return XPCOM.VtblCall(this.getMethodIndex("setAsEmpty"), getAddress());
-	}
-
-	public int SetAsEmptyArray() {
-		return XPCOM.VtblCall(this.getMethodIndex("setAsEmptyArray"), getAddress());
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
deleted file mode 100644
index 75a2546f39..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ***** 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 nsIX509Cert extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 27 : (IsXULRunner24() ? 26 : 27));
-
-	static final String NS_IX509CERT_IID_STR = "f0980f60-ee3d-11d4-998b-00b0d02354a0";
-	static final String NS_IX509CERT_24_IID_STR = "45b24b0a-6189-4b05-af0b-8d4d66d57c59";
-	static final String NS_IX509CERT_31_IID_STR = "6286dd8c-c1a1-11e3-941d-180373d97f24";
-
-	static {
-		IIDStore.RegisterIID(nsIX509Cert.class, MozillaVersion.VERSION_BASE, new nsID(NS_IX509CERT_IID_STR));
-		IIDStore.RegisterIID(nsIX509Cert.class, MozillaVersion.VERSION_XR24, new nsID(NS_IX509CERT_24_IID_STR));
-		IIDStore.RegisterIID(nsIX509Cert.class, MozillaVersion.VERSION_XR31, new nsID(NS_IX509CERT_31_IID_STR));
-	}
-
-	public nsIX509Cert(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetCommonName(long /*int*/ aCommonName) {
-		return XPCOM.VtblCall(this.getGetterIndex("commonName"), getAddress(), aCommonName);
-	}
-
-	public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) {
-		return XPCOM.VtblCall(this.getGetterIndex("issuerCommonName"), getAddress(), aIssuerCommonName);
-	}
-
-	public int GetValidity(long /*int*/[] aValidity) {
-		return XPCOM.VtblCall(this.getGetterIndex("validity"), getAddress(), aValidity);
-	}
-
-	public static final int UNKNOWN_CERT = 0;
-	public static final int CA_CERT = 1;
-	public static final int USER_CERT = 2;
-	public static final int EMAIL_CERT = 4;
-	public static final int SERVER_CERT = 8;
-	public static final int VERIFIED_OK = 0;
-	public static final int NOT_VERIFIED_UNKNOWN = 1;
-	public static final int CERT_REVOKED = 2;
-	public static final int CERT_EXPIRED = 4;
-	public static final int CERT_NOT_TRUSTED = 8;
-	public static final int ISSUER_NOT_TRUSTED = 16;
-	public static final int ISSUER_UNKNOWN = 32;
-	public static final int INVALID_CA = 64;
-	public static final int USAGE_NOT_ALLOWED = 128;
-	public static final int CERT_USAGE_SSLClient = 0;
-	public static final int CERT_USAGE_SSLServer = 1;
-	public static final int CERT_USAGE_SSLServerWithStepUp = 2;
-	public static final int CERT_USAGE_SSLCA = 3;
-	public static final int CERT_USAGE_EmailSigner = 4;
-	public static final int CERT_USAGE_EmailRecipient = 5;
-	public static final int CERT_USAGE_ObjectSigner = 6;
-	public static final int CERT_USAGE_UserCertImport = 7;
-	public static final int CERT_USAGE_VerifyCA = 8;
-	public static final int CERT_USAGE_ProtectedObjectSigner = 9;
-	public static final int CERT_USAGE_StatusResponder = 10;
-	public static final int CERT_USAGE_AnyCA = 11;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
deleted file mode 100644
index c1d68f6518..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** 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 nsIX509CertValidity extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
-	static final String NS_IX509CERTVALIDITY_IID_STR = "e701dfd8-1dd1-11b2-a172-ffa6cc6156ad";
-
-	static {
-		IIDStore.RegisterIID(nsIX509CertValidity.class, MozillaVersion.VERSION_BASE, new nsID(NS_IX509CERTVALIDITY_IID_STR));
-	}
-
-	public nsIX509CertValidity(long /*int*/ address) {
-		super(address);
-	}
-
-	public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) {
-		return XPCOM.VtblCall(this.getGetterIndex("NotBeforeGMT"), getAddress(), aNotBeforeGMT);
-	}
-
-	public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) {
-		return XPCOM.VtblCall(this.getGetterIndex("NotAfterGMT"), getAddress(), aNotAfterGMT);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
deleted file mode 100644
index 7e516574a1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ***** 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 nsIXPCSecurityManager extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 3 : 4);
-
-	static final String NS_IXPCSECURITYMANAGER_IID_STR = "31431440-f1ce-11d2-985a-006008962422";
-	static final String NS_IXPCSECURITYMANAGER_31_IID_STR = "d4d21714-116b-4851-a785-098c5dfea523";
-
-	static {
-		IIDStore.RegisterIID(nsIXPCSecurityManager.class, MozillaVersion.VERSION_BASE, new nsID(NS_IXPCSECURITYMANAGER_IID_STR));
-		IIDStore.RegisterIID(nsIXPCSecurityManager.class, MozillaVersion.VERSION_XR31, new nsID(NS_IXPCSECURITYMANAGER_31_IID_STR));
-	}
-
-	public nsIXPCSecurityManager(long /*int*/ address) {
-		super(address);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
deleted file mode 100644
index 3fb93abddc..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ***** 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) 2012, 2013 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-
-public class nsIXPConnect extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner31 () ? 39 : (IsXULRunner24() ? 38 : 27));
-
-	static final String NS_IXPCONNECT_IID_STR = "a995b541-d514-43f1-ac0e-f49746c0b063";
-	static final String NS_IXPCONNECT_24_IID_STR = "3bc074e6-2102-40a4-8c84-38b002c9e2f1";
-	static final String NS_IXPCONNECT_31_IID_STR = "3d5a6320-8764-11e3-baa7-0800200c9a66";
-
-	static {
-		IIDStore.RegisterIID(nsIXPConnect.class, MozillaVersion.VERSION_BASE, new nsID(NS_IXPCONNECT_IID_STR));
-		IIDStore.RegisterIID(nsIXPConnect.class, MozillaVersion.VERSION_XR24, new nsID(NS_IXPCONNECT_24_IID_STR));
-		IIDStore.RegisterIID(nsIXPConnect.class, MozillaVersion.VERSION_XR31, new nsID(NS_IXPCONNECT_31_IID_STR));
-	}
-
-	public nsIXPConnect(long /*int*/ address) {
-		super(address);
-	}
-
-	public int JSValToVariant(long /*int*/ cx, long /*int*/ aJSVal, long /*int*/[] _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("jSValToVariant"), getAddress(), cx, aJSVal, _retval);
-	}
-
-	public int VariantToJS(long /*int*/ ctx, long /*int*/ scope, long /*int*/ value, long /*int*/ _retval) {
-		return XPCOM.VtblCall(this.getMethodIndex("variantToJS"), getAddress(), ctx, scope, value, _retval);
-	}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/package.html b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/package.html
deleted file mode 100644
index 0458804fc3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/package.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-SWT internal Mozilla XPCOM implementation classes.
-<h2>
-Package Specification</h2>
-This package contains the classes which represent the Mozilla
-XPCOM platform interfaces that the SWT Mozilla Browser is built from.
-<p>
-Referencing any of the classes in this package directly guarantees
-that the code is platform specific. Applications should not need to
-reference the classes in this package directly.
-</p>
-</body>
-</html>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
deleted file mode 100644
index d21b1605da..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import java.io.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.gtk.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.widgets.*;
-
-class MozillaDelegate {
-	Browser browser;
-	Shell eventShell;
-	long /*int*/ mozillaHandle, embedHandle;
-	boolean hasFocus;
-	Listener listener;
-	static Callback eventCallback;
-	static long /*int*/ eventProc;
-	static Boolean IsXULRunner24;
-	static final int STOP_PROPOGATE = 1;
-	static final String LIB_FIX_XULRUNNER10 = "libswt-xulrunner-fix10.so"; //$NON-NLS-1$
-	static final String LIB_FIX_XULRUNNER31 = "libswt-xulrunner-fix31.so"; //$NON-NLS-1$
-	static final String LIB_XPCOM = "libxpcom.so"; //$NON-NLS-1$
-	static final String LIB_XUL = "libxul.so"; //$NON-NLS-1$
-
-	static boolean IsSparc;
-	static {
-		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
-		String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
-		IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$
-	}
-
-MozillaDelegate (Browser browser) {
-	super ();
-	/*
-	* The mozilla libraries on SPARC need the C++ runtime library to be loaded, but they do not declare
-	* this dependency because they usually get it for free as a result of the mozilla executable pulling it
-	* in.  Load this library here and scope it globally so that the mozilla libraries can resolve.
-	*/
-	if (IsSparc) {
-		byte[] buffer = Converter.wcsToMbcs ("libCrun.so.1", true); //$NON-NLS-1$
-		OS.dlopen (buffer, OS.RTLD_NOW | OS.RTLD_GLOBAL);
-	}
-	if (OS.GTK3) {
-		String errorString = " [Browser style SWT.MOZILLA and Java system property org.eclipse.swt.browser.DefaultType=mozilla are not supported with GTK 3 as XULRunner is not ported for GTK 3 yet]"; // $NON-NLS-1$
-		SWT.error (SWT.ERROR_NO_HANDLES, null, errorString);
-	}
-	this.browser = browser;
-}
-
-static long /*int*/ eventProc (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {
-	long /*int*/ parent = OS.gtk_widget_get_parent (handle);
-	parent = OS.gtk_widget_get_parent (parent);
-	if (parent == 0) return 0;
-	Widget widget = Display.getCurrent ().findWidget (parent);
-	if (widget != null && widget instanceof Browser) {
-		return ((Mozilla)((Browser)widget).webBrowser).delegate.gtk_event (handle, gdkEvent, pointer);
-	}
-	return 0;
-}
-
-static Browser findBrowser (long /*int*/ handle) {
-	/*
-	* Note.  On GTK, Mozilla is embedded into a GtkHBox handle
-	* and not directly into the parent Composite handle.
-	*/
-	long /*int*/ parent = OS.gtk_widget_get_parent (handle);
-	Display display = Display.getCurrent ();
-	return (Browser)display.findWidget (parent);
-}
-
-static String getCacheParentPath () {
-	return getProfilePath ();
-}
-
-static String[] getJSLibraryNames () {
-	return new String[] {"libxul.so"}; //$NON-NLS-1$
-}
-
-static String getJSLibraryName_Pre10() {
-	return "libmozjs.so"; //$NON-NLS-1$
-}
-
-static String getLibraryName (String mozillaPath) {
-	/*
-	 * The name of the Gecko library to glue to changed between the XULRunner 10 and
-	 * 24 releases.  However it's not possible to programmatically know the version
-	 * of a XULRunner that's being used before it has been glued.  To determine the
-	 * appropriate Gecko library name to return, look for the presence of an "xpcom"
-	 * library in the mozilla path, which is present in all supported XULRunner releases
-	 * prior to XULRunner 24.  If this library is there then return it, and if it's not
-	 * there then assume that XULRunner 24 is being used and return the new library name
-	 * instead ("xul").
-	 */
-	if (IsXULRunner24 == null) { /* IsXULRunner24 not yet initialized */
-		IsXULRunner24 = new File (mozillaPath, LIB_XPCOM).exists () ? Boolean.FALSE : Boolean.TRUE;
-	}
-	return IsXULRunner24.booleanValue () ? LIB_XUL : LIB_XPCOM;
-}
-
-static String getProfilePath () {
-	String baseDir = System.getProperty ("user.home"); //$NON-NLS-1$
-
-	/*
-	 * Bug in Sun JRE.  Under some circumstances the value of java property "user.home" is
-	 * "?", even when the HOME environment variable has a valid value.  If this happens
-	 * then attempt to read the value from the environment directly.
-	 */
-	if (baseDir.equals ("?")) { //$NON-NLS-1$
-		long /*int*/ ptr = C.getenv (wcsToMbcs (null, "HOME", true)); //$NON-NLS-1$
-		if (ptr != 0) {
-			int length = C.strlen (ptr);
-			byte[] bytes = new byte[length];
-			C.memmove (bytes, ptr, length);
-			baseDir = new String (mbcsToWcs (null, bytes));
-		}
-	}
-
-	return baseDir + Mozilla.SEPARATOR_OS + ".mozilla" + Mozilla.SEPARATOR_OS + "eclipse"; //$NON-NLS-1$ //$NON-NLS-2$
-}
-
-static String getSWTInitLibraryName () {
-	return "swt-xpcominit"; //$NON-NLS-1$
-}
-
-static void loadAdditionalLibraries (String mozillaPath, boolean isGlued) {
-	/*
-	 * This function is invoked twice, once before gluing (the fix library for
-	 * XULRunner 24/XULRunner 31, if appropriate, must be loaded before attempting to glue),
-	 * and once after gluing (to load the XULRunner 10 fix library, if appropriate).
-	 */
-	String libName = null;
-	if (!isGlued) {
-		if (IsXULRunner24 == null) { /* IsXULRunner24 not yet initialized */
-			IsXULRunner24 = new File (mozillaPath, LIB_XPCOM).exists () ? Boolean.FALSE : Boolean.TRUE;
-		}
-		if (IsXULRunner24.booleanValue ()) {
-			/*
-			* Works around https://bugzilla.mozilla.org/show_bug.cgi?id=720682
-			* and https://bugzilla.mozilla.org/show_bug.cgi?id=763327.
-			*/
-			/*
-			 * LIB_FIX_XULRUNNER31 is built against XULRunner 31 SDK and it is used as the fix library
-			 * for both XULRunner 24 and XULRunner 31.
-			 */
-			libName = LIB_FIX_XULRUNNER31;
-		}
-	} else {
-		/*
-		* This is the second invocation of loadAdditionalLibraries(), so the
-		* specific xulrunner runtime version is now better known.
-		*/
-		if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10, true)) {
-			/* works around https://bugzilla.mozilla.org/show_bug.cgi?id=720682 */
-			libName = LIB_FIX_XULRUNNER10;
-		}
-	}
-
-	if (libName == null) return;
-
-	File libsDir = new File (getProfilePath () + "/libs/" + Mozilla.OS () + '/' + Mozilla.Arch ()); //$NON-NLS-1$
-	File file = new File (libsDir, libName);
-	if (!file.exists()) {
-		java.io.InputStream is = Library.class.getResourceAsStream ('/' + libName);
-		if (is != null) {
-			if (!libsDir.exists ()) {
-				libsDir.mkdirs ();
-			}
-			int read;
-			byte [] buffer = new byte [4096];
-			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) {
-			}
-		}
-	}
-	if (file.exists ()) {
-		byte[] bytes = Converter.wcsToMbcs (file.getAbsolutePath (), true);
-		OS.dlopen (bytes, OS.RTLD_NOW | OS.RTLD_GLOBAL);
-	}
-}
-
-static char[] mbcsToWcs (String codePage, byte [] buffer) {
-	return Converter.mbcsToWcs (buffer);
-}
-
-static boolean needsSpinup () {
-	return true;
-}
-
-static byte[] wcsToMbcs (String codePage, String string, boolean terminate) {
-	return Converter.wcsToMbcs (string, terminate);
-}
-
-void addWindowSubclass () {
-}
-
-int createBaseWindow (nsIBaseWindow baseWindow) {
-	return baseWindow.Create ();
-}
-
-long /*int*/ getHandle () {
-	/*
-	* Bug in Mozilla Linux GTK.  Embedding Mozilla into a GtkFixed
-	* handle causes problems with some Mozilla plug-ins.  For some
-	* reason, the Flash plug-in causes the child of the GtkFixed
-	* handle to be resized to 1 when the Flash document is loaded.
-	* That could be due to gtk_container_resize_children being called
-	* by Mozilla - or one of its plug-ins - on the GtkFixed handle,
-	* causing the child of the GtkFixed handle to be resized to 1.
-	* The workaround is to embed Mozilla into a GtkHBox handle.
-	*/
-	if (OS.GTK3) {
-		embedHandle = OS.gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, 0);
-		OS.gtk_box_set_homogeneous (embedHandle, false);
-	} else {
-		embedHandle = OS.gtk_hbox_new (false, 0);
-	}
-	OS.gtk_container_add (browser.handle, embedHandle);
-	OS.gtk_widget_show (embedHandle);
-	return embedHandle;
-}
-
-Point getNativeSize (int width, int height) {
-	return new Point (width, height);
-}
-
-long /*int*/ getSiteWindow () {
-	return embedHandle;
-}
-
-long /*int*/ gtk_event (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {
-	GdkEvent event = new GdkEvent ();
-	OS.memmove (event, gdkEvent, GdkEvent.sizeof);
-	if (event.type == OS.GDK_BUTTON_PRESS) {
-		if (!hasFocus) browser.setFocus ();
-	}
-
-	/*
-	* Stop the propagation of events that are not consumed by Mozilla, before
-	* they reach the parent embedder.  These event have already been received.
-	*/
-	if (pointer == STOP_PROPOGATE) return 1;
-	return 0;
-}
-
-void handleFocus () {
-	if (hasFocus) return;
-	hasFocus = true;
-	listener = new Listener () {
-		@Override
-		public void handleEvent (Event event) {
-			if (event.widget == browser) return;
-			if (event.type != SWT.Dispose) {
-				((Mozilla)browser.webBrowser).Deactivate ();
-				hasFocus = false;
-			}
-			eventShell.getDisplay ().removeFilter (SWT.FocusIn, this);
-			eventShell.removeListener (SWT.Deactivate, this);
-			eventShell.removeListener (SWT.Dispose, this);
-			eventShell = null;
-			listener = null;
-		}
-	};
-	eventShell = browser.getShell ();
-	eventShell.getDisplay ().addFilter (SWT.FocusIn, listener);
-	eventShell.addListener (SWT.Deactivate, listener);
-	eventShell.addListener (SWT.Dispose, listener);
-}
-
-void handleMouseDown () {
-	int shellStyle = browser.getShell ().getStyle ();
-	if ((shellStyle & SWT.ON_TOP) != 0 && (((shellStyle & SWT.NO_FOCUS) == 0) || ((browser.getStyle () & SWT.NO_FOCUS) == 0))) {
-		browser.getDisplay ().asyncExec (() -> {
-			if (browser == null || browser.isDisposed ()) return;
-			((Mozilla)browser.webBrowser).Activate ();
-		});
-	}
-}
-
-boolean hookEnterExit () {
-	return false;
-}
-
-void init () {
-	if (eventCallback == null) {
-		eventCallback = new Callback (getClass (), "eventProc", 3); //$NON-NLS-1$
-		eventProc = eventCallback.getAddress ();
-		if (eventProc == 0) {
-			browser.dispose ();
-			Mozilla.error (SWT.ERROR_NO_MORE_CALLBACKS);
-		}
-	}
-
-	/*
-	* Feature in Mozilla.  GtkEvents such as key down, key pressed may be consumed
-	* by Mozilla and never be received by the parent embedder.  The workaround
-	* is to find the top Mozilla gtk widget that receives all the Mozilla GtkEvents,
-	* i.e. the first child of the parent embedder. Then hook event callbacks and
-	* forward the event to the parent embedder before Mozilla received and consumed
-	* them.
-	*/
-	long /*int*/ list = OS.gtk_container_get_children (embedHandle);
-	if (list != 0) {
-		mozillaHandle = OS.g_list_data (list);
-		OS.g_list_free (list);
-
-		if (mozillaHandle != 0) {
-			/* Note. Callback to get events before Mozilla receives and consumes them. */
-			OS.g_signal_connect (mozillaHandle, OS.event, eventProc, 0);
-
-			/*
-			* Note.  Callback to get the events not consumed by Mozilla - and to block
-			* them so that they don't get propagated to the parent handle twice.
-			* This hook is set after Mozilla and is therefore called after Mozilla's
-			* handler because GTK dispatches events in their order of registration.
-			*/
-			OS.g_signal_connect (mozillaHandle, OS.key_press_event, eventProc, STOP_PROPOGATE);
-			OS.g_signal_connect (mozillaHandle, OS.key_release_event, eventProc, STOP_PROPOGATE);
-			OS.g_signal_connect (mozillaHandle, OS.button_press_event, eventProc, STOP_PROPOGATE);
-		}
-	}
-}
-
-void onDispose (long /*int*/ embedHandle) {
-	if (listener != null) {
-		eventShell.getDisplay ().removeFilter (SWT.FocusIn, listener);
-		eventShell.removeListener (SWT.Deactivate, listener);
-		eventShell.removeListener (SWT.Dispose, listener);
-		eventShell = null;
-		listener = null;
-	}
-	browser = null;
-}
-
-void removeWindowSubclass () {
-}
-
-boolean sendTraverse () {
-	return true;
-}
-
-void setSize (long /*int*/ embedHandle, int width, int height) {
-	width = DPIUtil.autoScaleUp(width);
-	height = DPIUtil.autoScaleUp(height);
-	OS.gtk_widget_set_size_request (embedHandle, width, height);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
deleted file mode 100644
index ad04b63092..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2016 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
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import java.io.*;
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.internal.win32.*;
-import org.eclipse.swt.widgets.*;
-
-class MozillaDelegate {
-	Browser browser;
-	List<Composite> childWindows = new ArrayList<> (9);
-	static long /*int*/ MozillaProc;
-	static Callback SubclassProc;
-
-	static Boolean IsXULRunner24;
-	static final String LIB_XPCOM = "xpcom.dll"; //$NON-NLS-1$
-	static final String LIB_XUL = "xul.dll"; //$NON-NLS-1$
-
-MozillaDelegate (Browser browser) {
-	super ();
-	this.browser = browser;
-}
-
-static Browser findBrowser (long /*int*/ handle) {
-	Display display = Display.getCurrent ();
-	return (Browser)display.findWidget (handle);
-}
-
-static String getCacheParentPath () {
-	/* Use the character encoding for the default locale */
-	TCHAR buffer = new TCHAR (0, OS.MAX_PATH);
-	if (OS.SHGetFolderPath (0, OS.CSIDL_LOCAL_APPDATA, 0, OS.SHGFP_TYPE_CURRENT, buffer) == OS.S_OK) {
-		return buffer.toString (0, buffer.strlen ()) + Mozilla.SEPARATOR_OS + "eclipse"; //$NON-NLS-1$
-	}
-	return getProfilePath ();
-}
-
-static String[] getJSLibraryNames () {
-	return new String[] {"mozjs.dll", "xul.dll"}; //$NON-NLS-1$ //$NON-NLS-2$
-}
-
-static String getJSLibraryName_Pre10 () {
-	return "js3250.dll"; //$NON-NLS-1$
-}
-
-static String getLibraryName (String mozillaPath) {
-	/*
-	 * The name of the Gecko library to glue to changed between the XULRunner 10 and
-	 * 24 releases.  However it's not possible to programmatically know the version
-	 * of a XULRunner that's being used before it has been glued.  To determine the
-	 * appropriate Gecko library name to return, look for the presence of an "xpcom"
-	 * library in the mozilla path, which is present in all supported XULRunner releases
-	 * prior to XULRunner 24.  If this library is there then return it, and if it's not
-	 * there then assume that XULRunner 24 is being used and return the new library name
-	 * instead ("xul").
-	 */
-	if (IsXULRunner24 == null) { /* IsXULRunner24 not yet initialized */
-		IsXULRunner24 = new File (mozillaPath, LIB_XPCOM).exists () ? Boolean.FALSE : Boolean.TRUE;
-	}
-	return IsXULRunner24.booleanValue () ? LIB_XUL : LIB_XPCOM;
-}
-
-static String getProfilePath () {
-	String baseDir;
-	/* Use the character encoding for the default locale */
-	TCHAR buffer = new TCHAR (0, OS.MAX_PATH);
-	if (OS.SHGetFolderPath (0, OS.CSIDL_APPDATA, 0, OS.SHGFP_TYPE_CURRENT, buffer) == OS.S_OK) {
-		baseDir = buffer.toString (0, buffer.strlen ());
-	} else {
-		baseDir = System.getProperty("user.home"); //$NON-NLS-1$
-	}
-	return baseDir + Mozilla.SEPARATOR_OS + "Mozilla" + Mozilla.SEPARATOR_OS + "eclipse"; //$NON-NLS-1$ //$NON-NLS-2$
-}
-
-static String getSWTInitLibraryName () {
-	return "swt-xulrunner"; //$NON-NLS-1$
-}
-
-static void loadAdditionalLibraries (String mozillaPath, boolean isGlued) {
-}
-
-static char[] mbcsToWcs (String codePage, byte[] buffer) {
-	char[] chars = new char[buffer.length];
-	int charCount = OS.MultiByteToWideChar (OS.CP_ACP, OS.MB_PRECOMPOSED, buffer, buffer.length, chars, chars.length);
-	if (charCount == chars.length) return chars;
-	char[] result = new char[charCount];
-	System.arraycopy (chars, 0, result, 0, charCount);
-	return result;
-}
-
-static boolean needsSpinup () {
-	return false;
-}
-
-static byte[] wcsToMbcs (String codePage, String string, boolean terminate) {
-	int byteCount;
-	char[] chars = new char[string.length()];
-	string.getChars (0, chars.length, chars, 0);
-	byte[] bytes = new byte[byteCount = chars.length * 2 + (terminate ? 1 : 0)];
-	byteCount = OS.WideCharToMultiByte (OS.CP_ACP, 0, chars, chars.length, bytes, byteCount, null, null);
-	if (terminate) {
-		byteCount++;
-	} else {
-		if (bytes.length != byteCount) {
-			byte[] result = new byte[byteCount];
-			System.arraycopy (bytes, 0, result, 0, byteCount);
-			bytes = result;
-		}
-	}
-	return bytes;
-}
-
-static long /*int*/ windowProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) {
-	switch ((int)/*64*/msg) {
-		case OS.WM_UPDATEUISTATE:
-			/*
-			 * In XULRunner 17, calling the default windowProc for WM_UPDATEUISTATE message
-			 * terminates the program. Workaround is to prevent the call to default windowProc.
-			 */
-			return 0;
-		case OS.WM_ERASEBKGND:
-			RECT rect = new RECT ();
-			OS.GetClientRect (hwnd, rect);
-			OS.FillRect (wParam, rect, OS.GetSysColorBrush (OS.COLOR_WINDOW));
-			break;
-	}
-	return OS.CallWindowProc (MozillaProc, hwnd, (int)/*64*/msg, wParam, lParam);
-}
-
-void addWindowSubclass () {
-	long /*int*/ hwndChild = OS.GetWindow (browser.handle, OS.GW_CHILD);
-	if (SubclassProc == null) {
-		SubclassProc = new Callback (MozillaDelegate.class, "windowProc", 4); //$NON-NLS-1$
-		MozillaProc = OS.GetWindowLongPtr (hwndChild, OS.GWL_WNDPROC);
-	}
-	OS.SetWindowLongPtr (hwndChild, OS.GWL_WNDPROC, SubclassProc.getAddress ());
-}
-
-int createBaseWindow (nsIBaseWindow baseWindow) {
-	return baseWindow.Create ();
-}
-
-long /*int*/ getHandle () {
-	return browser.handle;
-}
-
-Point getNativeSize (int width, int height) {
-	return new Point (width, height);
-}
-
-long /*int*/ getSiteWindow () {
-	/*
-	* As of XULRunner 4, XULRunner's printing facilities on Windows destroy
-	* the HWND that is returned from here once the print dialog is dismissed
-	* (originating bug: https://bugzilla.mozilla.org/show_bug.cgi?id=588735 ).
-	* For this scenario it is now expected that the handle that is returned
-	* here is a child of the browser handle, not the browser handle itself.
-	*
-	* The other scenario that requests this handle is the Mozilla.getBrowser()
-	* implementation.  This method's GetSiteWindow() invocation is surrounded
-	* by boolean flags to help differentiate it from the printing scenario,
-	* since Mozilla.getBrowser() does not destroy the handle it receives back.
-	*
-	* All children that are created here are stored and then destroyed once
-	* the current page is left.  This is guard code that should only be needed
-	* if Mozilla.getSiteWindow() is ever invoked by a path other than one of
-	* the two described above.
-	*/
-	if (!MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10) || Mozilla.IsGettingSiteWindow) {
-		return getHandle ();
-	}
-
-	Composite child = new Composite (browser, SWT.NONE);
-	childWindows.add (child);
-	return child.handle;
-}
-
-void handleFocus () {
-}
-
-void handleMouseDown () {
-}
-
-boolean hookEnterExit () {
-	return true;
-}
-
-void init () {
-	if (MozillaVersion.CheckVersion (MozillaVersion.VERSION_XR10)) {
-		/*
-		* In XULRunner versions > 4, sending WM_GETDLGCODE to a WM_KEYDOWN's MSG hwnd answers 0
-		* instead of the expected DLGC_WANTALLKEYS.  This causes the default traversal framework
-		* perform traversals outside of the Browser when it should not.  Hook a Traverse listener
-		* to work around these problems.
-		*/
-		browser.addListener (SWT.Traverse, event -> {
-			switch (event.detail) {
-				case SWT.TRAVERSE_RETURN: {
-					/* always veto the traversal */
-					event.doit = false;
-					break;
-				}
-				case SWT.TRAVERSE_TAB_NEXT:
-				case SWT.TRAVERSE_TAB_PREVIOUS: {
-					/* veto the traversal whenever an element in the browser has focus */
-					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_FOCUSMANAGER_CONTRACTID, true);
-					rc = serviceManager.GetServiceByContractID (aContractID, IIDStore.GetIID (nsIFocusManager.class, MozillaVersion.VERSION_XR10), result);
-					serviceManager.Release ();
-
-					if (rc == XPCOM.NS_OK && result[0] != 0) {
-						nsIFocusManager focusManager = new nsIFocusManager (result[0]);
-						result[0] = 0;
-						rc = focusManager.GetFocusedElement (result);
-						focusManager.Release ();
-						event.doit = result[0] == 0;
-						if (rc == XPCOM.NS_OK && result[0] != 0) {
-							new nsISupports (result[0]).Release ();
-						}
-					}
-					break;
-				}
-			}
-		});
-
-		/* children created in getSiteHandle() should be destroyed whenever a page is left */
-		browser.addLocationListener (new LocationAdapter () {
-			@Override
-			public void changing (LocationEvent event) {
-				Iterator<Composite> it = childWindows.iterator ();
-				while (it.hasNext ()) {
-					it.next ().dispose ();
-				}
-				childWindows.clear ();
-			}
-		});
-	}
-}
-
-void onDispose (long /*int*/ embedHandle) {
-	if (SubclassProc == null) return;
-	long /*int*/ hwndChild = OS.GetWindow (browser.handle, OS.GW_CHILD);
-	OS.SetWindowLongPtr (hwndChild, OS.GWL_WNDPROC, MozillaProc);
-	childWindows = null;
-	browser = null;
-}
-
-void removeWindowSubclass () {
-	long /*int*/ hwndChild = OS.GetWindow (browser.handle, OS.GW_CHILD);
-	if (SubclassProc != null) {
-		OS.SetWindowLongPtr (hwndChild, OS.GWL_WNDPROC, MozillaProc);
-	}
-}
-
-boolean sendTraverse () {
-	return false;
-}
-
-void setSize (long /*int*/ embedHandle, int width, int height) {
-}
-}
diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
index b7f212e873..04fe47182d 100644
--- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.swt; singleton:=true
 Bundle-Version: 3.106.100.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
-DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom
+DynamicImport-Package: org.eclipse.swt.accessibility2
 Export-Package: 
  org.eclipse.swt,
  org.eclipse.swt.accessibility,
diff --git a/bundles/org.eclipse.swt/META-INF/p2.inf b/bundles/org.eclipse.swt/META-INF/p2.inf
index 2b86ddcc2b..f15d59655d 100644
--- a/bundles/org.eclipse.swt/META-INF/p2.inf
+++ b/bundles/org.eclipse.swt/META-INF/p2.inf
@@ -1,47 +1,41 @@
 requires.1.namespace=java.package
-requires.1.name=org.mozilla.xpcom
+requires.1.name=org.eclipse.swt.accessibility2
 requires.1.optional=true
 requires.1.greedy=false
 requires.1.range=0.0.0
 
-requires.2.namespace=java.package
-requires.2.name=org.eclipse.swt.accessibility2
-requires.2.optional=true
-requires.2.greedy=false
-requires.2.range=0.0.0
-
 # ensure that the applicable implementation fragment gets installed (bug 361901)
+requires.2.namespace = org.eclipse.equinox.p2.iu
+requires.2.name = org.eclipse.swt.win32.win32.x86
+requires.2.range = [$version$,$version$]
+requires.2.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true)))
+
 requires.3.namespace = org.eclipse.equinox.p2.iu
-requires.3.name = org.eclipse.swt.win32.win32.x86
+requires.3.name = org.eclipse.swt.win32.win32.x86_64
 requires.3.range = [$version$,$version$]
-requires.3.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true)))
+requires.3.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
 
 requires.4.namespace = org.eclipse.equinox.p2.iu
-requires.4.name = org.eclipse.swt.win32.win32.x86_64
+requires.4.name = org.eclipse.swt.gtk.linux.x86
 requires.4.range = [$version$,$version$]
-requires.4.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
+requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true)))
 
 requires.5.namespace = org.eclipse.equinox.p2.iu
-requires.5.name = org.eclipse.swt.gtk.linux.x86
+requires.5.name = org.eclipse.swt.cocoa.macosx.x86_64
 requires.5.range = [$version$,$version$]
-requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true)))
+requires.5.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
 
 requires.6.namespace = org.eclipse.equinox.p2.iu
-requires.6.name = org.eclipse.swt.cocoa.macosx.x86_64
+requires.6.name = org.eclipse.swt.gtk.linux.ppc64
 requires.6.range = [$version$,$version$]
-requires.6.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
+requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
 
 requires.7.namespace = org.eclipse.equinox.p2.iu
-requires.7.name = org.eclipse.swt.gtk.linux.ppc64
+requires.7.name = org.eclipse.swt.gtk.linux.x86_64
 requires.7.range = [$version$,$version$]
-requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
+requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
 
 requires.8.namespace = org.eclipse.equinox.p2.iu
-requires.8.name = org.eclipse.swt.gtk.linux.x86_64
+requires.8.name = org.eclipse.swt.gtk.linux.ppc64le
 requires.8.range = [$version$,$version$]
-requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
-
-requires.9.namespace = org.eclipse.equinox.p2.iu
-requires.9.name = org.eclipse.swt.gtk.linux.ppc64le
-requires.9.range = [$version$,$version$]
-requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
index 7588559786..ca3a1fc8b8 100644
--- a/bundles/org.eclipse.swt/buildFragment.xml
+++ b/bundles/org.eclipse.swt/buildFragment.xml
@@ -142,8 +142,6 @@
 			<fileset dir="${plugindir}/Eclipse SWT WebKit/cocoa/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Browser/cocoa/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Mozilla/cocoa/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Drag and Drop/cocoa/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Drag and Drop/common/"/>
@@ -156,7 +154,6 @@
 			<fileset dir="${plugindir}/Eclipse SWT Printing/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Program/cocoa/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Program/common/"/>
-			<fileset dir="${plugindir}/components/" excludes="**/*.idl" />
 		</copy>
 		<antcall target="copy.translationfiles"/>
 		<antcall target="replace64"/>
@@ -179,8 +176,6 @@
 			<fileset dir="${plugindir}/Eclipse SWT AWT/gtk/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Browser/gtk/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Mozilla/gtk/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Drag and Drop/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Drag and Drop/gtk/"/>
@@ -196,7 +191,6 @@
 			<fileset dir="${plugindir}/Eclipse SWT Program/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Program/gtk/"/>
 			<fileset dir="${plugindir}/Eclipse SWT WebKit/gtk/"/>
-			<fileset dir="${plugindir}/components/" excludes="**/*.idl" />
 		</copy>
 		<antcall target="copy.translationfiles"/>
 		<antcall target="replace64"/>
@@ -215,8 +209,6 @@
 			<fileset dir="${plugindir}/Eclipse SWT AWT/win32/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Browser/win32/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Mozilla/win32/"/>
 			<fileset dir="${plugindir}/Eclipse SWT WebKit/win32/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Drag and Drop/common/"/>
@@ -231,7 +223,6 @@
 			<fileset dir="${plugindir}/Eclipse SWT Printing/win32/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Program/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Program/win32/"/>
-			<fileset dir="${plugindir}/components/" excludes="**/*.idl" />
 		</copy>
 		<antcall target="copy.translationfiles"/>
 		<antcall target="replace64"/>
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 89c445fb95..0f5519d923 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -36,7 +36,7 @@
 	<property name="repo.src" value="../../../eclipse.platform.swt"/>
 	<property name="repo.bin" value="../../../eclipse.platform.swt.binaries"/>
 
-	<property name="src_common" value="'bundles/org.eclipse.swt/Eclipse SWT/common/library' 'bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/common/library'"/>
+	<property name="src_common" value="'bundles/org.eclipse.swt/Eclipse SWT/common/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/common/library'"/>
 	<property name="src_win32" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library'"/>
 	<property name="src_gtk" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library' "/>
 	<property name="src_cocoa" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library'"/>
@@ -769,7 +769,6 @@
 		<fileset id="addid" dir="${repo.bin}">
 			<include name="bundles/*/*${swt_version}*"/>
 			<include name="bundles/*/build.sha1"/>
-			<include name="bundles/*/*xulrunner-fix*"/>
 			<exclude name="**/.git/**"/>
 			<exclude name="**/tmpdir/**"/>
 		</fileset>
diff --git a/bundles/org.eclipse.swt/components/chrome.manifest b/bundles/org.eclipse.swt/components/chrome.manifest
deleted file mode 100644
index 5421a52c1b..0000000000
--- a/bundles/org.eclipse.swt/components/chrome.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-interfaces components/swt.xpt
-component {0aebcff1-f7b3-4522-a64b-1706d65dc232} components/swt.js
-contract @eclipse.org/execute;1 {0aebcff1-f7b3-4522-a64b-1706d65dc232}
diff --git a/bundles/org.eclipse.swt/components/swt.idl b/bundles/org.eclipse.swt/components/swt.idl
deleted file mode 100644
index 744625c4fa..0000000000
--- a/bundles/org.eclipse.swt/components/swt.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2014 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
- *    Neil Rashbrook <neil@parkwaycc.co.uk> - Bug 429739
- *******************************************************************************/
-
-// to compile: xpidl -m typelib -I S:\swt-builddir\gecko-sdk\idl\ -e swt.xpt swt.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);
-};
diff --git a/bundles/org.eclipse.swt/components/swt.js b/bundles/org.eclipse.swt/components/swt.js
deleted file mode 100644
index 8b120b69de..0000000000
--- a/bundles/org.eclipse.swt/components/swt.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Neil Rashbrook 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:
- *    Neil Rashbrook <neil@parkwaycc.co.uk> - Bug 429739
- *******************************************************************************/
-
-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) {
-    var window = XPCNativeWrapper.unwrap(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]);
diff --git a/bundles/org.eclipse.swt/components/swt.xpt b/bundles/org.eclipse.swt/components/swt.xpt
deleted file mode 100644
index 6f6aca78e4..0000000000
--- a/bundles/org.eclipse.swt/components/swt.xpt
+++ /dev/null