Make 64-bit the default source code

138 files changed, 2683 insertions, 2683 deletions

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
index 2be80e937b..4781d213f2 100644
--- 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
@@ -47,7 +47,7 @@ AppFileLocProvider (String mozillaPath, String profilePath, String cacheParentPa
 	this.cacheParentPath = cacheParentPath;
 	this.isXULRunner = isXULRunner;
 	if (!Compatibility.fileExists (profilePath, "")) { //$NON-NLS-1$
-		int /*long*/[] result = new int /*long*/[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);
@@ -70,24 +70,24 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	directoryServiceProvider = new XPCOMObject (new int[] {2, 0, 0, 3}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return getFile (args[0], args[1], args[2]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return getFile (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return getFiles (args[0], args[1]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return getFile (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return getFiles (args[0], args[1]);}
 	};
 }
 
@@ -106,32 +106,32 @@ void disposeCOMInterfaces () {
 	}	
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return directoryServiceProvider.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIDirectoryServiceProvider.NS_IDIRECTORYSERVICEPROVIDER_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIDirectoryServiceProvider2.NS_IDIRECTORYSERVICEPROVIDER2_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {directoryServiceProvider2.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider2.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
@@ -143,7 +143,7 @@ int Release () {
 
 /* nsIDirectoryServiceProvider2 */
 
-int getFiles (int /*long*/ prop, int /*long*/ _retval) {
+int getFiles (long /*int*/ prop, long /*int*/ _retval) {
 	int size = XPCOM.strlen (prop);
 	byte[] bytes = new byte[size];
 	XPCOM.memmove (bytes, prop, size);
@@ -154,7 +154,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
 		if (pluginDirs == null) {
 			int index = 0;
 			/* set the first value(s) to the MOZ_PLUGIN_PATH environment variable value if it's defined */
-			int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true));
+			long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true));
 			if (ptr != 0) {
 				int length = C.strlen (ptr);
 				byte[] buffer = new byte[length];
@@ -205,9 +205,9 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
 		propertyValues = pluginDirs;
 	}
 
-	XPCOM.memmove(_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove(_retval, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	if (propertyValues != null) {
-		int /*long*/[] result = new int /*long*/[1];
+		long /*int*/[] result = new long /*int*/[1];
 		nsISupports[] files = new nsISupports [propertyValues.length];
 		int index = 0;
 		for (int i = 0; i < propertyValues.length; i++) {
@@ -241,7 +241,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
 
 		SimpleEnumerator enumerator = new SimpleEnumerator (files);
 		enumerator.AddRef ();
-		XPCOM.memmove (_retval, new int /*long*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (_retval, new long /*int*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF);
 		return XPCOM.NS_OK;
 	}
 
@@ -250,7 +250,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
 	
 /* nsIDirectoryServiceProvider implementation */
 
-int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
+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);
@@ -304,9 +304,9 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
 	}
 
 	XPCOM.memmove (persistent, new boolean[] {true});
-	XPCOM.memmove (_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (_retval, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	if (propertyValue != null && propertyValue.length () > 0) {
-		int /*long*/[] result = new int /*long*/[1];
+		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);
@@ -319,7 +319,7 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
 		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 		if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
 
-		XPCOM.memmove (_retval, new int /*long*/[] {result[0]}, C.PTR_SIZEOF);
+		XPCOM.memmove (_retval, new long /*int*/[] {result[0]}, C.PTR_SIZEOF);
 		localFile.Release ();
 		return XPCOM.NS_OK;
 	}
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
index c97c08a330..d4a05b68fe 100644
--- 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
@@ -46,63 +46,63 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
-		public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
-		public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
+		public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
+		public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
+		public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
+		public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
-		public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
-		public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
-		public int /*long*/ method16 (int /*long*/[] args) {return Open (args[0]);}
-		public int /*long*/ method17 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-		public int /*long*/ method18 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-		public int /*long*/ method19 (int /*long*/[] args) {return GetDialog (args[0]);}
-		public int /*long*/ method20 (int /*long*/[] args) {return SetDialog (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
+		public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
+		public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
+		public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
+		public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
+		public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
+		public long /*int*/ method16 (long /*int*/[] args) {return Open (args[0]);}
+		public long /*int*/ method17 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
+		public long /*int*/ method18 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
+		public long /*int*/ method19 (long /*int*/[] args) {return GetDialog (args[0]);}
+		public long /*int*/ method20 (long /*int*/[] args) {return SetDialog (args[0]);}
 	};
 	
 	webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+		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]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
 	};
 }
 
@@ -125,36 +125,36 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return progressDialog.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIDownload.NS_IDOWNLOAD_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIProgressDialog.NS_IPROGRESSDIALOG_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -167,13 +167,13 @@ int Release () {
 /* nsIDownload */
 
 /* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aPersist) {
+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);
-	int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+	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);
-	int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+	long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
 	byte[] dest = new byte[length];
 	XPCOM.memmove (dest, buffer, length);
 	XPCOM.nsEmbedCString_delete (aSpec);
@@ -186,12 +186,12 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
 	*/
 	String filename = null;
 	nsISupports supports = new nsISupports (aTarget);
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	rc = supports.QueryInterface (!Mozilla.IsPre_4 ? nsIURI.NS_IURI_10_IID : nsIURI.NS_IURI_IID, result);
 	if (rc == XPCOM.NS_OK) {	/* >= 1.7 */
 		nsIURI target = new nsIURI (result[0]);
 		result[0] = 0;
-		int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
+		long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
 		rc = target.GetPath (aPath);
 		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 		length = XPCOM.nsEmbedCString_Length (aPath);
@@ -205,7 +205,7 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
 		target.Release ();
 	} else {	/* < 1.7 */
 		nsILocalFile target = new nsILocalFile (aTarget);
-		int /*long*/ aNativeTarget = XPCOM.nsEmbedString_new ();
+		long /*int*/ aNativeTarget = XPCOM.nsEmbedString_new ();
 		rc = target.GetLeafName (aNativeTarget);
 		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 		length = XPCOM.nsEmbedString_Length (aNativeTarget);
@@ -259,54 +259,54 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
 	return XPCOM.NS_OK;
 }
 
-int GetSource (int /*long*/ aSource) {
+int GetSource (long /*int*/ aSource) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetTarget (int /*long*/ aTarget) {
+int GetTarget (long /*int*/ aTarget) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetPersist (int /*long*/ aPersist) {
+int GetPersist (long /*int*/ aPersist) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetPercentComplete (int /*long*/ aPercentComplete) {
+int GetPercentComplete (long /*int*/ aPercentComplete) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetDisplayName (int /*long*/ aDisplayName) {
+int GetDisplayName (long /*int*/ aDisplayName) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int SetDisplayName (int /*long*/ aDisplayName) {
+int SetDisplayName (long /*int*/ aDisplayName) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetStartTime (int /*long*/ aStartTime) {
+int GetStartTime (long /*int*/ aStartTime) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetMIMEInfo (int /*long*/ aMIMEInfo) {
+int GetMIMEInfo (long /*int*/ aMIMEInfo) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetListener (int /*long*/ aListener) {
+int GetListener (long /*int*/ aListener) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int SetListener (int /*long*/ aListener) {
+int SetListener (long /*int*/ aListener) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetObserver (int /*long*/ aObserver) {
+int GetObserver (long /*int*/ aObserver) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int SetObserver (int /*long*/ aObserver) {
+int SetObserver (long /*int*/ aObserver) {
 	if (aObserver != 0) {
 		nsISupports supports = new nsISupports (aObserver);
-		int /*long*/[] result = new int /*long*/[1];
+		long /*int*/[] result = new long /*int*/[1];
 		int rc = supports.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);
 		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 		if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -316,11 +316,11 @@ int SetObserver (int /*long*/ aObserver) {
 }
 
 /* nsIProgressDialog */
-int Open (int /*long*/ aParent) {
+int Open (long /*int*/ aParent) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
+int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
@@ -328,17 +328,17 @@ int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetDialog (int /*long*/ aDialog) {
+int GetDialog (long /*int*/ aDialog) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int SetDialog (int /*long*/ aDialog) {
+int SetDialog (long /*int*/ aDialog) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* nsIWebProgressListener */
 
-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+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;
@@ -348,7 +348,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 	return XPCOM.NS_OK;
 }
 
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+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 ()) {
@@ -361,15 +361,15 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
 	return XPCOM.NS_OK;
 }
 
-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
 	return XPCOM.NS_OK;
 }
 
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
 	return XPCOM.NS_OK;
 }
 
-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
+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
index 901786c1d3..a0e2f2136b 100644
--- 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
@@ -30,17 +30,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
 	};
 }
 
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return factory.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -87,10 +87,10 @@ int Release () {
 	
 /* nsIFactory */
 
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
 	Download download = new Download ();
 	download.AddRef ();
-	XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+	XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
 	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
index 1af00696d7..a6bf534ebe 100644
--- 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
@@ -30,17 +30,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
 	};
 }
 
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return factory.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -87,10 +87,10 @@ int Release () {
 
 /* nsIFactory */
 
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+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 int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+	XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
 	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
index 3ec20e77db..2a2e150866 100644
--- 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
@@ -48,97 +48,97 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-		public int /*long*/ method8 (int /*long*/[] args) {
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+		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]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+		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]);
 			}
 		}
-		public int /*long*/ method9 (int /*long*/[] args) {
+		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]);
 			}
 		}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
-		public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
-		public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
-		public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
-		public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-		public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
-		public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
+		public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
+		public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
+		public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
+		public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
+		public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
+		public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
+		public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
+		public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-		public int /*long*/ method8 (int /*long*/[] args) {
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+		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]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+		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]);
 			}
 		}
-		public int /*long*/ method9 (int /*long*/[] args) {
+		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]);
 			}
 		}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
-		public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
-		public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
-		public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
-		public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-		public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
-		public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-		public int /*long*/ method20 (int /*long*/[] args) {return Open (args[0]);}
-		public int /*long*/ method21 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-		public int /*long*/ method22 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-		public int /*long*/ method23 (int /*long*/[] args) {return GetObserver (args[0]);}
-		public int /*long*/ method24 (int /*long*/[] args) {return SetObserver (args[0]);}
-		public int /*long*/ method25 (int /*long*/[] args) {return GetDialog (args[0]);}
-		public int /*long*/ method26 (int /*long*/[] args) {return SetDialog (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
+		public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
+		public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
+		public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
+		public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
+		public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
+		public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
+		public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
+		public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
+		public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
+		public long /*int*/ method20 (long /*int*/[] args) {return Open (args[0]);}
+		public long /*int*/ method21 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
+		public long /*int*/ method22 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
+		public long /*int*/ method23 (long /*int*/[] args) {return GetObserver (args[0]);}
+		public long /*int*/ method24 (long /*int*/[] args) {return SetObserver (args[0]);}
+		public long /*int*/ method25 (long /*int*/[] args) {return GetDialog (args[0]);}
+		public long /*int*/ method26 (long /*int*/[] args) {return SetDialog (args[0]);}
 	};
 
 	webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+		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]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
 	};
 }
 
@@ -161,36 +161,36 @@ void disposeCOMInterfaces() {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return progressDialog.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIDownload_1_8.NS_IDOWNLOAD_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIProgressDialog_1_8.NS_IPROGRESSDIALOG_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
@@ -203,26 +203,26 @@ int Release () {
 /* nsIDownload */
 
 /* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
-int Init_32 (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aTempFile, int /*long*/ aCancelable) {
+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 (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ 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);
-	int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+	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);
-	int /*long*/ buffer = XPCOM.nsEmbedCString_get (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);
-	int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
+	long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
 	rc = target.GetPath (aPath);
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 	length = XPCOM.nsEmbedCString_Length (aPath);
@@ -277,60 +277,60 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
 	return XPCOM.NS_OK;
 }
 
-int GetAmountTransferred (int /*long*/ arg0) {
+int GetAmountTransferred (long /*int*/ arg0) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetCancelable (int /*long*/ arg0) {
+int GetCancelable (long /*int*/ arg0) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetDisplayName (int /*long*/ aDisplayName) {
+int GetDisplayName (long /*int*/ aDisplayName) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetMIMEInfo (int /*long*/ aMIMEInfo) {
+int GetMIMEInfo (long /*int*/ aMIMEInfo) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetPercentComplete (int /*long*/ aPercentComplete) {
+int GetPercentComplete (long /*int*/ aPercentComplete) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetSize (int /*long*/ arg0) {
+int GetSize (long /*int*/ arg0) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetSource (int /*long*/ aSource) {
+int GetSource (long /*int*/ aSource) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetStartTime (int /*long*/ aStartTime) {
+int GetStartTime (long /*int*/ aStartTime) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetTarget (int /*long*/ aTarget) {
+int GetTarget (long /*int*/ aTarget) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetTargetFile (int /*long*/ arg0) {
+int GetTargetFile (long /*int*/ arg0) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* nsIProgressDialog */
-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
+int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetDialog (int /*long*/ aDialog) {
+int GetDialog (long /*int*/ aDialog) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetObserver (int /*long*/ aObserver) {
+int GetObserver (long /*int*/ aObserver) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int Open (int /*long*/ aParent) {
+int Open (long /*int*/ aParent) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
@@ -338,26 +338,26 @@ int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int SetDialog (int /*long*/ aDialog) {
+int SetDialog (long /*int*/ aDialog) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int SetObserver (int /*long*/ aObserver) {
+int SetObserver (long /*int*/ aObserver) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* nsIWebProgressListener */
 
-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
 	return XPCOM.NS_OK;
 }
 
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+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 (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aCurSelfProgress1, int /*long*/ aCurSelfProgress2, int /*long*/ aMaxSelfProgress1, int /*long*/ aMaxSelfProgress2, int /*long*/ aCurTotalProgress1, int /*long*/ aCurTotalProgress2, int /*long*/ aMaxTotalProgress1, int /*long*/ aMaxTotalProgress2) {
+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;
@@ -365,7 +365,7 @@ int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int
 	return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
 }
 
-int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long 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 ()) {
@@ -378,11 +378,11 @@ int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long a
 	return XPCOM.NS_OK;
 }
 
-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
 	return XPCOM.NS_OK;
 }
 
-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+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 ();
@@ -391,7 +391,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 	return XPCOM.NS_OK;
 }	
 
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
+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
index cd4201ab9f..c4087df868 100644
--- 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
@@ -46,12 +46,12 @@ External () {
  * QueryInterface answers an nsIScriptObjectOwner implementation (which points
  * at this function) iff the detected XULRunner version is >= 4.
  */
-static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ vp) {
+static long /*int*/ callJava (long /*int*/ cx, long /*int*/ argc, long /*int*/ vp) {
 	int jsval_sizeof = 8;
-	int /*long*/ argsPtr = vp + 2 * jsval_sizeof;
+	long /*int*/ argsPtr = vp + 2 * jsval_sizeof;
 	nsIVariant resultVariant = null;
 
-	int /*long*/[] result = new int /*long*/[1];
+	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);
@@ -82,14 +82,14 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
 				argsPtr += jsval_sizeof;
 				rc = connect.JSValToVariant (cx, argsPtr, result);
 				if (rc == XPCOM.NS_OK && result[0] != 0) {
-					int /*long*/ tokenVariant = result[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) {
-						int /*long*/ argsVariant = result[0];
+						long /*int*/ argsVariant = result[0];
 						result[0] = 0;
 
 						/* invoke the BrowserFunction */
@@ -124,14 +124,14 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
 
 	nsIMemory memory = new nsIMemory (result[0]);
 	result[0] = 0;
-	int /*long*/ jsVal = memory.Alloc (jsval_sizeof);
+	long /*int*/ jsVal = memory.Alloc (jsval_sizeof);
 	C.memset (jsVal, 0, jsval_sizeof);
-	int /*long*/ globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx);
+	long /*int*/ globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx);
 	rc = connect.VariantToJS (cx, globalObject, resultVariant.getAddress (), jsVal);
 	resultVariant.Release ();
 	connect.Release ();
 
-	int /*long*/ returnValue = XPCOM.JS_FALSE;
+	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);
@@ -143,9 +143,9 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
 }
 
 /* this is the BrowserFunction entry point when the detected XULRunner version is < 4 */
-static int callJava (int functionId, int /*long*/ tokenVariant, int /*long*/ argsVariant, int /*long*/ returnPtr) {
-	int /*long*/ resultVariant = invokeFunction (functionId, tokenVariant, argsVariant);
-	C.memmove (returnPtr, new int /*long*/[] {resultVariant}, C.PTR_SIZEOF);
+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;
 }
 
@@ -167,7 +167,7 @@ static Object convertToJava (nsIVariant variant, short type) {
 			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 			return new Double (intResult[0]);
 		case nsIDataType.VTYPE_DOUBLE:
-			int /*long*/ doubleReturn = C.malloc (8);
+			long /*int*/ doubleReturn = C.malloc (8);
 			rc = variant.GetAsDouble (doubleReturn);
 			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 			double[] doubleResult = new double[1];
@@ -176,7 +176,7 @@ static Object convertToJava (nsIVariant variant, short type) {
 			return new Double (doubleResult[0]);
 		case nsIDataType.VTYPE_WSTRING_SIZE_IS:
 			int[] size = new int[1]; /* PRInt32 */
-			int /*long*/[] wString = new int /*long*/[1];
+			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]];
@@ -184,11 +184,11 @@ static Object convertToJava (nsIVariant variant, short type) {
 			return new String (chars);
 		case nsIDataType.VTYPE_ARRAY:
 			Object[] arrayReturn = new Object[0];
-			int /*long*/ iid = C.malloc (nsID.sizeof);
+			long /*int*/ iid = C.malloc (nsID.sizeof);
 			C.memset (iid, 0, nsID.sizeof);
 			int[] count = new int[1]; /* PRUint32 */
 			short[] currentType = new short[1];
-			int /*long*/[] ptr = new int /*long*/[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);
@@ -196,7 +196,7 @@ static Object convertToJava (nsIVariant variant, short type) {
 			XPCOM.memmove (id, iid, nsID.sizeof);
 			C.free (iid);
 
-			int /*long*/[] result = new int /*long*/[1];
+			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);
@@ -215,7 +215,7 @@ static Object convertToJava (nsIVariant variant, short type) {
 			if (id.Equals (nsIVariant.NS_IVARIANT_IID) || id.Equals (nsIVariant.NS_IVARIANT_10_IID)) {
 				arrayReturn = new Object[count[0]];
 				for (int i = 0; i < count[0]; i++) {
-					int /*long*/[] arrayPtr = new int /*long*/[1];
+					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);
@@ -267,8 +267,8 @@ static Object convertToJava (nsIVariant variant, short type) {
 					case nsIDataType.VTYPE_WCHAR_STR:
 						arrayReturn = new Object[count[0]];
 						for (int i = 0; i < count[0]; i++) {
-							int /*long*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
-							int /*long*/[] stringPtr = new int /*long*/[1];
+							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];
@@ -291,7 +291,7 @@ static Object convertToJava (nsIVariant variant, short type) {
 }
 
 static nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_VARIANT_CONTRACTID, true);
 	int rc = componentManager.CreateInstanceByContractID (aContractID, 0, nsIWritableVariant.NS_IWRITABLEVARIANT_IID, result);
 	nsIWritableVariant variant = new nsIWritableVariant (result[0]);
@@ -330,26 +330,26 @@ static nsIVariant convertToJS (Object value, nsIComponentManager componentManage
 			rc = variant.SetAsEmptyArray ();
 			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 		} else {
-			int /*long*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
+			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 int /*long*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
+					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++) {
-						int /*long*/[] ptr = new int /*long*/[1];
+						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;
 				}
 			}
-			int /*long*/ idPtr = C.malloc (nsID.sizeof);
+			long /*int*/ idPtr = C.malloc (nsID.sizeof);
 			XPCOM.memmove (idPtr, Mozilla.IsPre_4 ? nsIVariant.NS_IVARIANT_IID : nsIVariant.NS_IVARIANT_10_IID, nsID.sizeof);
 			rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
 			C.free (idPtr);
@@ -364,7 +364,7 @@ static nsIVariant convertToJS (Object value, nsIComponentManager componentManage
 	return null;
 }
 
-static int /*long*/ invokeFunction (int functionId, int /*long*/ tokenVariant, int /*long*/ args) {
+static long /*int*/ invokeFunction (int functionId, long /*int*/ tokenVariant, long /*int*/ args) {
 	Object key = new Integer (functionId);
 	BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);
 	Object returnValue = null;
@@ -405,7 +405,7 @@ static int /*long*/ invokeFunction (int functionId, int /*long*/ tokenVariant, i
 		}
 	}
 
-	int /*long*/[] result = new int /*long*/[1];
+	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);
@@ -431,48 +431,48 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return getInterfaces (args[0], args[1]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return getContractID (args[0]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return getClassDescription (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return getClassID (args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return getImplementationLanguage (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return getFlags (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return getClassIDNoAlloc (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return getInterfaces (args[0], args[1]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return getContractID (args[0]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return getClassDescription (args[0]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return getClassID (args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return getImplementationLanguage (args[0]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return getFlags (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return getClassIDNoAlloc (args[0]);}
 	};
 
 	securityCheckedComponent = new XPCOMObject (new int[] {2, 0, 0, 2, 3, 3, 3}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return canCreateWrapper (args[0], args[1]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return canCallMethod (args[0], args[1], args[2]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return canGetProperty (args[0], args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return canSetProperty (args[0], args[1], args[2]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return canCreateWrapper (args[0], args[1]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return canCallMethod (args[0], args[1], args[2]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return canGetProperty (args[0], args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return canSetProperty (args[0], args[1], args[2]);}
 	};
 
 	external = new XPCOMObject (new int[] {2, 0, 0, 4}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2], args[3]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return getScriptObject (args[0], args[1]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return setScriptObject (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return getScriptObject (args[0], args[1]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return setScriptObject (args[0]);}
 	};
 }
 
@@ -499,45 +499,45 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return external.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIClassInfo.NS_ICLASSINFO_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);
+		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 int /*long*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
+		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 int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
 		AddRef();
 		return XPCOM.NS_OK;
 	}
 
 	if (!Mozilla.IsPre_4) {
 		if (guid.Equals(XPCOM.NS_ISCRIPTOBJECTOWNER_IID)) {
-			XPCOM.memmove (ppvObject, new int /*long*/[] {scriptObjectOwner.getAddress ()}, C.PTR_SIZEOF);
+			XPCOM.memmove (ppvObject, new long /*int*/[] {scriptObjectOwner.getAddress ()}, C.PTR_SIZEOF);
 			AddRef();
 			return XPCOM.NS_OK;
 		}
 	}
 
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
@@ -549,8 +549,8 @@ int Release () {
 
 /* nsIClassInfo */
 
-int getClassDescription (int /*long*/ _retValue) {
-	int /*long*/[] result = new int /*long*/[1];
+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);
@@ -566,43 +566,43 @@ int getClassDescription (int /*long*/ _retValue) {
 	nsIMemory memory = new nsIMemory (result[0]);
 	result[0] = 0;
 	byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
-	int /*long*/ ptr = memory.Alloc (bytes.length);
+	long /*int*/ ptr = memory.Alloc (bytes.length);
 	C.memmove (ptr, bytes, bytes.length);
-	C.memmove (_retValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+	C.memmove (_retValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 	memory.Release ();
 
 	return XPCOM.NS_OK;
 }
 
-int getClassID (int /*long*/ _retValue) {
+int getClassID (long /*int*/ _retValue) {
 	return XPCOM.NS_OK;
 }
 
-int getClassIDNoAlloc (int /*long*/ _retValue) {
+int getClassIDNoAlloc (long /*int*/ _retValue) {
 	return XPCOM.NS_OK;
 }
 
-int getContractID (int /*long*/ _retValue) {
+int getContractID (long /*int*/ _retValue) {
 	return XPCOM.NS_OK;
 }
 
-int getFlags (int /*long*/ flags) {
+int getFlags (long /*int*/ flags) {
 	C.memmove (flags, new int[] {nsIClassInfo.MAIN_THREAD_ONLY}, 4); /* PRUint32 */
 	return XPCOM.NS_OK;
 }
 
-int getHelperForLanguage (int language, int /*long*/ _retValue) {
-	C.memmove (_retValue, new int /*long*/[] {0}, C.PTR_SIZEOF);
+int getHelperForLanguage (int language, long /*int*/ _retValue) {
+	C.memmove (_retValue, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_OK;
 }
 
-int getImplementationLanguage (int /*long*/ _retValue) {
+int getImplementationLanguage (long /*int*/ _retValue) {
 	C.memmove (_retValue, new int[] {5}, 4); /* nsIProgrammingLanguage.JAVA */ /* PRUint */
 	return XPCOM.NS_OK;
 }
 
-int getInterfaces (int /*long*/ count, int /*long*/ array) {
-	int /*long*/[] result = new int /*long*/[1];
+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);
@@ -617,20 +617,20 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
 
 	nsIMemory memory = new nsIMemory (result[0]);
 	result[0] = 0;
-	int /*long*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
+	long /*int*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
 	XPCOM.memmove (securityCheckedComponentIID, XPCOM.NS_ISECURITYCHECKEDCOMPONENT_IID, nsID.sizeof);
-	int /*long*/ externalIID = memory.Alloc (nsID.sizeof);
+	long /*int*/ externalIID = memory.Alloc (nsID.sizeof);
 	XPCOM.memmove (externalIID, EXTERNAL_IID, nsID.sizeof);
-	int /*long*/ ptrArray = memory.Alloc (3 * C.PTR_SIZEOF);
-	C.memmove (ptrArray, new int /*long*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);
-	C.memmove (ptrArray + C.PTR_SIZEOF, new int /*long*/[] {externalIID}, C.PTR_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);
 	
 	nsID NS_ASDF_IID = new nsID("a40ce52e-2d8c-400f-9af2-f8784a656070");
-	int /*long*/ asdfIID = memory.Alloc (nsID.sizeof);
+	long /*int*/ asdfIID = memory.Alloc (nsID.sizeof);
 	XPCOM.memmove (asdfIID, NS_ASDF_IID, nsID.sizeof);
-	C.memmove (ptrArray + 2 * C.PTR_SIZEOF, new int /*long*/[] {asdfIID}, C.PTR_SIZEOF);
+	C.memmove (ptrArray + 2 * C.PTR_SIZEOF, new long /*int*/[] {asdfIID}, C.PTR_SIZEOF);
 
-	C.memmove (array, new int /*long*/[] {ptrArray}, C.PTR_SIZEOF);
+	C.memmove (array, new long /*int*/[] {ptrArray}, C.PTR_SIZEOF);
 	memory.Release ();
 
 	C.memmove (count, new int[] {3}, 4); /* PRUint */
@@ -639,27 +639,27 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
 
 /* nsIScriptObjectOwner */
 
-int getScriptObject (int /*long*/ aContext, int /*long*/ aScriptObject) {
+int getScriptObject (long /*int*/ aContext, long /*int*/ aScriptObject) {
 	byte[] jsLibPath = Mozilla.getJSLibPathBytes ();
-	int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (aContext);
-	int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
-	int /*long*/ newObject = XPCOM.JS_NewObject (jsLibPath, nativeContext, 0, 0, globalJSObject);
+	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); //$NON-NLS-1$
 	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 int /*long*/[] {newObject}, C.PTR_SIZEOF);
+	XPCOM.memmove (aScriptObject, new long /*int*/[] {newObject}, C.PTR_SIZEOF);
 	return XPCOM.NS_OK;
 }
 
-int setScriptObject (int /*long*/ aScriptObject) {
+int setScriptObject (long /*int*/ aScriptObject) {
 	return XPCOM.NS_COMFALSE;
 }
 
 /* nsISecurityCheckedComponent */
 
-int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {
-	int /*long*/[] result = new int /*long*/[1];
+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);
@@ -675,16 +675,16 @@ int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {
 	nsIMemory memory = new nsIMemory (result[0]);
 	result[0] = 0;
 	byte[] bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$
-	int /*long*/ ptr = memory.Alloc (bytes.length);
+	long /*int*/ ptr = memory.Alloc (bytes.length);
 	C.memmove (ptr, bytes, bytes.length);
-	C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+	C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 	memory.Release ();
 
 	return XPCOM.NS_OK;
 }
 
-int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retVal) {
-	int /*long*/[] result = new int /*long*/[1];
+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);
@@ -709,16 +709,16 @@ int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retV
 	} else {
 		bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
 	}
-	int /*long*/ ptr = memory.Alloc (bytes.length);
+	long /*int*/ ptr = memory.Alloc (bytes.length);
 	C.memmove (ptr, bytes, bytes.length);
-	C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+	C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 	memory.Release ();
 
 	return XPCOM.NS_OK;
 }
 
-int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {
-	int /*long*/[] result = new int /*long*/[1];
+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);
@@ -734,16 +734,16 @@ int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r
 	nsIMemory memory = new nsIMemory (result[0]);
 	result[0] = 0;
 	byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
-	int /*long*/ ptr = memory.Alloc (bytes.length);
+	long /*int*/ ptr = memory.Alloc (bytes.length);
 	C.memmove (ptr, bytes, bytes.length);
-	C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+	C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 	memory.Release ();
 
 	return XPCOM.NS_OK;
 }
 
-int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {
-	int /*long*/[] result = new int /*long*/[1];
+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);
@@ -759,9 +759,9 @@ int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r
 	nsIMemory memory = new nsIMemory (result[0]);
 	result[0] = 0;
 	byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
-	int /*long*/ ptr = memory.Alloc (bytes.length);
+	long /*int*/ ptr = memory.Alloc (bytes.length);
 	C.memmove (ptr, bytes, bytes.length);
-	C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+	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
index 84462ec2f0..f90ef3d0e9 100644
--- 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
@@ -30,17 +30,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
 	};
 }
 
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return factory.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
@@ -87,10 +87,10 @@ int Release () {
 
 /* nsIFactory */
 
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
 	External external = new External ();
 	external.AddRef ();
-	XPCOM.memmove (result, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
+	XPCOM.memmove (result, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
 	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
index 0203016cb4..44b9e5fece 100644
--- 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
@@ -21,7 +21,7 @@ class FilePicker {
 
 	int refCount = 0;
 	short mode;
-	int /*long*/ parentHandle;
+	long /*int*/ parentHandle;
 	String[] files, masks;
 	String defaultFilename, directory, title;
 
@@ -39,30 +39,30 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
-		public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
-		public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
-		public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
-		public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
+		public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
+		public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
+		public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
+		public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
+		public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
+		public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
+		public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}
 	};
 }
 
@@ -77,37 +77,37 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return filePicker.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_IID)) {
-		XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_IID)) {
-		XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_10_IID)) {
-		XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
@@ -117,7 +117,7 @@ int Release () {
 	return refCount;
 }
 
-Browser getBrowser (int /*long*/ aDOMWindow) {
+Browser getBrowser (long /*int*/ aDOMWindow) {
 	if (aDOMWindow == 0) return null;
 	return Mozilla.getBrowser (aDOMWindow);
 }
@@ -127,20 +127,20 @@ Browser getBrowser (int /*long*/ aDOMWindow) {
  * answers a java string based on the type of string that is appropriate for the Mozilla
  * version being used.
  */
-String parseAString (int /*long*/ string) {
+String parseAString (long /*int*/ string) {
 	return null;
 }
 
 /* nsIFilePicker */
 
-int Init (int /*long*/ parent, int /*long*/ title, short mode) {
+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 (int /*long*/ _retval) {
+int Show (long /*int*/ _retval) {
 	if (mode == nsIFilePicker.modeGetFolder) {
 		/* picking a directory */
 		int result = showDirectoryPicker ();
@@ -190,20 +190,20 @@ int showDirectoryPicker () {
 	return directory == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;
 }
 
-int GetFiles (int /*long*/ aFiles) {
+int GetFiles (long /*int*/ aFiles) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetFileURL (int /*long*/ aFileURL) {
+int GetFileURL (long /*int*/ aFileURL) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetFile (int /*long*/ aFile) {
+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);
-	int /*long*/[] file = new int /*long*/[1];
+	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);
@@ -212,14 +212,14 @@ int GetFile (int /*long*/ aFile) {
 	return XPCOM.NS_OK;
 }
 
-int SetDisplayDirectory (int /*long*/ aDisplayDirectory) {
+int SetDisplayDirectory (long /*int*/ aDisplayDirectory) {
 	if (aDisplayDirectory == 0) return XPCOM.NS_OK;
 	nsILocalFile file = new nsILocalFile (aDisplayDirectory);
-	int /*long*/ pathname = XPCOM.nsEmbedString_new ();
+	long /*int*/ pathname = XPCOM.nsEmbedString_new ();
 	int rc = file.GetPath (pathname);
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 	int length = XPCOM.nsEmbedString_Length (pathname);
-	int /*long*/ buffer = XPCOM.nsEmbedString_get (pathname);
+	long /*int*/ buffer = XPCOM.nsEmbedString_get (pathname);
 	char[] chars = new char[length];
 	XPCOM.memmove (chars, buffer, length * 2);
 	XPCOM.nsEmbedString_delete (pathname);
@@ -227,10 +227,10 @@ int SetDisplayDirectory (int /*long*/ aDisplayDirectory) {
 	return XPCOM.NS_OK;
 }
 
-int GetDisplayDirectory (int /*long*/ aDisplayDirectory) {
+int GetDisplayDirectory (long /*int*/ aDisplayDirectory) {
 	String directoryName = directory != null ? directory : "";	//$NON-NLS-1$
 	nsEmbedString path = new nsEmbedString (directoryName);
-	int /*long*/[] file = new int /*long*/[1];
+	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);
@@ -243,31 +243,31 @@ int SetFilterIndex (int aFilterIndex) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetFilterIndex (int /*long*/ aFilterIndex) {
+int GetFilterIndex (long /*int*/ aFilterIndex) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int SetDefaultExtension (int /*long*/ aDefaultExtension) {
+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 (int /*long*/ aDefaultExtension) {
+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 (int /*long*/ aDefaultString) {
+int SetDefaultString (long /*int*/ aDefaultString) {
 	defaultFilename = parseAString (aDefaultString);
 	return XPCOM.NS_OK;
 }
 
-int GetDefaultString (int /*long*/ aDefaultString) {
+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 (int /*long*/ title, int /*long*/ filter) {
+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;
 }
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
index 44fcbd68ce..fcf4a18a2e 100644
--- 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
@@ -30,17 +30,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
 	};
 }
 
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return factory.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
@@ -87,19 +87,19 @@ int Release () {
 	
 /* nsIFactory */
 
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
 	if (!Mozilla.IsPre_4) {
 		FilePicker_10 picker = new FilePicker_10 ();
 		picker.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+		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 int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
 	} else {
 		FilePicker picker = new FilePicker ();
 		picker.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
 	}
 	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
index b976233bab..5ad410c667 100644
--- 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
@@ -17,32 +17,32 @@ class FilePicker_10 extends FilePicker_1_8 {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
-		public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
-		public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
-		public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
-		public int /*long*/ method17 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-		public int /*long*/ method18 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-		public int /*long*/ method19 (int /*long*/[] args) {return Show (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
+		public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
+		public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
+		public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
+		public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
+		public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
+		public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
+		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 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
index a73840fd8c..19e15e55f6 100644
--- 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
@@ -17,30 +17,30 @@ class FilePicker_1_8 extends FilePicker {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
-		public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
-		public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
-		public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
-		public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
+		public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
+		public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
+		public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
+		public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
+		public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
+		public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
+		public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}
 	};
 }
 
@@ -49,10 +49,10 @@ void createCOMInterfaces () {
  * answers a java string based on the type of string that is appropriate for the Mozilla
  * version being used.
  */
-String parseAString (int /*long*/ string) {
+String parseAString (long /*int*/ string) {
 	if (string == 0) return null;
 	int length = XPCOM.nsEmbedString_Length (string);
-	int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
+	long /*int*/ buffer = XPCOM.nsEmbedString_get (string);
 	char[] chars = new char[length];
 	XPCOM.memmove (chars, buffer, length * 2);
 	return new String (chars);
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
index 706ec0898e..a8d9d5a011 100644
--- 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
@@ -38,17 +38,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
 	};		
 }
 
@@ -63,27 +63,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return helperAppLauncherDialog.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -102,14 +102,14 @@ int Release () {
 
 /* nsIHelperAppLauncherDialog */
 
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
+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);
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
 	if (rc == XPCOM.NS_OK) {	/* >= 1.8 */
 		nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
@@ -121,8 +121,8 @@ int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
 	return helperAppLauncher.SaveToDisk (0, 0);
 }
 
-int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
-	int /*long*/ aDefaultFile, aSuggestedFileExtension, _retval;
+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;
 
 	/*
@@ -140,7 +140,7 @@ int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2
 	 */
  	boolean using_1_8 = false;
 	nsISupports support = new nsISupports (arg0);
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
 	if (rc == XPCOM.NS_OK) {
 		using_1_8 = true;
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
index 43f96bd06c..80ed72e8ab 100644
--- 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
@@ -30,17 +30,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
 	};
 }
 
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return factory.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -87,19 +87,19 @@ int Release () {
 	
 /* nsIFactory */
 
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
 	if (Mozilla.IsPre_1_9) {
 		HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog ();
 		helperAppLauncherDialog.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
 	} else if (Mozilla.IsPre_4){
 		HelperAppLauncherDialog_1_9 helperAppLauncherDialog = new HelperAppLauncherDialog_1_9 ();
 		helperAppLauncherDialog.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
 	} else {
 		HelperAppLauncherDialog_10 helperAppLauncherDialog = new HelperAppLauncherDialog_10 ();
 		helperAppLauncherDialog.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
 	}
 	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
index fd30ea1527..38107f57fb 100644
--- 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
@@ -32,12 +32,12 @@ HelperAppLauncherDialog_10 () {
 
 /* nsIHelperAppLauncherDialog */
 
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
 	nsIHelperAppLauncher_8 helperAppLauncher = new nsIHelperAppLauncher_8 (aLauncher);
 	return helperAppLauncher.SaveToDisk (0, 0);
 }
 
-int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, int /*long*/ aDefaultFileName, int /*long*/ aSuggestedFileExtension, int aForcePrompt, int /*long*/ _retval) {
+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);
@@ -61,7 +61,7 @@ int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, in
 		return XPCOM.NS_ERROR_FAILURE;
 	}
 	nsEmbedString path = new nsEmbedString (name);
-	int /*long*/[] result = new int /*long*/[1];
+	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);
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
index dd2e0cb89c..5599b9bf2a 100644
--- 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
@@ -38,17 +38,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
 	};		
 }
 
@@ -63,27 +63,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return helperAppLauncherDialog.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIHelperAppLauncherDialog_1_9.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -102,12 +102,12 @@ int Release () {
 
 /* nsIHelperAppLauncherDialog */
 
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
 	nsIHelperAppLauncher_1_9 helperAppLauncher = new nsIHelperAppLauncher_1_9 (aLauncher);
 	return helperAppLauncher.SaveToDisk (0, 0);
 }
 
-int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, int /*long*/ aDefaultFileName, int /*long*/ aSuggestedFileExtension, int aForcePrompt, int /*long*/ _retval) {
+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);
@@ -131,7 +131,7 @@ int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, in
 		return XPCOM.NS_ERROR_FAILURE;
 	}
 	nsEmbedString path = new nsEmbedString (name);
-	int /*long*/[] result = new int /*long*/[1];
+	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);
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
index cc0f34d7c0..1f4a55a328 100644
--- 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
@@ -34,14 +34,14 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	inputStream = new XPCOMObject (new int[] {2, 0, 0, 0, 1, 3, 4, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Close ();}
-		public int /*long*/ method4 (int /*long*/[] args) {return Available (args[0]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return IsNonBlocking (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Close ();}
+		public long /*int*/ method4 (long /*int*/[] args) {return Available (args[0]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return IsNonBlocking (args[0]);}
 	};
 }
 
@@ -52,26 +52,26 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return inputStream.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIInputStream.NS_IINPUTSTREAM_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -89,13 +89,13 @@ int Close () {
 	return XPCOM.NS_OK;
 }
 
-int Available (int /*long*/ _retval) {
+int Available (long /*int*/ _retval) {
 	int available = buffer == null ? 0 : buffer.length - index;
 	XPCOM.memmove (_retval, new int[] {available}, 4);
 	return XPCOM.NS_OK;
 }
 
-int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) {
+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];
@@ -107,7 +107,7 @@ int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) {
 	return XPCOM.NS_OK;
 }
 
-int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /*long*/ _retval) {
+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);
@@ -115,7 +115,7 @@ int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /
 	int cnt = max;
 	while (cnt > 0) {
 		int[] aWriteCount = new int[1];
-		int /*long*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);
+		long /*int*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);
 		if (rc != XPCOM.NS_OK) break;
 		index += aWriteCount[0];
 		cnt -= aWriteCount[0];
@@ -124,7 +124,7 @@ int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /
 	return XPCOM.NS_OK;
 }
 
-int IsNonBlocking (int /*long*/ _retval) {
+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
index 07aed67ee9..21aa7f02cc 100644
--- 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
@@ -23,7 +23,7 @@ import org.eclipse.swt.internal.mozilla.init.*;
 import org.eclipse.swt.layout.*;
 
 class Mozilla extends WebBrowser {
-	int /*long*/ embedHandle;
+	long /*int*/ embedHandle;
 	nsIWebBrowser webBrowser;
 	Object webBrowserObject;
 	MozillaDelegate delegate;
@@ -46,7 +46,7 @@ class Mozilla extends WebBrowser {
 	int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;
 	int registerFunctionsOnState = 0;
 	int refCount, lastKeyCode, lastCharCode, authCount;
-	int /*long*/ request, badCertRequest;
+	long /*int*/ request, badCertRequest;
 	Point location, size;
 	boolean visible, isActive, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText;
 	boolean updateLastNavigateUrl;
@@ -124,7 +124,7 @@ class Mozilla extends WebBrowser {
 			public void handleEvent (Event event) {
 				if (BrowserCount > 0) return; /* another display is still active */
 
-				int /*long*/[] result = new int /*long*/[1];
+				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);
@@ -189,18 +189,18 @@ class Mozilla extends WebBrowser {
 
 //					int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
 //					/* alloc memory for two structs, the second is empty to signify the end of the list */
-//					int /*long*/ ptr = C.malloc (size * 2);
+//					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 int /*long*/[] {0} , 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);
-//					int /*long*/ functionPtr = result[0];
+//					long /*int*/ functionPtr = result[0];
 //					result[0] = 0;
 //					C.free (functionLoad.function);
 //					C.free (functionLoad.functionName);
@@ -222,7 +222,7 @@ class Mozilla extends WebBrowser {
 				boolean hostSet = oldProxyHostFTP != null || oldProxyHostHTTP != null || oldProxyHostSSL != null;
 				if (!hostSet && oldProxyPortFTP == -1 && oldProxyPortHTTP == -1 && oldProxyPortSSL == -1 && oldProxyType == -1) return;
 
-				int /*long*/[] result = new int /*long*/[1];
+				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);
@@ -327,7 +327,7 @@ class Mozilla extends WebBrowser {
 		MozillaClearSessions = new Runnable () {
 			public void run () {
 				if (!Initialized) return;
-				int /*long*/[] result = new int /*long*/[1];
+				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);
@@ -357,9 +357,9 @@ class Mozilla extends WebBrowser {
 					rc = cookie.GetExpires (expires);
 					if (expires[0] == 0) {
 						/* indicates a session cookie */
-						int /*long*/ domain = XPCOM.nsEmbedCString_new ();
-						int /*long*/ name = XPCOM.nsEmbedCString_new ();
-						int /*long*/ path = XPCOM.nsEmbedCString_new ();
+						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);
@@ -382,7 +382,7 @@ class Mozilla extends WebBrowser {
 			public void run() {
 				if (!Initialized) return;
 
-				int /*long*/[] result = new int /*long*/[1];
+				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);
@@ -396,7 +396,7 @@ class Mozilla extends WebBrowser {
 				nsIIOService ioService = new nsIIOService (result[0]);
 				result[0] = 0;
 				byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
-				int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+				long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
 				rc = ioService.NewURI (aSpec, null, 0, result);
 				XPCOM.nsEmbedCString_delete (aSpec);
 				ioService.Release ();
@@ -410,7 +410,7 @@ class Mozilla extends WebBrowser {
 				result[0] = 0;
 				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);
 				rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService.NS_ICOOKIESERVICE_IID, result);
-				int /*long*/ cookieString;
+				long /*int*/ cookieString;
 				if (rc == XPCOM.NS_OK && result[0] != 0) {
 					nsICookieService cookieService = new nsICookieService (result[0]);
 					result[0] = 0;
@@ -485,7 +485,7 @@ class Mozilla extends WebBrowser {
 			public void run() {
 				if (!Initialized) return;
 
-				int /*long*/[] result = new int /*long*/[1];
+				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);
@@ -499,7 +499,7 @@ class Mozilla extends WebBrowser {
 				nsIIOService ioService = new nsIIOService (result[0]);
 				result[0] = 0;
 				byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
-				int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+				long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
 				rc = ioService.NewURI (aSpec, null, 0, result);
 				XPCOM.nsEmbedCString_delete (aSpec);
 				ioService.Release ();
@@ -631,7 +631,7 @@ static void LoadLibraries () {
 				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 */
-				int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
+				long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
 				if (ptr == 0) {
 					IsXULRunner = false;
 				} else {
@@ -675,7 +675,7 @@ public void create (Composite parent, int style) {
 	delegate = new MozillaDelegate (browser);
 	final Display display = parent.getDisplay ();
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	if (!Initialized) {
 		LoadLibraries ();
 
@@ -972,7 +972,7 @@ public void create (Composite parent, int style) {
 
 					/* if tabbing onto a page for the first time then full-Browser focus ring should be shown */
 
-					int /*long*/[] result = new int /*long*/[1];
+					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);
@@ -1059,7 +1059,7 @@ public void create (Composite parent, int style) {
 public boolean back () {
 	htmlBytes = null;
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -1089,122 +1089,122 @@ public boolean close () {
 void createCOMInterfaces () {
 	// Create each of the interfaces that this object implements
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	weakReference = new XPCOMObject (new int[] {2, 0, 0, 2}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return QueryReferent (args[0], args[1]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+		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]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return SetStatus ((int)/*64*/args[0], args[1]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return GetWebBrowser (args[0]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return SetWebBrowser (args[0]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return GetChromeFlags (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return DestroyBrowserWindow ();}
-		public int /*long*/ method9 (int /*long*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return ShowAsModal ();}
-		public int /*long*/ method11 (int /*long*/[] args) {return IsWindowModal (args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return ExitModalEventLoop ((int)/*64*/args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return SetStatus ((int)/*64*/args[0], args[1]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return GetWebBrowser (args[0]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return SetWebBrowser (args[0]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return GetChromeFlags (args[0]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return DestroyBrowserWindow ();}
+		public long /*int*/ method9 (long /*int*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return ShowAsModal ();}
+		public long /*int*/ method11 (long /*int*/[] args) {return IsWindowModal (args[0]);}
+		public long /*int*/ method12 (long /*int*/[] args) {return ExitModalEventLoop ((int)/*64*/args[0]);}
 	};
 	
 	webBrowserChromeFocus = new XPCOMObject (new int[] {2, 0, 0, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return FocusNextElement ();}
-		public int /*long*/ method4 (int /*long*/[] args) {return FocusPrevElement ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return FocusNextElement ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return SetDimensions ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return SetFocus ();}
-		public int /*long*/ method6 (int /*long*/[] args) {return GetVisibility (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return SetVisibility ((int)/*64*/args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return GetTitle (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return SetTitle (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetSiteWindow (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		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]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return SetFocus ();}
+		public long /*int*/ method6 (long /*int*/[] args) {return GetVisibility (args[0]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return SetVisibility ((int)/*64*/args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return GetTitle (args[0]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return SetTitle (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return GetSiteWindow (args[0]);}
 	};
 	
 	interfaceRequestor = new XPCOMObject (new int[] {2, 0, 0, 2} ){
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return GetInterface (args[0], args[1]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return GetInterface (args[0], args[1]);}
 	};
 		
 	supportsWeakReference = new XPCOMObject (new int[] {2, 0, 0, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return GetWeakReference (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return GetWeakReference (args[0]);}
 	};
 	
 	contextMenuListener = new XPCOMObject (new int[] {2, 0, 0, 3}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return OnShowContextMenu ((int)/*64*/args[0], args[1], args[2]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return OnStartURIOpen (args[0], args[1]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return IsPreferred (args[0], args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return GetLoadCookie (args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return SetLoadCookie (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return GetParentContentListener (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return SetParentContentListener (args[0]);}		
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return OnStartURIOpen (args[0], args[1]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return IsPreferred (args[0], args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);}
+		public long /*int*/ method7 (long /*int*/[] args) {return GetLoadCookie (args[0]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return SetLoadCookie (args[0]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return GetParentContentListener (args[0]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return SetParentContentListener (args[0]);}		
 	};
 	
 	tooltipListener = new XPCOMObject (new int[] {2, 0, 0, 3, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return OnHideTooltip ();}		
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return OnHideTooltip ();}		
 	};
 
 	domEventListener = new XPCOMObject (new int[] {2, 0, 0, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return HandleEvent (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return HandleEvent (args[0]);}
 	};
 
 	badCertListener = new XPCOMObject (new int[] {2, 0, 0, 4}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}
 	};
 }
 
@@ -1283,7 +1283,7 @@ public boolean execute (String script) {
 	* workaround is to invoke the javascript handler directly via C++, which is
 	* exposed as of mozilla 1.9.
 	*/
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	if (!IsPre_1_9) {
 		int rc = XPCOM.NS_GetServiceManager (result);
 		if (rc != XPCOM.NS_OK) error (rc);
@@ -1332,13 +1332,13 @@ public boolean execute (String script) {
 				interfaceRequestor.Release ();
 
 				if (rc == XPCOM.NS_OK && result[0] != 0) {
-					int /*long*/ scriptGlobalObject = result[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 {
-						int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+						long /*int*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
 						new nsISupports (scriptGlobalObject).Release ();
 
 						if (scriptContext != 0) {
@@ -1361,7 +1361,7 @@ public boolean execute (String script) {
 								new nsISupports (result[0]).Release ();
 								result[0] = 0;
 
-								int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
+								long /*int*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
 								if (nativeContext != 0) {
 									int length = script.length ();
 									char[] scriptChars = new char[length];
@@ -1369,11 +1369,11 @@ public boolean execute (String script) {
 									byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
 									rc = principal.GetJSPrincipals (nativeContext, result);
 									if (rc == XPCOM.NS_OK && result[0] != 0) {
-										int /*long*/ principals = result[0];
+										long /*int*/ principals = result[0];
 										result[0] = 0;
 
 										byte[] jsLibPath = getJSLibPathBytes ();
-										int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
+										long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
 										if (globalJSObject != 0) {
 											aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
 											rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result);
@@ -1423,12 +1423,12 @@ public boolean execute (String script) {
 	return rc == XPCOM.NS_OK;
 }
 
-static Browser findBrowser (int /*long*/ handle) {
+static Browser findBrowser (long /*int*/ handle) {
 	return MozillaDelegate.findBrowser (handle);
 }
 
-static Browser getBrowser (int /*long*/ aDOMWindow) {
-	int /*long*/[] result = new int /*long*/[1];
+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);
@@ -1448,7 +1448,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
 	rc = window.GetTop (result);
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-	int /*long*/ topDOMWindow = result[0];
+	long /*int*/ topDOMWindow = result[0];
 	result[0] = 0;
 	rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
@@ -1478,7 +1478,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
 public boolean forward () {
 	htmlBytes = null;
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -1511,7 +1511,7 @@ static String getMozillaPath () {
 	if (LocationProvider != null) return LocationProvider.mozillaPath;
 	if (!Initialized) return "";
 
-	int /*long*/[] result = new int /*long*/[1];
+	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);
@@ -1541,11 +1541,11 @@ static String getMozillaPath () {
 
 	nsIFile mozillaDir = new nsIFile (result[0]);
 	result[0] = 0;
-	int /*long*/ path = XPCOM.nsEmbedString_new ();
+	long /*int*/ path = XPCOM.nsEmbedString_new ();
 	rc = mozillaDir.GetPath (path);
 	if (rc != XPCOM.NS_OK) error (rc);
 	int length = XPCOM.nsEmbedString_Length (path);
-	int /*long*/ ptr = XPCOM.nsEmbedString_get (path);
+	long /*int*/ ptr = XPCOM.nsEmbedString_get (path);
 	char[] chars = new char[length];
 	XPCOM.memmove (chars, ptr, length * 2);
 	XPCOM.nsEmbedString_delete (path);
@@ -1559,7 +1559,7 @@ int getNextFunctionIndex () {
 }
 
 public String getText () {
-	int /*long*/[] result = new int /*long*/[1];
+	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);
@@ -1571,7 +1571,7 @@ public String getText () {
 	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 	window.Release ();
 
-	int /*long*/ document = result[0];
+	long /*int*/ document = result[0];
 	result[0] = 0;
 	rc = XPCOM.NS_GetComponentManager (result);
 	if (rc != XPCOM.NS_OK) error (rc);
@@ -1588,12 +1588,12 @@ public String getText () {
 
 		nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);
 		result[0] = 0;
-		int /*long*/ string = XPCOM.nsEmbedString_new ();
+		long /*int*/ string = XPCOM.nsEmbedString_new ();
 		rc = serializer.SerializeToString (document, string);
 		serializer.Release ();
 
 		int length = XPCOM.nsEmbedString_Length (string);
-		int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
+		long /*int*/ buffer = XPCOM.nsEmbedString_get (string);
 		chars = new char[length];
 		XPCOM.memmove (chars, buffer, length * 2);
 		XPCOM.nsEmbedString_delete (string);
@@ -1618,13 +1618,13 @@ public String getText () {
 }
 
 public String getUrl () {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, 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 /*long*/[] aCurrentURI = new int /*long*/[1];
+	long /*int*/[] aCurrentURI = new long /*int*/[1];
 	rc = webNavigation.GetCurrentURI (aCurrentURI);
 	if (rc != XPCOM.NS_OK) error (rc);
 	webNavigation.Release ();
@@ -1632,11 +1632,11 @@ public String getUrl () {
 	byte[] dest = null;
 	if (aCurrentURI[0] != 0) {
 		nsIURI uri = new nsIURI (aCurrentURI[0]);
-		int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+		long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
 		rc = uri.GetSpec (aSpec);
 		if (rc != XPCOM.NS_OK) error (rc);
 		int length = XPCOM.nsEmbedCString_Length (aSpec);
-		int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+		long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
 		dest = new byte[length];
 		XPCOM.memmove (dest, buffer, length);
 		XPCOM.nsEmbedCString_delete (aSpec);
@@ -1699,29 +1699,29 @@ static String InitDiscoverXULRunner () {
 
 	GREVersionRange range = new GREVersionRange ();
 	byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
-	int /*long*/ lower = C.malloc (bytes.length);
+	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);
-	int /*long*/ upper = C.malloc (bytes.length);
+	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);
-	int /*long*/ name = C.malloc (bytes.length);
+	long /*int*/ name = C.malloc (bytes.length);
 	C.memmove (name, bytes, bytes.length);
 	property.property = name;
 	bytes = MozillaDelegate.wcsToMbcs (null, Arch () + GCC3, true);
-	int /*long*/ value = C.malloc (bytes.length);
+	long /*int*/ value = C.malloc (bytes.length);
 	C.memmove (value, bytes, bytes.length);
 	property.value = value;
 
 	int length = XPCOMInit.PATH_MAX;
-	int /*long*/ greBuffer = C.malloc (length);
+	long /*int*/ greBuffer = C.malloc (length);
 	int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 1, greBuffer, length);
 
 	if (rc != XPCOM.NS_OK) {
@@ -1787,7 +1787,7 @@ void initExternal (String profilePath) {
 }
 
 void initFactories (nsIServiceManager serviceManager, nsIComponentManager componentManager, boolean isXULRunner) {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 
 	int rc = componentManager.QueryInterface (nsIComponentRegistrar.NS_ICOMPONENTREGISTRAR_IID, result);
 	if (rc != XPCOM.NS_OK) {
@@ -1921,7 +1921,7 @@ void initJavaXPCOM (String mozillaPath) {
 
 String initMozilla (String mozillaPath) {
 	/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
-	int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
+	long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
 	if (ptr != 0) {
 		int length = C.strlen (ptr);
 		byte[] buffer = new byte[length];
@@ -1975,7 +1975,7 @@ String initMozilla (String mozillaPath) {
 }
 
 void initXPCOM (String mozillaPath, boolean isXULRunner) {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 
 	nsEmbedString pathString = new nsEmbedString (mozillaPath);
 	int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
@@ -1994,7 +1994,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
 	if (isXULRunner) {
 		int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
 		/* alloc memory for two structs, the second is empty to signify the end of the list */
-		int /*long*/ ptr = C.malloc (size * 2);
+		long /*int*/ ptr = C.malloc (size * 2);
 		C.memset (ptr, 0, size * 2);
 		nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
 
@@ -2006,7 +2006,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
 		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 int /*long*/[] {0} , 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) {
@@ -2029,7 +2029,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
 		}
 
 		C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
-		int /*long*/ functionPtr = result[0];
+		long /*int*/ functionPtr = result[0];
 		result[0] = 0;
 		C.free (functionLoad.function);
 		C.free (functionLoad.functionName);
@@ -2058,7 +2058,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
 }
 
 void initPreferences (nsIServiceManager serviceManager, nsIComponentManager componentManager) {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 
 	/*
 	 * As a result of using a common profile the user cannot change their locale
@@ -2417,7 +2417,7 @@ void initPreferences (nsIServiceManager serviceManager, nsIComponentManager comp
 }
 
 void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 
 	byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
 	int rc = serviceManager.GetServiceByContractID (buffer, nsIObserverService.NS_IOBSERVERSERVICE_IID, result);
@@ -2452,18 +2452,18 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
 	if (isXULRunner) {
 		int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
 		/* alloc memory for two structs, the second is empty to signify the end of the list */
-		int /*long*/ ptr = C.malloc (size * 2);
+		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 int /*long*/[] {0} , 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);
-		int /*long*/ functionPtr = result[0];
+		long /*int*/ functionPtr = result[0];
 		result[0] = 0;
 		C.free (functionLoad.function);
 		C.free (functionLoad.functionName);
@@ -2481,7 +2481,7 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
 
 void initSpinup (nsIComponentManager componentManager) {
 	if (MozillaDelegate.needsSpinup ()) {
-		int /*long*/[] result = new int /*long*/[1];
+		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, nsIAppShell.NS_IAPPSHELL_IID, result);
@@ -2518,7 +2518,7 @@ void initWebBrowserWindows () {
 		error (rc);
 	}
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -2564,7 +2564,7 @@ void initWindowCreator (nsIServiceManager serviceManager) {
 	WindowCreator = new WindowCreator2 ();
 	WindowCreator.AddRef ();
 	
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
 	int rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
 	if (rc != XPCOM.NS_OK) {
@@ -2613,7 +2613,7 @@ String initXULRunner (String mozillaPath) {
 }
 
 public boolean isBackEnabled () {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2626,7 +2626,7 @@ public boolean isBackEnabled () {
 }
 
 public boolean isForwardEnabled () {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2668,7 +2668,7 @@ void onDispose (Display display) {
 
 	unhookDOMListeners ();
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -2717,7 +2717,7 @@ void onDispose (Display display) {
 
 void Activate () {
 	isActive = true;
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2730,7 +2730,7 @@ void Activate () {
 
 void Deactivate () {
 	isActive = false;
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2741,11 +2741,11 @@ void Deactivate () {
 	webBrowserFocus.Release ();
 }
 
-void navigate (int /*long*/ requestHandle) {
+void navigate (long /*int*/ requestHandle) {
 	nsIRequest request = new nsIRequest (requestHandle);
 
 	/* get the request post data, if any */
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	byte[] postData = null;
 	final Vector headers = new Vector ();
 	int rc = request.QueryInterface (nsIUploadChannel.NS_IUPLOADCHANNEL_IID, result);
@@ -2805,37 +2805,37 @@ void navigate (int /*long*/ requestHandle) {
 	/* get the request headers */
 	XPCOMObject visitor = new XPCOMObject (new int[] {2, 0, 0, 2}) {
 		int refCount = 0;
-		public int /*long*/ method0 (int /*long*/[] args) {
+		public long /*int*/ method0 (long /*int*/[] args) {
 			/* QueryInterface */
-			int /*long*/ riid = args[0];
-			int /*long*/ ppvObject = args[1];
+			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 (nsISupports.NS_ISUPPORTS_IID) || guid.Equals (nsIHttpHeaderVisitor.NS_IHTTPHEADERVISITOR_IID)) {
-				XPCOM.memmove (ppvObject, new int /*long*/[] {getAddress ()}, C.PTR_SIZEOF);
+				XPCOM.memmove (ppvObject, new long /*int*/[] {getAddress ()}, C.PTR_SIZEOF);
 				refCount++;
 				return XPCOM.NS_OK;
 			}
-			XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+			XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 			return XPCOM.NS_ERROR_NO_INTERFACE;
 		}
-		public int /*long*/ method1 (int /*long*/[] args) {
+		public long /*int*/ method1 (long /*int*/[] args) {
 			/* AddRef */
 			return ++refCount;
 		}
-		public int /*long*/ method2 (int /*long*/[] args) {
+		public long /*int*/ method2 (long /*int*/[] args) {
 			/* Release */
 			if (--refCount == 0) dispose ();
 			return refCount;
 		}
-		public int /*long*/ method3 (int /*long*/[] args) {
+		public long /*int*/ method3 (long /*int*/[] args) {
 			/* VisitHeader */
-			int /*long*/ aHeader = args[0];
-			int /*long*/ aValue = args[1];
+			long /*int*/ aHeader = args[0];
+			long /*int*/ aValue = args[1];
 
 			int length = XPCOM.nsEmbedCString_Length (aHeader);
-			int /*long*/ buffer = XPCOM.nsEmbedCString_get (aHeader);
+			long /*int*/ buffer = XPCOM.nsEmbedCString_get (aHeader);
 			byte[] dest = new byte[length];
 			XPCOM.memmove (dest, buffer, length);
 			String header = new String (dest);
@@ -2870,11 +2870,11 @@ void navigate (int /*long*/ requestHandle) {
 
 	/* a request's name often (but not always) is its url */
 	String url = lastNavigateURL;
-	int /*long*/ name = XPCOM.nsEmbedCString_new ();
+	long /*int*/ name = XPCOM.nsEmbedCString_new ();
 	rc = request.GetName (name);
 	if (rc == XPCOM.NS_OK) {
 		int length = XPCOM.nsEmbedCString_Length (name);
-		int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+		long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
 		byte[] bytes = new byte[length];
 		XPCOM.memmove (bytes, buffer, length);
 		String value = new String (bytes);
@@ -2890,7 +2890,7 @@ void onResize () {
 	int width = Math.max (1, rect.width);
 	int height = Math.max (1, rect.height);
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -2908,7 +2908,7 @@ void onResize () {
 public void refresh () {
 	htmlBytes = null;
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error(rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2978,7 +2978,7 @@ public boolean setText (String html, boolean trusted) {
 	 */
 	delegate.removeWindowSubclass ();
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
 	if (rc == XPCOM.NS_OK && result[0] != 0) {
 		/*
@@ -3012,9 +3012,9 @@ public boolean setText (String html, boolean trusted) {
 		webNavigation.Release ();
 	} else {
 		byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", false);	//$NON-NLS-1$
-		int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
+		long /*int*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
 		byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $NON-NLS-1$
-		int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+		long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
 
 		rc = XPCOM.NS_GetServiceManager (result);
 		if (rc != XPCOM.NS_OK) error (rc);
@@ -3034,7 +3034,7 @@ public boolean setText (String html, boolean trusted) {
 		} else {
 			aString = MozillaDelegate.wcsToMbcs (null, ABOUT_BLANK, false);
 		}
-		int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+		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);
@@ -3087,7 +3087,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
 boolean setUrl (String url, byte[] postData, String[] headers) {
 	htmlBytes = null;
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -3189,7 +3189,7 @@ boolean setUrl (String url, byte[] postData, String[] headers) {
 public void stop () {
 	htmlBytes = null;
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -3248,7 +3248,7 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
 }
 
 void unhookDOMListeners () {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.GetContentDOMWindow (result);
 	if (rc != XPCOM.NS_OK || result[0] == 0) return;
 
@@ -3337,73 +3337,73 @@ void unhookDOMListeners (nsIDOMEventTarget target) {
 
 /* nsISupports */
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIWeakReference.NS_IWEAKREFERENCE_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIWebBrowserChrome.NS_IWEBBROWSERCHROME_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIWebBrowserChromeFocus.NS_IWEBBROWSERCHROMEFOCUS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsISupportsWeakReference.NS_ISUPPORTSWEAKREFERENCE_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIContextMenuListener.NS_ICONTEXTMENULISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIURIContentListener.NS_IURICONTENTLISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsITooltipListener.NS_ITOOLTIPLISTENER_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIBadCertListener2.NS_IBADCERTLISTENER2_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
@@ -3420,18 +3420,18 @@ int Release () {
 
 /* nsIWeakReference */	
 	
-int QueryReferent (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryReferent (long /*int*/ riid, long /*int*/ ppvObject) {
 	return QueryInterface (riid, ppvObject);
 }
 
 /* nsIInterfaceRequestor */
 
-int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsIDOMWindow.NS_IDOMWINDOW_10_IID) || guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_IID)) {
-		int /*long*/[] aContentDOMWindow = new int /*long*/[1];
+		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);
@@ -3441,15 +3441,15 @@ int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
 	return QueryInterface (riid, ppvObject);
 }
 
-int GetWeakReference (int /*long*/ ppvObject) {
-	XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
+int GetWeakReference (long /*int*/ ppvObject) {
+	XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
 	AddRef ();
 	return XPCOM.NS_OK;
 }
 
 /* nsIWebProgressListener */
 
-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
 	if (registerFunctionsOnState != 0 && ((aStateFlags & registerFunctionsOnState) == registerFunctionsOnState)) {
 		registerFunctionsOnState = 0;
 		Enumeration elements = functions.elements ();
@@ -3480,11 +3480,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 	*/
 	if (updateLastNavigateUrl && aStateFlags == (nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START)) {
 		nsIRequest request = new nsIRequest (aRequest);
-		int /*long*/ name = XPCOM.nsEmbedCString_new ();
+		long /*int*/ name = XPCOM.nsEmbedCString_new ();
 		int rc = request.GetName (name);
 		if (rc == XPCOM.NS_OK) {
 			int length = XPCOM.nsEmbedCString_Length (name);
-			int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+			long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
 			byte[] bytes = new byte[length];
 			XPCOM.memmove (bytes, buffer, length);
 			String value = new String (bytes);
@@ -3495,7 +3495,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 
 	if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
 	if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
-		int /*long*/[] result = new int /*long*/[1];
+		long /*int*/[] result = new long /*int*/[1];
 
 		/*
 		* When navigating to a site that is known to have a bad certificate, request notification
@@ -3575,13 +3575,13 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 		* are typically added.
 		*/
 
-		int /*long*/[] result = new int /*long*/[1];
+		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) {
-			int /*long*/[] window = new int /*long*/[1];
+			long /*int*/[] window = new long /*int*/[1];
 			nsIWebProgress progress = new nsIWebProgress (aWebProgress);
 			rc = progress.GetDOMWindow (window);
 			if (rc != XPCOM.NS_OK) error (rc);
@@ -3620,11 +3620,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 		 */
 		if (htmlBytes != null) {
 			nsIRequest req = new nsIRequest (aRequest);
-			int /*long*/ name = XPCOM.nsEmbedCString_new ();
+			long /*int*/ name = XPCOM.nsEmbedCString_new ();
 			rc = req.GetName (name);
 			if (rc != XPCOM.NS_OK) error (rc);
 			int length = XPCOM.nsEmbedCString_Length (name);
-			int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+			long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
 			byte[] dest = new byte[length];
 			XPCOM.memmove (dest, buffer, length);
 			String url = new String (dest);
@@ -3657,7 +3657,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 				} else {
 					aString = MozillaDelegate.wcsToMbcs (null, URI_FILEROOT, false);
 				}
-				int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+				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);
@@ -3675,7 +3675,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 				result[0] = 0;
 
 				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $NON-NLS-1$
-				int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+				long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
 
 				rc = stream.OpenStream (uri.getAddress (), aContentType);
 				if (rc != XPCOM.NS_OK) error (rc);
@@ -3699,11 +3699,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 				*/
 				registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START;
 
-				int /*long*/ ptr = C.malloc (htmlBytes.length);
+				long /*int*/ ptr = C.malloc (htmlBytes.length);
 				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
 				int pageSize = 8192;
 				int pageCount = htmlBytes.length / pageSize + 1;
-				int /*long*/ current = ptr;
+				long /*int*/ current = ptr;
 				for (int i = 0; i < pageCount; i++) {
 					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
 					if (length > 0) {
@@ -3727,7 +3727,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 				*/
 				deferCompleted = true;
 
-				int /*long*/[] window = new int /*long*/[1];
+				long /*int*/[] window = new long /*int*/[1];
 				nsIWebProgress progress = new nsIWebProgress (aWebProgress);
 				rc = progress.GetDOMWindow (window);
 				if (rc != XPCOM.NS_OK) error (rc);
@@ -3801,7 +3801,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 			updateLastNavigateUrl = false;
 			nsIRequest request = new nsIRequest (aRequest);
 
-			int /*long*/[] result = new int /*long*/[1];
+			long /*int*/[] result = new long /*int*/[1];
 			int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_10_IID, result);
 			if (rc != XPCOM.NS_OK) {
 				rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
@@ -3816,11 +3816,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 
 				nsIURI uri = new nsIURI (result[0]);
 				result[0] = 0;
-				int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+				long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
 				rc = uri.GetSpec (aSpec);
 				if (rc != XPCOM.NS_OK) error (rc);
 				int length = XPCOM.nsEmbedCString_Length (aSpec);
-				int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+				long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
 				byte[] bytes = new byte[length];
 				XPCOM.memmove (bytes, buffer, length);
 				lastNavigateURL = new String (bytes);
@@ -3833,7 +3833,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 		* Hook DOM listeners to the page's nsIDOMWindow here because this is
 		* the earliest opportunity to do so.    
 		*/
-		int /*long*/[] result = new int /*long*/[1];
+		long /*int*/[] result = new long /*int*/[1];
 		nsIWebProgress progress = new nsIWebProgress (aWebProgress);
 		int rc = progress.GetDOMWindow (result);
 		if (rc != XPCOM.NS_OK) error (rc);
@@ -3872,7 +3872,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 	return XPCOM.NS_OK;
 }
 
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+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 ();
@@ -3885,7 +3885,7 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
 	return XPCOM.NS_OK;
 }
 
-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
 	/*
 	* 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
@@ -3900,12 +3900,12 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
 	if (locationListeners.length == 0) return XPCOM.NS_OK;
 
 	nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
-	int /*long*/[] aDOMWindow = new int /*long*/[1];
+	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);
 	
-	int /*long*/[] aTop = new int /*long*/[1];
+	long /*int*/[] aTop = new long /*int*/[1];
 	nsIDOMWindow domWindow = new nsIDOMWindow (aDOMWindow[0]);
 	rc = domWindow.GetTop (aTop);
 	domWindow.Release ();
@@ -3915,10 +3915,10 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
 	topWindow.Release ();
 	
 	nsIURI location = new nsIURI (aLocation);
-	int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+	long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
 	location.GetSpec (aSpec);
 	int length = XPCOM.nsEmbedCString_Length (aSpec);
-	int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+	long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
 	byte[] dest = new byte[length];
 	XPCOM.memmove (dest, buffer, length);
 	XPCOM.nsEmbedCString_delete (aSpec);
@@ -3955,7 +3955,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
 	return XPCOM.NS_OK;
 }
 
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
+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 ();
@@ -3970,13 +3970,13 @@ int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatu
 	return XPCOM.NS_OK;
 }		
 
-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
 	return XPCOM.NS_OK;
 }
 
 /* nsIWebBrowserChrome */
 
-int SetStatus (int statusType, int /*long*/ status) {
+int SetStatus (int statusType, long /*int*/ status) {
 	if (statusTextListeners.length == 0) return XPCOM.NS_OK;
 	StatusTextEvent event = new StatusTextEvent (browser);
 	event.display = browser.getDisplay ();
@@ -3992,8 +3992,8 @@ int SetStatus (int statusType, int /*long*/ status) {
 	return XPCOM.NS_OK;
 }
 
-int GetWebBrowser (int /*long*/ aWebBrowser) {
-	int /*long*/[] ret = new int /*long*/[1];	
+int GetWebBrowser (long /*int*/ aWebBrowser) {
+	long /*int*/[] ret = new long /*int*/[1];	
 	if (webBrowser != null) {
 		webBrowser.AddRef ();
 		ret[0] = webBrowser.getAddress ();	
@@ -4002,13 +4002,13 @@ int GetWebBrowser (int /*long*/ aWebBrowser) {
 	return XPCOM.NS_OK;
 }
 
-int SetWebBrowser (int /*long*/ aWebBrowser) {
+int SetWebBrowser (long /*int*/ aWebBrowser) {
 	if (webBrowser != null) webBrowser.Release ();
 	webBrowser = aWebBrowser != 0 ? new nsIWebBrowser (aWebBrowser) : null;  				
 	return XPCOM.NS_OK;
 }
    
-int GetChromeFlags (int /*long*/ aChromeFlags) {
+int GetChromeFlags (long /*int*/ aChromeFlags) {
 	int[] ret = new int[1];
 	ret[0] = chromeFlags;
 	XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */
@@ -4048,7 +4048,7 @@ int SizeBrowserTo (int aCX, int aCY) {
 }
 
 int ShowAsModal () {
-	int /*long*/[] result = new int /*long*/[1];
+	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);
@@ -4078,7 +4078,7 @@ int ShowAsModal () {
 	return XPCOM.NS_OK;
 }
 
-int IsWindowModal (int /*long*/ retval) {
+int IsWindowModal (long /*int*/ retval) {
 	boolean result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0;
 	XPCOM.memmove (retval, new boolean[] {result});
 	return XPCOM.NS_OK;
@@ -4112,7 +4112,7 @@ int SetDimensions (int flags, int x, int y, int cx, int cy) {
 	return XPCOM.NS_OK;
 }
 
-int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, int /*long*/ cy) {
+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 */
@@ -4132,7 +4132,7 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i
 }
 
 int SetFocus () {
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -4153,7 +4153,7 @@ int SetFocus () {
 	return XPCOM.NS_OK;     	
 }	
 
-int GetVisibility (int /*long*/ aVisibility) {
+int GetVisibility (long /*int*/ aVisibility) {
 	boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
 	XPCOM.memmove (aVisibility, new boolean[] {visible});
 	return XPCOM.NS_OK;
@@ -4196,11 +4196,11 @@ int SetVisibility (int aVisibility) {
 	return XPCOM.NS_OK;     	
 }
 
-int GetTitle (int /*long*/ aTitle) {
+int GetTitle (long /*int*/ aTitle) {
 	return XPCOM.NS_OK;     	
 }
  
-int SetTitle (int /*long*/ aTitle) {
+int SetTitle (long /*int*/ aTitle) {
 	if (titleListeners.length == 0) return XPCOM.NS_OK;
 	TitleEvent event = new TitleEvent (browser);
 	event.display = browser.getDisplay ();
@@ -4224,7 +4224,7 @@ int SetTitle (int /*long*/ aTitle) {
 	return XPCOM.NS_OK;     	
 }
 
-int GetSiteWindow (int /*long*/ aSiteWindow) {
+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
@@ -4232,8 +4232,8 @@ int GetSiteWindow (int /*long*/ aSiteWindow) {
 	* dialog is shown with XULRunner versions < 4.
 	*/
 
-	int /*long*/ siteWindow = delegate.getSiteWindow ();
-	XPCOM.memmove (aSiteWindow, new int /*long*/[] {siteWindow}, C.PTR_SIZEOF);
+	long /*int*/ siteWindow = delegate.getSiteWindow ();
+	XPCOM.memmove (aSiteWindow, new long /*int*/[] {siteWindow}, C.PTR_SIZEOF);
 	return XPCOM.NS_OK;     	
 }
  
@@ -4273,9 +4273,9 @@ int FocusPrevElement () {
 
 /* nsIContextMenuListener */
 
-int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
+int OnShowContextMenu (int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {
 	nsIDOMEvent domEvent = new nsIDOMEvent (aEvent);
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	int rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4305,15 +4305,15 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod
 
 /* nsIURIContentListener */
 
-int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
+int OnStartURIOpen (long /*int*/ aURI, long /*int*/ retval) {
 	if (isRetrievingBadCert) return XPCOM.NS_OK;
 	authCount = 0;
 
 	nsIURI location = new nsIURI (aURI);
-	int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+	long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
 	location.GetSpec (aSpec);
 	int length = XPCOM.nsEmbedCString_Length (aSpec);
-	int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+	long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
 	buffer = XPCOM.nsEmbedCString_get (aSpec);
 	byte[] dest = new byte[length];
 	XPCOM.memmove (dest, buffer, length);
@@ -4368,7 +4368,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
 			if (doit) {
 				if (jsEnabled != jsEnabledOnNextPage) {
 					jsEnabled = jsEnabledOnNextPage;
-					int /*long*/[] result = new int /*long*/[1];
+					long /*int*/[] result = new long /*int*/[1];
 					int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
 					if (rc != XPCOM.NS_OK) error (rc);
 					if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4387,11 +4387,11 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
 	return XPCOM.NS_OK;
 }
 
-int DoContent (int /*long*/ aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/ aContentHandler, int /*long*/ retval) {
+int DoContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/ aContentHandler, long /*int*/ retval) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, int /*long*/ retval) {
+int IsPreferred (long /*int*/ aContentType, long /*int*/ aDesiredContentType, long /*int*/ retval) {
 	boolean preferred = false;
 	int size = XPCOM.strlen (aContentType);
 	if (size > 0) {
@@ -4402,7 +4402,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
 		/* 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 */
-			int /*long*/[] result = new int /*long*/[1];
+			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);
@@ -4414,7 +4414,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
 			rc = serviceManager.GetServiceByContractID (aContractID, nsIWebNavigationInfo.NS_IWEBNAVIGATIONINFO_IID, result);
 			if (rc == XPCOM.NS_OK) {
 				byte[] bytes = MozillaDelegate.wcsToMbcs (null, contentType, false);
-				int /*long*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+				long /*int*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length);
 				nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);
 				result[0] = 0;
 				int[] isSupportedResult = new int[1]; /* PRUint32 */
@@ -4444,34 +4444,34 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
 
 	XPCOM.memmove(retval, new boolean[] {preferred});
 	if (preferred) {
-		XPCOM.memmove (aDesiredContentType, new int /*long*/[] {0}, C.PTR_SIZEOF);
+		XPCOM.memmove (aDesiredContentType, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	}
 	return XPCOM.NS_OK;
 }
 
-int CanHandleContent (int /*long*/ aContentType, int aIsContentPreferred, int /*long*/ aDesiredContentType, int /*long*/ retval) {
+int CanHandleContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aDesiredContentType, long /*int*/ retval) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetLoadCookie (int /*long*/ aLoadCookie) {
+int GetLoadCookie (long /*int*/ aLoadCookie) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int SetLoadCookie (int /*long*/ aLoadCookie) {
+int SetLoadCookie (long /*int*/ aLoadCookie) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-int GetParentContentListener (int /*long*/ aParentContentListener) {
+int GetParentContentListener (long /*int*/ aParentContentListener) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 	
-int SetParentContentListener (int /*long*/ aParentContentListener) {
+int SetParentContentListener (long /*int*/ aParentContentListener) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* nsITooltipListener */
 
-int OnShowTooltip (int aXCoords, int aYCoords, int /*long*/ aTipText) {
+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);
@@ -4507,20 +4507,20 @@ int OnHideTooltip () {
 	return XPCOM.NS_OK;
 }
 
-int HandleEvent (int /*long*/ event) {
+int HandleEvent (long /*int*/ event) {
 	nsIDOMEvent domEvent = new nsIDOMEvent (event);
-	int /*long*/ type = XPCOM.nsEmbedString_new ();
+	long /*int*/ type = XPCOM.nsEmbedString_new ();
 	int rc = domEvent.GetType (type);
 	if (rc != XPCOM.NS_OK) error (rc);
 	int length = XPCOM.nsEmbedString_Length (type);
-	int /*long*/ buffer = XPCOM.nsEmbedString_get (type);
+	long /*int*/ buffer = XPCOM.nsEmbedString_get (type);
 	char[] chars = new char[length];
 	XPCOM.memmove (chars, buffer, length * 2);
 	String typeString = new String (chars);
 	XPCOM.nsEmbedString_delete (type);
 
 	if (XPCOM.DOMEVENT_UNLOAD.equals (typeString)) {
-		int /*long*/[] result = new int /*long*/[1];
+		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);
@@ -4537,7 +4537,7 @@ int HandleEvent (int /*long*/ event) {
 	}
 
 	if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
-		int /*long*/[] result = new int /*long*/[1];
+		long /*int*/[] result = new long /*int*/[1];
 		rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
 		if (rc != XPCOM.NS_OK) error (rc);
 		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4645,7 +4645,7 @@ int HandleEvent (int /*long*/ event) {
 			case SWT.SCROLL_LOCK: return XPCOM.NS_OK;
 		}
 
-		int /*long*/[] result = new int /*long*/[1];
+		long /*int*/[] result = new long /*int*/[1];
 		rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
 		if (rc != XPCOM.NS_OK) error (rc);
 		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4701,7 +4701,7 @@ int HandleEvent (int /*long*/ event) {
 	}
 
 	if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
-		int /*long*/[] result = new int /*long*/[1];
+		long /*int*/[] result = new long /*int*/[1];
 		rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
 		if (rc != XPCOM.NS_OK) error (rc);
 		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4758,7 +4758,7 @@ int HandleEvent (int /*long*/ event) {
 
 	/* mouse event */
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4876,10 +4876,10 @@ int HandleEvent (int /*long*/ event) {
 
 /* nsIBadCertListener2 */
 
-int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int /*long*/ _suppressError) {
+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);
-	int /*long*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
+	long /*int*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
 	byte[] dest = new byte[length];
 	XPCOM.memmove (dest, buffer, length);
 	final String urlPort = new String (dest);
@@ -4889,7 +4889,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
 
 	/* create text descriptions of the certificate problem(s) */
 
-	int /*long*/[] result = new int /*long*/[1];
+	long /*int*/[] result = new long /*int*/[1];
 	nsISupports supports = new nsISupports (status);
 	int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
@@ -4912,7 +4912,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
 
 	rc = sslStatus.GetIsDomainMismatch (intResult);
 	if (intResult[0] != 0) {
-		int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+		long /*int*/ ptr = XPCOM.nsEmbedString_new ();
 		rc = cert.GetCommonName (ptr);
 		if (rc != XPCOM.NS_OK) SWT.error (rc);
 		length = XPCOM.nsEmbedString_Length (ptr);
@@ -4935,7 +4935,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
 		nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
 		result[0] = 0;
 
-		int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+		long /*int*/ ptr = XPCOM.nsEmbedString_new ();
 		rc = validity.GetNotBeforeGMT (ptr);
 		if (rc != XPCOM.NS_OK) SWT.error (rc);
 		length = XPCOM.nsEmbedString_Length (ptr);
@@ -4964,7 +4964,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
 
 	rc = sslStatus.GetIsUntrusted (intResult);
 	if (intResult[0] != 0) {
-		int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+		long /*int*/ ptr = XPCOM.nsEmbedString_new ();
 		rc = cert.GetIssuerCommonName (ptr);
 		if (rc != XPCOM.NS_OK) SWT.error (rc);
 		length = XPCOM.nsEmbedString_Length (ptr);
@@ -4993,7 +4993,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
 			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)) {
-					int /*long*/[] result = new int /*long*/[1];
+					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);
@@ -5009,7 +5009,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
 					nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
 					result[0] = 0;
 					byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
-					int /*long*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
+					long /*int*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
 					rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
 					navigate (badCertRequest);
 					XPCOM.nsEmbedCString_delete (hostString);
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
index 40d9855e71..abef771eec 100644
--- 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
@@ -19,7 +19,7 @@ class PromptAuth2 {
 	XPCOMObject supports;
 	XPCOMObject promptAuth;
 	int refCount = 0;
-	int /*long*/ parent;
+	long /*int*/ parent;
 	
 PromptAuth2 () {
 	createCOMInterfaces ();
@@ -33,17 +33,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	promptAuth = new XPCOMObject (new int[] {2, 0, 0, 4, 6}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return PromptAuth (args[0], (int)/*64*/args[1], args[2], args[3]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return PromptAuth (args[0], (int)/*64*/args[1], args[2], args[3]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5]);}
 	};
 }
 
@@ -58,27 +58,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return promptAuth.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIAuthPrompt2.NS_IAUTHPROMPT2_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -93,11 +93,11 @@ Browser getBrowser () {
 	return Mozilla.getBrowser (parent);
 }
 
-void setParent(int /*long*/ aParent) {
+void setParent(long /*int*/ aParent) {
 	parent = aParent;
 }
 
-int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ _retval) {
+int PromptAuth(long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ _retval) {
 	nsIAuthInformation auth = new nsIAuthInformation (authInfo);
 
 	Browser browser = getBrowser ();
@@ -143,11 +143,11 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 
 	/* get initial username and password values */
 
-	int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+	long /*int*/ ptr = XPCOM.nsEmbedString_new ();
 	int rc = auth.GetUsername (ptr);
 	if (rc != XPCOM.NS_OK) SWT.error (rc);
 	int length = XPCOM.nsEmbedString_Length (ptr);
-	int /*long*/ buffer = XPCOM.nsEmbedString_get (ptr);
+	long /*int*/ buffer = XPCOM.nsEmbedString_get (ptr);
 	char[] chars = new char[length];
 	XPCOM.memmove (chars, buffer, length * 2);
 	userLabel[0] = new String (chars);
@@ -176,13 +176,13 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 	XPCOM.nsEmbedString_delete (ptr);
 
 	nsIChannel channel = new nsIChannel (aChannel);
-	int /*long*/[] uri = new int /*long*/[1];
+	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]);
-	int /*long*/ host = XPCOM.nsEmbedCString_new ();
+	long /*int*/ host = XPCOM.nsEmbedCString_new ();
 	rc = nsURI.GetHost (host);
 	if (rc != XPCOM.NS_OK) SWT.error (rc);
 	length = XPCOM.nsEmbedCString_Length (host);
@@ -222,7 +222,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 	return XPCOM.NS_OK;
 }
 
-int AsyncPromptAuth(int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, int /*long*/ _retval) {
+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
index ad271ebbab..4a8c186949 100644
--- 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
@@ -141,7 +141,7 @@ class PromptDialog extends Dialog {
 		viewCertButton.setText(Compatibility.getMessage("SWT_ViewCertificate")); //$NON-NLS-1$
 		viewCertButton.addListener(SWT.Selection, new Listener() {
 			public void handleEvent(Event event) {
-				int /*long*/[] result = new int /*long*/[1];
+				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);
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
index 001bd1b085..3f3da8e90e 100644
--- 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
@@ -30,16 +30,16 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return GetPrompt (args[0], args[1], args[2]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return GetPrompt (args[0], args[1], args[2]);}
 	};
 }
 
@@ -54,27 +54,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return factory.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIPromptFactory.NS_IPROMPTFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -86,7 +86,7 @@ int Release () {
 	
 /* nsIPromptFactory */
 
-int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) {
+int GetPrompt (long /*int*/ aParent, long /*int*/ iid, long /*int*/ result) {
 	nsID guid = new nsID ();
 	XPCOM.memmove (guid, iid, nsID.sizeof);
 	
@@ -94,7 +94,7 @@ int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) {
 		Prompter prompter = new Prompter ();
 		prompter.AddRef ();
 		prompter.setParent (aParent);
-		XPCOM.memmove (result, new int /*long*/[] {prompter.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {prompter.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
@@ -102,7 +102,7 @@ int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) {
 		PromptAuth2 promptAuth = new PromptAuth2();
 		promptAuth.AddRef ();
 		promptAuth.setParent (aParent);
-		XPCOM.memmove (result, new int /*long*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		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
index 16cbe4fd6b..bb8f380c53 100644
--- 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
@@ -33,41 +33,41 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
-		public int /*long*/ method7 (int /*long*/[] 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]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
+		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]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+		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]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
-		public int /*long*/ method7 (int /*long*/[] 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]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return PromptAuth (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5], args[6], args[7], args[8]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
+		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]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+		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]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+		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]);}
+		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]);}
+		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]);}
 	};
 }
 
@@ -86,32 +86,32 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return promptService2.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIPromptService.NS_IPROMPTSERVICE_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -121,12 +121,12 @@ int Release () {
 	return refCount;
 }
 
-Browser getBrowser (int /*long*/ aDOMWindow) {
+Browser getBrowser (long /*int*/ aDOMWindow) {
 	if (aDOMWindow == 0) return null;
 	return Mozilla.getBrowser (aDOMWindow);
 }
 
-String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
+String getLabel (int buttonFlag, int index, long /*int*/ buttonTitle) {
 	String label = null;
 	int flag = (buttonFlag & (0xff * index)) / index;
 	switch (flag) {
@@ -147,7 +147,7 @@ String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
 
 /* nsIPromptService */
 
-int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText) {
+int Alert (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText) {
 	final Browser browser = getBrowser (aParent);
 	
 	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -177,7 +177,7 @@ int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText)
 	return XPCOM.NS_OK;
 }
 
-int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState) {
+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);
@@ -204,11 +204,11 @@ int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aT
 	return XPCOM.NS_OK;
 }
 
-int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, int /*long*/ checkboxLabel, int /*long*/ checkValue, int /*long*/ _retval) {
+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 (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval) {
+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) {
@@ -236,11 +236,11 @@ int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText
 	return XPCOM.NS_OK;
 }
 
-int ConfirmCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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 (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags, int /*long*/ aButton0Title, int /*long*/ aButton1Title, int /*long*/ aButton2Title, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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);
@@ -283,7 +283,7 @@ int ConfirmEx (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aTe
 	return XPCOM.NS_OK;
 }
 
-int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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];
@@ -301,7 +301,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
 	XPCOM.memmove (dest, aText, length * 2);
 	textLabel = new String (dest);
 	
-	int /*long*/[] valueAddr = new int /*long*/[1];
+	long /*int*/[] valueAddr = new long /*int*/[1];
 	XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
 	if (valueAddr[0] != 0) {
 		length = XPCOM.strlen_PRUnichar (valueAddr[0]);
@@ -332,7 +332,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
 		* value that we override must be freed using the nsIMemory service.
 		*/
 		if (valueLabel[0] != null) {
-			int /*long*/[] result2 = new int /*long*/[1];
+			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);
@@ -352,9 +352,9 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
 			char[] buffer = new char[cnt + 1];
 			valueLabel[0].getChars (0, cnt, buffer, 0);
 			int size = buffer.length * 2;
-			int /*long*/ ptr = memory.Alloc (size);
+			long /*int*/ ptr = memory.Alloc (size);
 			XPCOM.memmove (ptr, buffer, size);
-			XPCOM.memmove (aValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+			XPCOM.memmove (aValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 
 			if (valueAddr[0] != 0) {
 				memory.Free (valueAddr[0]);
@@ -366,7 +366,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
 	return XPCOM.NS_OK;
 }
 
-int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ checkboxLabel, int /*long*/ checkboxValue, int /*long*/ _retval) {
+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);
@@ -420,11 +420,11 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 
 	/* get initial username and password values */
 
-	int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+	long /*int*/ ptr = XPCOM.nsEmbedString_new ();
 	int rc = auth.GetUsername (ptr);
 	if (rc != XPCOM.NS_OK) SWT.error (rc);
 	int length = XPCOM.nsEmbedString_Length (ptr);
-	int /*long*/ buffer = XPCOM.nsEmbedString_get (ptr);
+	long /*int*/ buffer = XPCOM.nsEmbedString_get (ptr);
 	char[] chars = new char[length];
 	XPCOM.memmove (chars, buffer, length * 2);
 	userLabel[0] = new String (chars);
@@ -453,13 +453,13 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 	XPCOM.nsEmbedString_delete (ptr);
 
 	nsIChannel channel = new nsIChannel (aChannel);
-	int /*long*/[] uri = new int /*long*/[1];
+	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]);
-	int /*long*/ host = XPCOM.nsEmbedCString_new ();
+	long /*int*/ host = XPCOM.nsEmbedCString_new ();
 	rc = nsURI.GetHost (host);
 	if (rc != XPCOM.NS_OK) SWT.error (rc);
 	length = XPCOM.nsEmbedCString_Length (host);
@@ -500,7 +500,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 	return XPCOM.NS_OK;
 }
 
-int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aUsername, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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;
 
@@ -551,7 +551,7 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
 		XPCOM.memmove (dest, aText, length * 2);
 		textLabel = new String (dest);
 
-		int /*long*/[] userAddr = new int /*long*/[1];
+		long /*int*/[] userAddr = new long /*int*/[1];
 		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
 		if (userAddr[0] != 0) {
 			length = XPCOM.strlen_PRUnichar (userAddr[0]);
@@ -560,7 +560,7 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
 			userLabel[0] = new String (dest);		
 		}
 
-		int /*long*/[] passAddr = new int /*long*/[1];
+		long /*int*/[] passAddr = new long /*int*/[1];
 		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
 		if (passAddr[0] != 0) {
 			length = XPCOM.strlen_PRUnichar (passAddr[0]);
@@ -598,12 +598,12 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
 		* User name and password are returned as PRUnichar values. Any default
 		* value that we override must be freed using the nsIMemory service.
 		*/
-		int /*long*/[] userAddr = new int /*long*/[1];
+		long /*int*/[] userAddr = new long /*int*/[1];
 		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
-		int /*long*/[] passAddr = new int /*long*/[1];
+		long /*int*/[] passAddr = new long /*int*/[1];
 		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
 
-		int /*long*/[] result = new int /*long*/[1];
+		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);
@@ -628,9 +628,9 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
 		char[] buffer = new char[cnt + 1];
 		user.getChars (0, cnt, buffer, 0);
 		int size = buffer.length * 2;
-		int /*long*/ ptr = C.malloc (size);
+		long /*int*/ ptr = C.malloc (size);
 		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+		XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 
 		cnt = password.length ();
 		buffer = new char[cnt + 1];
@@ -638,17 +638,17 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
 		size = buffer.length * 2;
 		ptr = C.malloc (size);
 		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+		XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 	}
 
 	return XPCOM.NS_OK;
 }
 
-int PromptPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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 (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int aCount, int /*long*/ aSelectList, int /*long*/ aOutSelection, int /*long*/ _retval) {
+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
index 3ec1c359ee..8c7c18921a 100644
--- 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
@@ -30,17 +30,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 	
 	factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
 	};
 }
 
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return factory.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -87,19 +87,19 @@ int Release () {
 	
 /* nsIFactory */
 
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
 	nsID guid = new nsID ();
 	XPCOM.memmove (guid, iid, nsID.sizeof);
 	if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID) || guid.Equals(nsIPromptService.NS_IPROMPTSERVICE_IID)) {
 		PromptService2 promptService = new PromptService2 ();
 		promptService.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIPromptFactory.NS_IPROMPTFACTORY_IID)) {
 		PromptFactory promptFactory = new PromptFactory();
 		promptFactory.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {promptFactory.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (result, new long /*int*/[] {promptFactory.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		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
index c8274d0113..a7b9848679 100644
--- 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
@@ -19,7 +19,7 @@ class Prompter {
 	XPCOMObject supports;
 	XPCOMObject prompt;
 	int refCount = 0;
-	int /*long*/ parent;
+	long /*int*/ parent;
 	
 Prompter () {
 	createCOMInterfaces ();
@@ -33,24 +33,24 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1] );}
-		public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6], args[7], args[8]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1] );}
+		public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3]);}
+		public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2]);}
+		public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4]);}
+		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]);}
+		public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5]);}
+		public long /*int*/ method9 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5]);}
+		public long /*int*/ method10 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+		public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
 	};
 }
 
@@ -65,26 +65,26 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return prompt.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIPrompt.NS_IPROMPT_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {prompt.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {prompt.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -99,7 +99,7 @@ Browser getBrowser () {
 	return Mozilla.getBrowser (parent);
 }
 
-String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
+String getLabel (int buttonFlag, int index, long /*int*/ buttonTitle) {
 	String label = null;
 	int flag = (buttonFlag & (0xff * index)) / index;
 	switch (flag) {
@@ -118,13 +118,13 @@ String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
 	return label;
 }
 
-void setParent(int /*long*/ aParent) {
+void setParent(long /*int*/ aParent) {
 	parent = aParent;
 }
 
 /* nsIPrompt */
 
-int Alert (int /*long*/ aDialogTitle, int /*long*/ aText) {
+int Alert (long /*int*/ aDialogTitle, long /*int*/ aText) {
 	final Browser browser = getBrowser ();
 	
 	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -154,7 +154,7 @@ int Alert (int /*long*/ aDialogTitle, int /*long*/ aText) {
 	return XPCOM.NS_OK;
 }
 
-int AlertCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState) {
+int AlertCheck (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState) {
 	Browser browser = getBrowser ();
 
 	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -181,7 +181,7 @@ int AlertCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aChe
 	return XPCOM.NS_OK;
 }
 
-int Confirm (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval) {
+int Confirm (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ _retval) {
 	Browser browser = getBrowser ();
 
 	if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
@@ -209,11 +209,11 @@ int Confirm (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval
 	return XPCOM.NS_OK;
 }
 
-int ConfirmCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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 (int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags, int /*long*/ aButton0Title, int /*long*/ aButton1Title, int /*long*/ aButton2Title, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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);
@@ -256,7 +256,7 @@ int ConfirmEx (int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags,
 	return XPCOM.NS_OK;
 }
 
-int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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];
@@ -274,7 +274,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
 	XPCOM.memmove (dest, aText, length * 2);
 	textLabel = new String (dest);
 	
-	int /*long*/[] valueAddr = new int /*long*/[1];
+	long /*int*/[] valueAddr = new long /*int*/[1];
 	XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
 	if (valueAddr[0] != 0) {
 		length = XPCOM.strlen_PRUnichar (valueAddr[0]);
@@ -305,7 +305,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
 		* value that we override must be freed using the nsIMemory service.
 		*/
 		if (valueLabel[0] != null) {
-			int /*long*/[] result2 = new int /*long*/[1];
+			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);
@@ -325,9 +325,9 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
 			char[] buffer = new char[cnt + 1];
 			valueLabel[0].getChars (0, cnt, buffer, 0);
 			int size = buffer.length * 2;
-			int /*long*/ ptr = memory.Alloc (size);
+			long /*int*/ ptr = memory.Alloc (size);
 			XPCOM.memmove (ptr, buffer, size);
-			XPCOM.memmove (aValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+			XPCOM.memmove (aValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 
 			if (valueAddr[0] != 0) {
 				memory.Free (valueAddr[0]);
@@ -339,7 +339,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
 	return XPCOM.NS_OK;
 }
 
-int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ _retval) {
+int PromptAuth(long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ _retval) {
 	nsIAuthInformation auth = new nsIAuthInformation (authInfo);
 
 	Browser browser = getBrowser ();
@@ -385,11 +385,11 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 
 	/* get initial username and password values */
 
-	int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+	long /*int*/ ptr = XPCOM.nsEmbedString_new ();
 	int rc = auth.GetUsername (ptr);
 	if (rc != XPCOM.NS_OK) SWT.error (rc);
 	int length = XPCOM.nsEmbedString_Length (ptr);
-	int /*long*/ buffer = XPCOM.nsEmbedString_get (ptr);
+	long /*int*/ buffer = XPCOM.nsEmbedString_get (ptr);
 	char[] chars = new char[length];
 	XPCOM.memmove (chars, buffer, length * 2);
 	userLabel[0] = new String (chars);
@@ -418,13 +418,13 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 	XPCOM.nsEmbedString_delete (ptr);
 
 	nsIChannel channel = new nsIChannel (aChannel);
-	int /*long*/[] uri = new int /*long*/[1];
+	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]);
-	int /*long*/ host = XPCOM.nsEmbedCString_new ();
+	long /*int*/ host = XPCOM.nsEmbedCString_new ();
 	rc = nsURI.GetHost (host);
 	if (rc != XPCOM.NS_OK) SWT.error (rc);
 	length = XPCOM.nsEmbedCString_Length (host);
@@ -464,7 +464,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 	return XPCOM.NS_OK;
 }
 
-int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aUsername, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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;
 
@@ -515,7 +515,7 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
 		XPCOM.memmove (dest, aText, length * 2);
 		textLabel = new String (dest);
 
-		int /*long*/[] userAddr = new int /*long*/[1];
+		long /*int*/[] userAddr = new long /*int*/[1];
 		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
 		if (userAddr[0] != 0) {
 			length = XPCOM.strlen_PRUnichar (userAddr[0]);
@@ -524,7 +524,7 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
 			userLabel[0] = new String (dest);		
 		}
 
-		int /*long*/[] passAddr = new int /*long*/[1];
+		long /*int*/[] passAddr = new long /*int*/[1];
 		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
 		if (passAddr[0] != 0) {
 			length = XPCOM.strlen_PRUnichar (passAddr[0]);
@@ -562,12 +562,12 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
 		* User name and password are returned as PRUnichar values. Any default
 		* value that we override must be freed using the nsIMemory service.
 		*/
-		int /*long*/[] userAddr = new int /*long*/[1];
+		long /*int*/[] userAddr = new long /*int*/[1];
 		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
-		int /*long*/[] passAddr = new int /*long*/[1];
+		long /*int*/[] passAddr = new long /*int*/[1];
 		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
 
-		int /*long*/[] result = new int /*long*/[1];
+		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);
@@ -592,9 +592,9 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
 		char[] buffer = new char[cnt + 1];
 		user.getChars (0, cnt, buffer, 0);
 		int size = buffer.length * 2;
-		int /*long*/ ptr = C.malloc (size);
+		long /*int*/ ptr = C.malloc (size);
 		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+		XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 
 		cnt = password.length ();
 		buffer = new char[cnt + 1];
@@ -602,17 +602,17 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
 		size = buffer.length * 2;
 		ptr = C.malloc (size);
 		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+		XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
 	}
 
 	return XPCOM.NS_OK;
 }
 
-int PromptPassword (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+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 (int /*long*/ aDialogTitle, int /*long*/ aText, int aCount, int /*long*/ aSelectList, int /*long*/ aOutSelection, int /*long*/ _retval) {
+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
index 9b097948a2..d39b512229 100644
--- 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
@@ -36,17 +36,17 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 
 	simpleEnumerator = new XPCOMObject (new int[] {2, 0, 0, 1, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return HasMoreElements (args[0]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return GetNext (args[0]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return HasMoreElements (args[0]);}
+		public long /*int*/ method4 (long /*int*/[] args) {return GetNext (args[0]);}
 	};
 }
 
@@ -67,27 +67,27 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return simpleEnumerator.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsISimpleEnumerator.NS_ISIMPLEENUMERATOR_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {simpleEnumerator.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {simpleEnumerator.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
@@ -97,17 +97,17 @@ int Release () {
 	return refCount;
 }
 
-int HasMoreElements (int /*long*/ _retval) {
+int HasMoreElements (long /*int*/ _retval) {
 	boolean more = values != null && index < values.length;
 	XPCOM.memmove (_retval, new boolean[] {more});
 	return XPCOM.NS_OK;
 }	
 	
-int GetNext (int /*long*/ _retval) {
+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 int /*long*/[] {value.getAddress ()}, C.PTR_SIZEOF);
+    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
index 8882a4fcf8..78c21ab875 100644
--- 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
@@ -35,24 +35,24 @@ int AddRef () {
 void createCOMInterfaces () {
 	/* Create each of the interfaces that this object implements */
 	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
 	};
 
 	windowCreator = new XPCOMObject (new int[] {2, 0, 0, 3}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		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}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return CreateChromeWindow2 (args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
+		public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+		public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+		public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+		public long /*int*/ method3 (long /*int*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
+		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]);}
 	};
 }
 
@@ -72,32 +72,32 @@ void disposeCOMInterfaces () {
 	}
 }
 
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
 	return windowCreator.getAddress ();
 }
 
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+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 (nsISupports.NS_ISUPPORTS_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIWindowCreator.NS_IWINDOWCREATOR_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIWindowCreator2.NS_IWINDOWCREATOR2_IID)) {
-		XPCOM.memmove (ppvObject, new int /*long*/[] {windowCreator2.getAddress ()}, C.PTR_SIZEOF);
+		XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator2.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
 
-	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
         	
@@ -109,26 +109,26 @@ int Release () {
 	
 /* nsIWindowCreator */
 
-int CreateChromeWindow (int /*long*/ parent, int chromeFlags, int /*long*/ _retval) {
+int CreateChromeWindow (long /*int*/ parent, int chromeFlags, long /*int*/ _retval) {
 	return CreateChromeWindow2 (parent, chromeFlags, 0, 0, 0, _retval);
 }
 
 /* nsIWindowCreator2 */
 
-int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int /*long*/ cancel, int /*long*/ _retval) {
+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);
-		int /*long*/[] aWebBrowser = new int /*long*/[1];
+		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]);
-		int /*long*/[] result = new int /*long*/[1];
+		long /*int*/[] result = new long /*int*/[1];
 		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 		if (rc != XPCOM.NS_OK) {
 			rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -139,7 +139,7 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
 
 		nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
 		result[0] = 0;
-		int /*long*/[] aParentNativeWindow = new int /*long*/[1];
+		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);
@@ -185,11 +185,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
 		});
 		if (uri != 0) {
 			nsIURI location = new nsIURI (uri);
-			int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+			long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
 			if (location.GetSpec (aSpec) == XPCOM.NS_OK) {
 				int length = XPCOM.nsEmbedCString_Length (aSpec);
 				if (length > 0) {
-					int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+					long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
 					byte[] dest = new byte[length];
 					XPCOM.memmove (dest, buffer, length);
 					browser.setUrl (new String (dest));
@@ -218,11 +218,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
 	if (doit) {
 		Mozilla mozilla = (Mozilla)browser.webBrowser;
 		mozilla.isChild = true;
-		int /*long*/ chromePtr = mozilla.webBrowserChrome.getAddress ();
+		long /*int*/ chromePtr = mozilla.webBrowserChrome.getAddress ();
 		nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (chromePtr);
 		webBrowserChrome.SetChromeFlags (chromeFlags);
 		webBrowserChrome.AddRef ();
-		XPCOM.memmove (_retval, new int /*long*/[] {chromePtr}, C.PTR_SIZEOF);
+		XPCOM.memmove (_retval, new long /*int*/[] {chromePtr}, C.PTR_SIZEOF);
 	} else {
 		if (cancel != 0) {
 			XPCOM.memmove (cancel, new boolean[] {true});
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
index 0a1e9708c4..1b29b85eee 100644
--- 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
@@ -160,7 +160,7 @@ public class XPCOM extends C {
 
 public static final native int nsDynamicFunctionLoad_sizeof ();
 
-public static void memmove(int /*long*/ dest, boolean[] src) {
+public static void memmove(long /*int*/ dest, boolean[] src) {
 	if (nsISupports.IsXULRunner10) { // TODO change this reference
 		memmove (dest, new byte[] {src[0] ? (byte)1 : 0}, 1);
 	} else {
@@ -168,7 +168,7 @@ public static void memmove(int /*long*/ dest, boolean[] src) {
 	}
 }
 
-public static void memmove(boolean[] dest, int /*long*/ src) {
+public static void memmove(boolean[] dest, long /*int*/ src) {
 	if (nsISupports.IsXULRunner10) { // TODO change this reference
 		byte[] result = new byte[1];
 		memmove (result, src, 1);
@@ -185,28 +185,28 @@ public static void memmove(boolean[] dest, int /*long*/ src) {
  * @param src cast=(const void *),flags=no_out critical
  * @param size cast=(size_t)
  */
-public static final native void memmove(int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size);
+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, int /*long*/ src, int nbytes);
+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(int /*long*/ dest, nsID src, int nbytes);
+public static final native void memmove(long /*int*/ dest, nsID src, int nbytes);
 /** @method flags=no_gen */
-public static final native int strlen_PRUnichar(int /*long*/ s);
+public static final native int strlen_PRUnichar(long /*int*/ s);
 
 /** @method flags=no_gen */
-public static final native int /*long*/ CALLBACK_JSNative(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_JSNative(long /*int*/ func);
 
 /** @method flags=no_gen */
-public static final native int /*long*/ _JS_DefineFunction(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, byte[] name, int /*long*/ call, int nargs, int flags);	
-public static final int /*long*/ JS_DefineFunction(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, byte[] name, int /*long*/ call, int nargs, int flags) {
+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);
@@ -215,8 +215,8 @@ public static final int /*long*/ JS_DefineFunction(byte[] mozillaPath, int /*lon
 	}
 }
 /** @method flags=no_gen */
-public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal);	
-public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal) {
+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);
@@ -225,8 +225,8 @@ public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int
 	}
 }
 /** @method flags=no_gen */
-public static final native int /*long*/ _JS_GetGlobalObject(byte[] mozillaPath, int /*long*/ cx);	
-public static final int /*long*/ JS_GetGlobalObject(byte[] mozillaPath, int /*long*/ cx) {
+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);
@@ -235,8 +235,8 @@ public static final int /*long*/ JS_GetGlobalObject(byte[] mozillaPath, int /*lo
 	}
 }
 /** @method flags=no_gen */
-public static final native int /*long*/ _JS_NewObject(byte[] mozillaPath, int /*long*/ cx, int /*long*/ clasp, int /*long*/ proto, int /*long*/ parent);	
-public static final int /*long*/ JS_NewObject(byte[] mozillaPath, int /*long*/ cx, int /*long*/ clasp, int /*long*/ proto, int /*long*/ parent) {
+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);
@@ -245,8 +245,8 @@ public static final int /*long*/ JS_NewObject(byte[] mozillaPath, int /*long*/ c
 	}
 }
 /** @method flags=no_gen */
-public static final native boolean _NS_Free(byte[] mozillaPath, int /*long*/ aPtr);
-public static final boolean NS_Free(byte[] mozillaPath, int /*long*/ aPtr) {
+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);
@@ -255,8 +255,8 @@ public static final boolean NS_Free(byte[] mozillaPath, int /*long*/ aPtr) {
 	}
 }
 /** @param result cast=(nsIComponentManager**) */
-public static final native int _NS_GetComponentManager(int /*long*/[] result);
-public static final int NS_GetComponentManager(int /*long*/[] result) {
+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);
@@ -265,8 +265,8 @@ public static final int NS_GetComponentManager(int /*long*/[] result) {
 	}
 }
 /** @param result cast=(nsIServiceManager**) */
-public static final native int _NS_GetServiceManager(int /*long*/[] result);
-public static final int NS_GetServiceManager(int /*long*/[] result) {
+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);
@@ -279,8 +279,8 @@ public static final int NS_GetServiceManager(int /*long*/[] result) {
  * @param binDirectory cast=(nsIFile *)
  * @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
  */
-public static final native int _NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
-public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider) {
+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);
@@ -292,8 +292,8 @@ public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirec
  * @param path cast=(nsAString *),flags=struct
  * @param result cast=(nsILocalFile**)
  */
-public static final native int _NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);
-public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result) {
+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);
@@ -302,8 +302,8 @@ public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int
 	}
 }
 /** @method flags=new */
-public static final native int /*long*/ _nsEmbedCString_new();
-public static final int /*long*/ nsEmbedCString_new() {
+public static final native long /*int*/ _nsEmbedCString_new();
+public static final long /*int*/ nsEmbedCString_new() {
 	lock.lock();
 	try {
 		return _nsEmbedCString_new();
@@ -315,8 +315,8 @@ public static final int /*long*/ nsEmbedCString_new() {
  * @method flags=new
  * @param aString cast=(const char *)
  */
-public static final native int /*long*/ _nsEmbedCString_new(byte[] aString, int length);
-public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length) {
+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);
@@ -328,8 +328,8 @@ public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length)
  * @method flags=new
  * @param aString cast=(const char *)
  */
-public static final native int /*long*/ _nsEmbedCString_new(int /*long*/ aString, int length);
-public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int length) {
+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);
@@ -341,8 +341,8 @@ public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int le
  * @method flags=delete
  * @param ptr cast=(nsEmbedCString *)
  */
-public static final native void _nsEmbedCString_delete(int /*long*/ ptr);
-public static final void nsEmbedCString_delete(int /*long*/ ptr) {
+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);
@@ -354,8 +354,8 @@ public static final void nsEmbedCString_delete(int /*long*/ ptr) {
  * @method flags=cpp
  * @param ptr cast=(nsEmbedCString *)
  */
-public static final native int _nsEmbedCString_Length(int /*long*/ ptr);
-public static final int nsEmbedCString_Length(int /*long*/ ptr) {
+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);
@@ -367,8 +367,8 @@ public static final int nsEmbedCString_Length(int /*long*/ ptr) {
  * @method flags=cpp
  * @param ptr cast=(nsIScriptGlobalObject *)
  */
-public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang);
-public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang) {
+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);
@@ -380,8 +380,8 @@ public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long
  * @method flags=cpp
  * @param ptr cast=(nsIScriptGlobalObject *)
  */
-public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang);
-public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang) {
+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);
@@ -393,8 +393,8 @@ public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*lo
  * @method flags=cpp
  * @param ptr cast=(nsIScriptContext *)
  */
-public static final native int /*long*/ _nsIScriptContext_GetNativeContext(int /*long*/ ptr);
-public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/ ptr) {
+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);
@@ -406,8 +406,8 @@ public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/
  * @method flags=cpp
  * @param ptr cast=(nsEmbedCString *)
  */
-public static final native int /*long*/ _nsEmbedCString_get(int /*long*/ ptr);
-public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
+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);
@@ -419,8 +419,8 @@ public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
  * @method flags=delete
  * @param ptr cast=(nsID *)
  */
-public static final native void _nsID_delete(int /*long*/ ptr);
-public static final void nsID_delete(int /*long*/ ptr) {
+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);
@@ -429,8 +429,8 @@ public static final void nsID_delete(int /*long*/ ptr) {
 	}
 }
 /** @method flags=new */
-public static final native int /*long*/ _nsID_new();
-public static final int /*long*/ nsID_new() {
+public static final native long /*int*/ _nsID_new();
+public static final long /*int*/ nsID_new() {
 	lock.lock();
 	try {
 		return _nsID_new();
@@ -443,8 +443,8 @@ public static final int /*long*/ nsID_new() {
  * @param ptr cast=(nsID *)
  * @param other cast=(nsID *),flags=struct
  */
-public static final native int _nsID_Equals(int /*long*/ ptr, int /*long*/ other);
-public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
+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);
@@ -453,8 +453,8 @@ public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
 	}
 }
 /** @method flags=new */
-public static final native int /*long*/ _nsEmbedString_new();
-public static final int /*long*/ nsEmbedString_new() {
+public static final native long /*int*/ _nsEmbedString_new();
+public static final long /*int*/ nsEmbedString_new() {
 	lock.lock();
 	try {
 		return _nsEmbedString_new();
@@ -466,8 +466,8 @@ public static final int /*long*/ nsEmbedString_new() {
  * @method flags=new
  * @param aString cast=(PRUnichar *)
  */
-public static final native int /*long*/ _nsEmbedString_new(char[] aString);
-public static final int /*long*/ nsEmbedString_new(char[] aString) {
+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);
@@ -479,8 +479,8 @@ public static final int /*long*/ nsEmbedString_new(char[] aString) {
  * @method flags=delete
  * @param ptr cast=(nsEmbedString *)
  */
-public static final native void _nsEmbedString_delete(int /*long*/ ptr);
-public static final void nsEmbedString_delete(int /*long*/ ptr) {
+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);
@@ -492,8 +492,8 @@ public static final void nsEmbedString_delete(int /*long*/ ptr) {
  * @method flags=cpp
  * @param ptr cast=(nsEmbedString *)
  */
-public static final native int _nsEmbedString_Length(int /*long*/ ptr);
-public static final int nsEmbedString_Length(int /*long*/ ptr) {
+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);
@@ -505,8 +505,8 @@ public static final int nsEmbedString_Length(int /*long*/ ptr) {
  * @method flags=cpp
  * @param ptr cast=(nsEmbedString *)
  */
-public static final native int /*long*/ _nsEmbedString_get(int /*long*/ ptr);
-public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
+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);
@@ -519,8 +519,8 @@ public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
  * @param ptr cast=(nsIMemory *)
  * @param size cast=(size_t)
  */
-public static final native int /*long*/ _nsIMemory_Alloc(int /*long*/ ptr, int size);
-public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
+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);
@@ -534,8 +534,8 @@ public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
  * @param ptr2 cast=(void *)
  * @param size cast=(size_t)
  */
-public static final native int /*long*/ _nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size);
-public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size) {
+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);
@@ -544,8 +544,8 @@ public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long
 	}
 }
 /** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
-public static final native int _XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad);
-public static final int XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad) {
+public static final native int _XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad);
+public static final int XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad) {
 	lock.lock();
 	try {
 		return _XPCOMGlueLoadXULFunctions(functionLoad);
@@ -573,8 +573,8 @@ public static final int XPCOMGlueShutdown() {
 	}
 }
 
-public static final native int _Call(int /*long*/ ptr);
-public static final int Call(int /*long*/ ptr) {
+public static final native int _Call(long /*int*/ ptr);
+public static final int Call(long /*int*/ ptr) {
 	lock.lock();
 	try {
 		return _Call(ptr);
@@ -590,8 +590,8 @@ public static final int Call(int /*long*/ ptr) {
  * @param aFromSegment cast=(const char *)
  * @param aWriteCount cast=(PRUint32 *)
  */
-public static final native int /*long*/ _Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
-public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {
+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);
@@ -607,8 +607,8 @@ public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream,
  * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
  * @param aStaticComponents cast=(nsStaticModuleInfo const *)
  */
-public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount);
-public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount) {
+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);
@@ -623,8 +623,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
  * @param aAppDirectory cast=(nsILocalFile *)
  * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
  */
-public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider);
-public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider) {
+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);
@@ -633,8 +633,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
+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);
@@ -643,8 +643,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
+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);
@@ -652,8 +652,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
+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);
@@ -661,8 +661,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
+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);
@@ -670,8 +670,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
+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);
@@ -679,8 +679,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
+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);
@@ -688,8 +688,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
+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);
@@ -697,8 +697,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
+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);
@@ -706,8 +706,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
+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);
@@ -715,8 +715,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
+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);
@@ -724,8 +724,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0) {
+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);
@@ -733,8 +733,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0) {
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
+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);
@@ -743,8 +743,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1) {
+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);
@@ -752,8 +752,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1)
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1) {
+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);
@@ -761,8 +761,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1) {
+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);
@@ -770,8 +770,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1) {
+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);
@@ -779,8 +779,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1) {
+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);
@@ -788,8 +788,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1) {
+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);
@@ -797,8 +797,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] arg1) {
+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);
@@ -806,8 +806,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, short[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, short[] arg1) {
+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);
@@ -815,8 +815,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, short[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1) {
+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);
@@ -824,8 +824,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, short[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, short[] arg1) {
+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);
@@ -833,8 +833,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, short[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1) {
+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);
@@ -842,8 +842,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1) {
+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);
@@ -851,8 +851,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1) {
+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);
@@ -860,8 +860,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1) {
+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);
@@ -869,8 +869,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, short arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, short arg1) {
+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);
@@ -878,8 +878,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, short
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1) {
+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);
@@ -887,8 +887,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1) {
+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);
@@ -896,8 +896,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1) {
+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);
@@ -905,8 +905,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1) {
+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);
@@ -914,8 +914,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1) {
+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);
@@ -923,8 +923,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1) {
+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);
@@ -932,8 +932,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1) {
+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);
@@ -941,8 +941,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1) {
+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);
@@ -950,8 +950,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1) {
+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);
@@ -959,8 +959,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1) {
+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);
@@ -968,8 +968,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1) {
+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);
@@ -977,8 +977,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1) {
+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);
@@ -986,8 +986,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1) {
+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);
@@ -996,8 +996,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2) {
+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);
@@ -1005,8 +1005,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {
+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);
@@ -1014,8 +1014,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {
+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);
@@ -1023,8 +1023,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2) {
+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);
@@ -1032,8 +1032,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {
+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);
@@ -1041,8 +1041,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1) {
+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);
@@ -1050,8 +1050,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2) {
+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);
@@ -1059,8 +1059,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2) {
+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);
@@ -1068,8 +1068,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {
+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);
@@ -1078,8 +1078,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {
+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);
@@ -1087,8 +1087,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {
+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);
@@ -1096,8 +1096,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {
+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);
@@ -1105,8 +1105,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {
+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);
@@ -1114,8 +1114,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {
+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);
@@ -1123,8 +1123,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {
+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);
@@ -1132,8 +1132,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {
+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);
@@ -1141,8 +1141,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {
+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);
@@ -1150,8 +1150,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {
+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);
@@ -1159,8 +1159,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {
+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);
@@ -1168,8 +1168,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2) {
+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);
@@ -1177,8 +1177,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2) {
+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);
@@ -1186,8 +1186,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2) {
+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);
@@ -1195,8 +1195,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2) {
+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);
@@ -1204,8 +1204,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2) {
+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);
@@ -1213,8 +1213,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2) {
+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);
@@ -1222,8 +1222,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2) {
+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);
@@ -1231,8 +1231,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2) {
+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);
@@ -1240,8 +1240,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2) {
+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);
@@ -1249,8 +1249,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {
+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);
@@ -1258,8 +1258,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {
+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);
@@ -1267,8 +1267,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2) {
+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);
@@ -1276,8 +1276,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {
+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);
@@ -1285,8 +1285,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {
+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);
@@ -1294,8 +1294,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {
+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);
@@ -1303,8 +1303,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {
+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);
@@ -1312,8 +1312,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {
+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);
@@ -1321,8 +1321,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {
+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);
@@ -1330,8 +1330,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {
+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);
@@ -1339,8 +1339,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {
+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);
@@ -1348,8 +1348,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {
+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);
@@ -1357,8 +1357,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {
+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);
@@ -1366,8 +1366,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {
+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);
@@ -1375,8 +1375,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, short arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, short arg2) {
+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);
@@ -1384,8 +1384,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, short arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, short arg2) {
+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);
@@ -1393,8 +1393,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2) {
+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);
@@ -1403,8 +1403,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2) {
+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);
@@ -1412,8 +1412,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2) {
+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);
@@ -1421,8 +1421,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {
+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);
@@ -1430,8 +1430,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {
+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);
@@ -1439,8 +1439,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2) {
+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);
@@ -1448,8 +1448,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2) {
+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);
@@ -1457,8 +1457,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2) {
+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);
@@ -1466,8 +1466,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2) {
+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);
@@ -1475,8 +1475,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2) {
+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);
@@ -1484,8 +1484,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float arg1, int[] arg2) {
+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);
@@ -1493,8 +1493,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float arg1, long[] arg2) {
+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);
@@ -1503,8 +1503,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float a
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {
+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);
@@ -1512,8 +1512,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {
+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);
@@ -1521,8 +1521,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {
+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);
@@ -1530,8 +1530,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {
+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);
@@ -1539,8 +1539,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {
+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);
@@ -1548,8 +1548,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {
+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);
@@ -1557,8 +1557,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {
+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);
@@ -1566,8 +1566,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {
+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);
@@ -1575,8 +1575,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {
+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);
@@ -1584,8 +1584,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {
+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);
@@ -1593,8 +1593,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {
+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);
@@ -1602,8 +1602,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {
+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);
@@ -1611,8 +1611,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {
+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);
@@ -1620,8 +1620,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {
+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);
@@ -1629,8 +1629,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {
+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);
@@ -1638,8 +1638,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {
+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);
@@ -1647,8 +1647,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3) {
+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);
@@ -1656,8 +1656,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
+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);
@@ -1665,8 +1665,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {
+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);
@@ -1674,8 +1674,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {
+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);
@@ -1683,8 +1683,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {
+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);
@@ -1692,8 +1692,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {
+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);
@@ -1701,8 +1701,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {
+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);
@@ -1710,8 +1710,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {
+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);
@@ -1719,8 +1719,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {
+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);
@@ -1728,8 +1728,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {
+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);
@@ -1737,8 +1737,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {
+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);
@@ -1746,8 +1746,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {
+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);
@@ -1755,8 +1755,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {
+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);
@@ -1764,8 +1764,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {
+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);
@@ -1773,8 +1773,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {
+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);
@@ -1782,8 +1782,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {
+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);
@@ -1791,8 +1791,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {
+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);
@@ -1800,8 +1800,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {
+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);
@@ -1809,8 +1809,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {
+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);
@@ -1818,8 +1818,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {
+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);
@@ -1827,8 +1827,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2, long[] arg3) {
+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);
@@ -1836,8 +1836,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {
+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);
@@ -1846,8 +1846,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {
+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);
@@ -1855,8 +1855,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {
+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);
@@ -1864,8 +1864,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {
+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);
@@ -1873,8 +1873,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long[] arg4) {
+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);
@@ -1882,8 +1882,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, long[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, long[] arg4) {
+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);
@@ -1891,8 +1891,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4) {
+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);
@@ -1900,8 +1900,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {
+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);
@@ -1909,8 +1909,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4) {
+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);
@@ -1918,8 +1918,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {
+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);
@@ -1927,8 +1927,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+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);
@@ -1936,8 +1936,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+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);
@@ -1945,8 +1945,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {
+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);
@@ -1954,8 +1954,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {
+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);
@@ -1963,8 +1963,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {
+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);
@@ -1973,8 +1973,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {
+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);
@@ -1982,8 +1982,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {
+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);
@@ -1991,8 +1991,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {
+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);
@@ -2000,8 +2000,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {
+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);
@@ -2009,8 +2009,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, long[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, long[] arg4) {
+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);
@@ -2019,8 +2019,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {
+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);
@@ -2028,8 +2028,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {
+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);
@@ -2037,8 +2037,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {
+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);
@@ -2046,8 +2046,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {
+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);
@@ -2055,8 +2055,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {
+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);
@@ -2064,8 +2064,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {
+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);
@@ -2073,8 +2073,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {
+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);
@@ -2083,8 +2083,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {
+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);
@@ -2092,8 +2092,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
+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);
@@ -2101,8 +2101,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {
+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);
@@ -2110,8 +2110,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {
+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);
@@ -2120,8 +2120,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {
+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);
@@ -2129,8 +2129,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {
+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);
@@ -2138,8 +2138,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {
+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);
@@ -2147,8 +2147,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {
+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);
@@ -2156,8 +2156,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {
+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);
@@ -2165,8 +2165,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+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);
@@ -2174,8 +2174,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+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);
@@ -2183,8 +2183,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
+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);
@@ -2192,8 +2192,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {
+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);
@@ -2201,8 +2201,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {
+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);
@@ -2210,8 +2210,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {
+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);
@@ -2219,8 +2219,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {
+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);
@@ -2228,8 +2228,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {
+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);
@@ -2237,8 +2237,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {
+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);
@@ -2246,8 +2246,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {
+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);
@@ -2255,8 +2255,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {
+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);
@@ -2264,8 +2264,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {
+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);
@@ -2274,8 +2274,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+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);
@@ -2283,8 +2283,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {
+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);
@@ -2292,8 +2292,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+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);
@@ -2301,8 +2301,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+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);
@@ -2310,8 +2310,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {
+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);
@@ -2319,8 +2319,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {
+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);
@@ -2328,8 +2328,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {
+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);
@@ -2337,8 +2337,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {
+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);
@@ -2346,8 +2346,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+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);
@@ -2355,8 +2355,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {
+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);
@@ -2365,8 +2365,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) {
+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);
@@ -2374,8 +2374,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) {
+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);
@@ -2383,8 +2383,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
+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);
@@ -2392,8 +2392,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) {
+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);
@@ -2401,8 +2401,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
+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);
@@ -2411,8 +2411,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) {
+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);
@@ -2420,8 +2420,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) {
+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);
@@ -2429,8 +2429,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+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);
@@ -2438,8 +2438,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+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);
@@ -2447,8 +2447,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+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);
@@ -2456,8 +2456,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+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);
@@ -2465,8 +2465,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ 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 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);
@@ -2474,8 +2474,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ 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 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);
@@ -2483,8 +2483,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ 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 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);
@@ -2492,8 +2492,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ 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 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);
@@ -2501,8 +2501,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ 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 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);
@@ -2510,8 +2510,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 		lock.unlock();
 	}
 }
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ 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 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);
@@ -2520,8 +2520,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ 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 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);
@@ -2530,8 +2530,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
 	}
 }
 
-static final native int _VtblCall(int fnNumber, int /*long*/ 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, int /*long*/ 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 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);
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
index bc22e54b87..9899a99c9c 100644
--- 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
@@ -21,7 +21,7 @@ public class XPCOMObject {
 		IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
 	}
 	
-	private int /*long*/ ppVtable;
+	private long /*int*/ ppVtable;
 
 	static private final int MAX_ARG_COUNT = 12;
 	static private final int MAX_VTABLE_LENGTH = 80;
@@ -31,7 +31,7 @@ public class XPCOMObject {
 	
 	
 public XPCOMObject (int[] argCounts) {
-	int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length + OS_OFFSET];
+	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) {
@@ -42,737 +42,737 @@ public XPCOMObject (int[] argCounts) {
 		}
 	}
 
-	int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
+	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 int /*long*/[] {pVtable}, C.PTR_SIZEOF);
+	XPCOM.memmove (ppVtable, new long /*int*/[] {pVtable}, C.PTR_SIZEOF);
 	ObjectMap.put (new LONG (ppVtable), this);
 }
 	
-static int /*long*/ callback0 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback0 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method0 (args);
 }
-static int /*long*/ callback1 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback1 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method1 (args);
 }
-static int /*long*/ callback10 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback10 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method10 (args);
 }
-static int /*long*/ callback11 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback11 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method11 (args);
 }
-static int /*long*/ callback12 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback12 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method12 (args);
 }
-static int /*long*/ callback13 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback13 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method13 (args);
 }
-static int /*long*/ callback14 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback14 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method14 (args);
 }
-static int /*long*/ callback15 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback15 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method15 (args);
 }
-static int /*long*/ callback16 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback16 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method16 (args);
 }
-static int /*long*/ callback17 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback17 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method17 (args);
 }
-static int /*long*/ callback18 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback18 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method18 (args);
 }
-static int /*long*/ callback19 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback19 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method19 (args);
 }
-static int /*long*/ callback2 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback2 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method2 (args);
 }
-static int /*long*/ callback20 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback20 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method20 (args);
 }
-static int /*long*/ callback21 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback21 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method21 (args);
 }
-static int /*long*/ callback22 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback22 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method22 (args);
 }
-static int /*long*/ callback23 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback23 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method23 (args);
 }
-static int /*long*/ callback24 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback24 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method24 (args);
 }
-static int /*long*/ callback25 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback25 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method25 (args);
 }
-static int /*long*/ callback26 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback26 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method26 (args);
 }
-static int /*long*/ callback27 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback27 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method27 (args);
 }
-static int /*long*/ callback28 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback28 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method28 (args);
 }
-static int /*long*/ callback29 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback29 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method29 (args);
 }
-static int /*long*/ callback3 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback3 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method3 (args);
 }
-static int /*long*/ callback30 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback30 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method30 (args);
 }
-static int /*long*/ callback31 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback31 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method31 (args);
 }
-static int /*long*/ callback32 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback32 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method32 (args);
 }
-static int /*long*/ callback33 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback33 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method33 (args);
 }
-static int /*long*/ callback34 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback34 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method34 (args);
 }
-static int /*long*/ callback35 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback35 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method35 (args);
 }
-static int /*long*/ callback36 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback36 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method36 (args);
 }
-static int /*long*/ callback37 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback37 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method37 (args);
 }
-static int /*long*/ callback38 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback38 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method38 (args);
 }
-static int /*long*/ callback39 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback39 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method39 (args);
 }
-static int /*long*/ callback4 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback4 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method4 (args);
 }
-static int /*long*/ callback40 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback40 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method40 (args);
 }
-static int /*long*/ callback41 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback41 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method41 (args);
 }
-static int /*long*/ callback42 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback42 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method42 (args);
 }
-static int /*long*/ callback43 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback43 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method43 (args);
 }
-static int /*long*/ callback44 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback44 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method44 (args);
 }
-static int /*long*/ callback45 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback45 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method45 (args);
 }
-static int /*long*/ callback46 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback46 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method46 (args);
 }
-static int /*long*/ callback47 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback47 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method47 (args);
 }
-static int /*long*/ callback48 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback48 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method48 (args);
 }
-static int /*long*/ callback49 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback49 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method49 (args);
 }
-static int /*long*/ callback5 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback5 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method5 (args);
 }
-static int /*long*/ callback50 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback50 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method50 (args);
 }
-static int /*long*/ callback51 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback51 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method51 (args);
 }
-static int /*long*/ callback52 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback52 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method52 (args);
 }
-static int /*long*/ callback53 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback53 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method53 (args);
 }
-static int /*long*/ callback54 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback54 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method54 (args);
 }
-static int /*long*/ callback55 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback55 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method55 (args);
 }
-static int /*long*/ callback56 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback56 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method56 (args);
 }
-static int /*long*/ callback57 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback57 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method57 (args);
 }
-static int /*long*/ callback58 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback58 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method58 (args);
 }
-static int /*long*/ callback59 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback59 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method59 (args);
 }
-static int /*long*/ callback6 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback6 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method6 (args);
 }
-static int /*long*/ callback60 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback60 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method60 (args);
 }
-static int /*long*/ callback61 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback61 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method61 (args);
 }
-static int /*long*/ callback62 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback62 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method62 (args);
 }
-static int /*long*/ callback63 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback63 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method63 (args);
 }
-static int /*long*/ callback64 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback64 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method64 (args);
 }
-static int /*long*/ callback65 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback65 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method65 (args);
 }
-static int /*long*/ callback66 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback66 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method66 (args);
 }
-static int /*long*/ callback67 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback67 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method67 (args);
 }
-static int /*long*/ callback68 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback68 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method68 (args);
 }
-static int /*long*/ callback69 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback69 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method69 (args);
 }
-static int /*long*/ callback7 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback7 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method7 (args);
 }
-static int /*long*/ callback70 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback70 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method70 (args);
 }
-static int /*long*/ callback71 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback71 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method71 (args);
 }
-static int /*long*/ callback72 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback72 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method72 (args);
 }
-static int /*long*/ callback73 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback73 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method73 (args);
 }
-static int /*long*/ callback74 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback74 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method74 (args);
 }
-static int /*long*/ callback75 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback75 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method75 (args);
 }
-static int /*long*/ callback76 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback76 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method76 (args);
 }
-static int /*long*/ callback77 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback77 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method77 (args);
 }
-static int /*long*/ callback78 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback78 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method78 (args);
 }
-static int /*long*/ callback79 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback79 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method79 (args);
 }
-static int /*long*/ callback8 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback8 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method8 (args);
 }
-static int /*long*/ callback9 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback9 (long /*int*/[] callbackArgs) {
 	// find the object on which this call was invoked
-	int /*long*/ address = callbackArgs[0];
+	long /*int*/ address = callbackArgs[0];
 	Object object = ObjectMap.get (new LONG (address));
 	if (object == null) return XPCOM.NS_ERROR_FAILURE;
-	int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+	long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
 	System.arraycopy (callbackArgs, 1, args, 0, args.length);
 	return ((XPCOMObject) object).method9 (args);
 }
 
 public void dispose() {
 	// free the memory for this reference
-	int /*long*/[] pVtable = new int /*long*/[1];
+	long /*int*/[] pVtable = new long /*int*/[1];
 	XPCOM.memmove (pVtable, ppVtable, C.PTR_SIZEOF);
 	C.free (pVtable[0]);
 	C.free (ppVtable);	
@@ -783,248 +783,248 @@ public void dispose() {
 	ppVtable = 0;
 }
 	
-public int /*long*/ getAddress () {
+public long /*int*/ getAddress () {
 	return ppVtable;
 }
 
-public int /*long*/ method0 (int /*long*/[] args) {
+public long /*int*/ method0 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method1 (int /*long*/[] args) {
+public long /*int*/ method1 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method10 (int /*long*/[] args) {
+public long /*int*/ method10 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method11 (int /*long*/[] args) {
+public long /*int*/ method11 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method12 (int /*long*/[] args) {
+public long /*int*/ method12 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method13 (int /*long*/[] args) {
+public long /*int*/ method13 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method14 (int /*long*/[] args) {
+public long /*int*/ method14 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method15 (int /*long*/[] args) {
+public long /*int*/ method15 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method16 (int /*long*/[] args) {
+public long /*int*/ method16 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method17 (int /*long*/[] args) {
+public long /*int*/ method17 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method18 (int /*long*/[] args) {
+public long /*int*/ method18 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method19 (int /*long*/[] args) {
+public long /*int*/ method19 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method2 (int /*long*/[] args) {
+public long /*int*/ method2 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method20 (int /*long*/[] args) {
+public long /*int*/ method20 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method21 (int /*long*/[] args) {
+public long /*int*/ method21 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method22 (int /*long*/[] args) {
+public long /*int*/ method22 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method23 (int /*long*/[] args) {
+public long /*int*/ method23 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method24 (int /*long*/[] args) {
+public long /*int*/ method24 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method25 (int /*long*/[] args) {
+public long /*int*/ method25 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method26 (int /*long*/[] args) {
+public long /*int*/ method26 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method27 (int /*long*/[] args) {
+public long /*int*/ method27 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method28 (int /*long*/[] args) {
+public long /*int*/ method28 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method29 (int /*long*/[] args) {
+public long /*int*/ method29 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method3 (int /*long*/[] args) {
+public long /*int*/ method3 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method30 (int /*long*/[] args) {
+public long /*int*/ method30 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method31 (int /*long*/[] args) {
+public long /*int*/ method31 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method32 (int /*long*/[] args) {
+public long /*int*/ method32 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method33 (int /*long*/[] args) {
+public long /*int*/ method33 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method34 (int /*long*/[] args) {
+public long /*int*/ method34 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method35 (int /*long*/[] args) {
+public long /*int*/ method35 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method36 (int /*long*/[] args) {
+public long /*int*/ method36 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method37 (int /*long*/[] args) {
+public long /*int*/ method37 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method38 (int /*long*/[] args) {
+public long /*int*/ method38 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method39 (int /*long*/[] args) {
+public long /*int*/ method39 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method4 (int /*long*/[] args) {
+public long /*int*/ method4 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method40 (int /*long*/[] args) {
+public long /*int*/ method40 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method41 (int /*long*/[] args) {
+public long /*int*/ method41 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method42 (int /*long*/[] args) {
+public long /*int*/ method42 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method43 (int /*long*/[] args) {
+public long /*int*/ method43 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method44 (int /*long*/[] args) {
+public long /*int*/ method44 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method45 (int /*long*/[] args) {
+public long /*int*/ method45 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method46 (int /*long*/[] args) {
+public long /*int*/ method46 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method47 (int /*long*/[] args) {
+public long /*int*/ method47 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method48 (int /*long*/[] args) {
+public long /*int*/ method48 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method49 (int /*long*/[] args) {
+public long /*int*/ method49 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method5 (int /*long*/[] args) {
+public long /*int*/ method5 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method50 (int /*long*/[] args) {
+public long /*int*/ method50 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method51 (int /*long*/[] args) {
+public long /*int*/ method51 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method52 (int /*long*/[] args) {
+public long /*int*/ method52 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method53 (int /*long*/[] args) {
+public long /*int*/ method53 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method54 (int /*long*/[] args) {
+public long /*int*/ method54 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method55 (int /*long*/[] args) {
+public long /*int*/ method55 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method56 (int /*long*/[] args) {
+public long /*int*/ method56 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method57 (int /*long*/[] args) {
+public long /*int*/ method57 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method58 (int /*long*/[] args) {
+public long /*int*/ method58 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method59 (int /*long*/[] args) {
+public long /*int*/ method59 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method6 (int /*long*/[] args) {
+public long /*int*/ method6 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method60 (int /*long*/[] args) {
+public long /*int*/ method60 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method61 (int /*long*/[] args) {
+public long /*int*/ method61 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method62 (int /*long*/[] args) {
+public long /*int*/ method62 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method63 (int /*long*/[] args) {
+public long /*int*/ method63 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method64 (int /*long*/[] args) {
+public long /*int*/ method64 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method65 (int /*long*/[] args) {
+public long /*int*/ method65 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method66 (int /*long*/[] args) {
+public long /*int*/ method66 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method67 (int /*long*/[] args) {
+public long /*int*/ method67 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method68 (int /*long*/[] args) {
+public long /*int*/ method68 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method69 (int /*long*/[] args) {
+public long /*int*/ method69 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method7 (int /*long*/[] args) {
+public long /*int*/ method7 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method70 (int /*long*/[] args) {
+public long /*int*/ method70 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method71 (int /*long*/[] args) {
+public long /*int*/ method71 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method72 (int /*long*/[] args) {
+public long /*int*/ method72 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method73 (int /*long*/[] args) {
+public long /*int*/ method73 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method74 (int /*long*/[] args) {
+public long /*int*/ method74 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method75 (int /*long*/[] args) {
+public long /*int*/ method75 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method76 (int /*long*/[] args) {
+public long /*int*/ method76 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method77 (int /*long*/[] args) {
+public long /*int*/ method77 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method78 (int /*long*/[] args) {
+public long /*int*/ method78 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method79 (int /*long*/[] args) {
+public long /*int*/ method79 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method8 (int /*long*/[] args) {
+public long /*int*/ method8 (long /*int*/[] args) {
 	return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
-public int /*long*/ method9 (int /*long*/[] args) {
+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
index d5935e3d38..86b1d82ab5 100644
--- 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
@@ -30,8 +30,8 @@ package org.eclipse.swt.internal.mozilla.init;
 /** @jniclass flags=cpp */
 public class GREProperty {
 	/** @field cast=(const char *) */
-	public int /*long*/ property;
+	public long /*int*/ property;
 	/** @field cast=(const char *) */
-	public int /*long*/ value;
+	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
index 0ec838bd5f..18272a563f 100644
--- 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
@@ -30,10 +30,10 @@ package org.eclipse.swt.internal.mozilla.init;
 /** @jniclass flags=cpp */
 public class GREVersionRange {
     /** @field cast=(const char *) */
-	public int /*long*/ lower;
+	public long /*int*/ lower;
     public boolean lowerInclusive;
     /** @field cast=(const char *) */
-	public int /*long*/ upper;
+	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
index d8901f2166..aa38c4cd8b 100644
--- 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
@@ -41,8 +41,8 @@ public static final native int GREVersionRange_sizeof ();
  * @param properties cast=(const GREProperty *)
  * @param buffer cast=(char *)
  */
-public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, int /*long*/ buffer, int buflen);
-public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, int /*long*/ buffer, int buflen) {
+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);
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
index 10530015c4..0baee98f62 100644
--- 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
@@ -29,7 +29,7 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsDynamicFunctionLoad {
     /** @field cast=(const char *) */
-	public int /*long*/ functionName;
+	public long /*int*/ functionName;
 	/** @field cast=(NSFuncPtr  *) */
-	public int /*long*/ function;
+	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
index 162a0ad89c..ad9d4538e7 100644
--- 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
@@ -28,7 +28,7 @@
 package org.eclipse.swt.internal.mozilla;
 
 public class nsEmbedString {
-	int /*long*/ handle;
+	long /*int*/ handle;
 	
 public nsEmbedString() {
 	handle = XPCOM.nsEmbedString_new();
@@ -42,14 +42,14 @@ public nsEmbedString(String string) {
 	}   
 }
 
-public int /*long*/ getAddress() {
+public long /*int*/ getAddress() {
 	return handle;
 }	
 	
 public String toString() {
 	if (handle == 0) return null;
 	int length = XPCOM.nsEmbedString_Length(handle);
-	int /*long*/ buffer = XPCOM.nsEmbedString_get(handle);
+	long /*int*/ buffer = XPCOM.nsEmbedString_get(handle);
 	char[] dest = new char[length];
 	XPCOM.memmove(dest, buffer, length * 2);
 	return new String(dest);
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
index 9ce7481d72..c67dd14e7c 100644
--- 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
@@ -37,11 +37,11 @@ public class nsIAppShell extends nsISupports {
 	public static final nsID NS_IAPPSHELL_IID =
 		new nsID(NS_IAPPSHELL_IID_STR);
 
-	public nsIAppShell(int /*long*/ address) {
+	public nsIAppShell(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Create(int /*long*/ argc, int /*long*/[] argv) {
+	public int Create(long /*int*/ argc, long /*int*/[] argv) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
 	}
 
@@ -57,15 +57,15 @@ public class nsIAppShell extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
 	}
 
-	public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
+	public int ListenToEventQueue(long /*int*/ aQueue, int aListen) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
 	}
 
-	public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
+	public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
 	}
 
-	public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
+	public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
 	}
 
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
index 41cb4e2b3f..050ac5f981 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIAuthInformation extends nsISupports {
 	public static final nsID NS_IAUTHINFORMATION_IID =
 		new nsID(NS_IAUTHINFORMATION_IID_STR);
 
-	public nsIAuthInformation(int /*long*/ address) {
+	public nsIAuthInformation(long /*int*/ address) {
 		super(address);
 	}
 
@@ -50,35 +50,35 @@ public class nsIAuthInformation extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags);
 	}
 
-	public int GetRealm(int /*long*/ aRealm) {
+	public int GetRealm(long /*int*/ aRealm) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm);
 	}
 
-	public int GetAuthenticationScheme(int /*long*/ aAuthenticationScheme) {
+	public int GetAuthenticationScheme(long /*int*/ aAuthenticationScheme) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aAuthenticationScheme);
 	}
 
-	public int GetUsername(int /*long*/ aUsername) {
+	public int GetUsername(long /*int*/ aUsername) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername);
 	}
 
-	public int SetUsername(int /*long*/ aUsername) {
+	public int SetUsername(long /*int*/ aUsername) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aUsername);
 	}
 
-	public int GetPassword(int /*long*/ aPassword) {
+	public int GetPassword(long /*int*/ aPassword) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPassword);
 	}
 
-	public int SetPassword(int /*long*/ aPassword) {
+	public int SetPassword(long /*int*/ aPassword) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword);
 	}
 
-	public int GetDomain(int /*long*/ aDomain) {
+	public int GetDomain(long /*int*/ aDomain) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aDomain);
 	}
 
-	public int SetDomain(int /*long*/ aDomain) {
+	public int SetDomain(long /*int*/ aDomain) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java
index a1b88d8c62..f13efea66f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java
@@ -37,7 +37,7 @@ public class nsIAuthPrompt2 extends nsISupports {
 	public static final nsID NS_IAUTHPROMPT2_IID =
 		new nsID(NS_IAUTHPROMPT2_IID_STR);
 
-	public nsIAuthPrompt2(int /*long*/ address) {
+	public nsIAuthPrompt2(long /*int*/ address) {
 		super(address);
 	}
 
@@ -45,11 +45,11 @@ public class nsIAuthPrompt2 extends nsISupports {
 	public static final int LEVEL_PW_ENCRYPTED = 1;
 	public static final int LEVEL_SECURE = 2;
 
-	public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+	public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
 		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
 	}
 
-	public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
+	public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
index 39c0009366..583214061c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
@@ -37,11 +37,11 @@ public class nsIBadCertListener2 extends nsISupports {
 	public static final nsID NS_IBADCERTLISTENER2_IID =
 		new nsID(NS_IBADCERTLISTENER2_IID_STR);
 
-	public nsIBadCertListener2(int /*long*/ address) {
+	public nsIBadCertListener2(long /*int*/ address) {
 		super(address);
 	}
 
-	public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {
+	public int NotifyCertProblem(long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);
 	}
 }
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
index 4d62dde75d..d67711f3ea 100644
--- 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
@@ -43,11 +43,11 @@ public class nsIBaseWindow extends nsISupports {
 	public static final nsID NS_IBASEWINDOW_10_IID =
 		new nsID(NS_IBASEWINDOW_10_IID_STR);
 		
-	public nsIBaseWindow(int /*long*/ address) {
+	public nsIBaseWindow(long /*int*/ address) {
 		super(address);
 	}
 
-	public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
+	public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
 	}
 
@@ -87,19 +87,19 @@ public class nsIBaseWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
 	}
 
-	public int GetParentWidget(int /*long*/[] aParentWidget) {
+	public int GetParentWidget(long /*int*/[] aParentWidget) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
 	}
 
-	public int SetParentWidget(int /*long*/ aParentWidget) {
+	public int SetParentWidget(long /*int*/ aParentWidget) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
 	}
 
-	public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
+	public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
 	}
 
-	public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
+	public int SetParentNativeWindow(long /*int*/ aParentNativeWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
 	}
 
@@ -129,7 +129,7 @@ public class nsIBaseWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
 	}
 
-	public int GetMainWidget(int /*long*/[] aMainWidget) {
+	public int GetMainWidget(long /*int*/[] aMainWidget) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 21), getAddress(), aMainWidget);
 	}
 
@@ -137,7 +137,7 @@ public class nsIBaseWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 22), getAddress());
 	}
 
-	public int GetTitle(int /*long*/[] aTitle) {
+	public int GetTitle(long /*int*/[] aTitle) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 23), getAddress(), aTitle);
 	}
 
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
index e20f203922..b6af27d800 100644
--- 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
@@ -37,7 +37,7 @@ public class nsICancelable extends nsISupports {
 	public static final nsID NS_ICANCELABLE_IID =
 		new nsID(NS_ICANCELABLE_IID_STR);
 
-	public nsICancelable(int /*long*/ address) {
+	public nsICancelable(long /*int*/ address) {
 		super(address);
 	}
 
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
index 8417352efa..5189b63df2 100644
--- 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
@@ -37,15 +37,15 @@ public class nsICategoryManager extends nsISupports {
 	public static final nsID NS_ICATEGORYMANAGER_IID =
 		new nsID(NS_ICATEGORYMANAGER_IID_STR);
 
-	public nsICategoryManager(int /*long*/ address) {
+	public nsICategoryManager(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
+	public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
 	}
 
-	public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
+	public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
 	}
 
@@ -57,11 +57,11 @@ public class nsICategoryManager extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
 	}
 
-	public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
+	public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
 	}
 
-	public int EnumerateCategories(int /*long*/[] _retval) {
+	public int EnumerateCategories(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _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
index 6da76cf159..fbd2c66182 100644
--- 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
@@ -37,7 +37,7 @@ public class nsICertOverrideService extends nsISupports {
 	public static final nsID NS_ICERTOVERRIDESERVICE_IID =
 		new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
 
-	public nsICertOverrideService(int /*long*/ address) {
+	public nsICertOverrideService(long /*int*/ address) {
 		super(address);
 	}
 
@@ -45,27 +45,27 @@ public class nsICertOverrideService extends nsISupports {
 	public static final int ERROR_MISMATCH = 2;
 	public static final int ERROR_TIME = 4;
 
-	public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) {
+	public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);
 	}
 
-	public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+	public int HasMatchingOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval);
 	}
 
-	public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+	public int GetValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aHashAlg, long /*int*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval);
 	}
 
-	public int ClearValidityOverride(int /*long*/ aHostName, int aPort) {
+	public int ClearValidityOverride(long /*int*/ aHostName, int aPort) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort);
 	}
 
-	public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) {
+	public int GetAllOverrideHostsWithPorts(int[] aCount, long /*int*/[] aHostsWithPortsArray) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray);
 	}
 
-	public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
+	public int IsCertUsedForOverrides(long /*int*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);
 	}
 }
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
index 9838c2dde0..a6968ceead 100644
--- 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
@@ -37,31 +37,31 @@ public class nsICertificateDialogs extends nsISupports {
 	public static final nsID NS_ICERTIFICATEDIALOGS_IID =
 		new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);
 
-	public nsICertificateDialogs(int /*long*/ address) {
+	public nsICertificateDialogs(long /*int*/ address) {
 		super(address);
 	}
 
-	public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) {
+	public int ConfirmDownloadCACert(long /*int*/ ctx, long /*int*/ cert, int[] trust, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval);
 	}
 
-	public int NotifyCACertExists(int /*long*/ ctx) {
+	public int NotifyCACertExists(long /*int*/ ctx) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx);
 	}
 
-	public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
+	public int SetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval);
 	}
 
-	public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
+	public int GetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval);
 	}
 
-	public int ViewCert(int /*long*/ ctx, int /*long*/ cert) {
+	public int ViewCert(long /*int*/ ctx, long /*int*/ cert) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert);
 	}
 
-	public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {
+	public int CrlImportStatusDialog(long /*int*/ ctx, long /*int*/ crl) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);
 	}
 }
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
index 51559cc455..9a6517d9a4 100644
--- 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
@@ -43,55 +43,55 @@ public class nsIChannel extends nsIRequest {
 	public static final nsID NS_ICHANNEL_10_IID =
 		new nsID(NS_ICHANNEL_10_IID_STR);
 
-	public nsIChannel(int /*long*/ address) {
+	public nsIChannel(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetOriginalURI(int /*long*/[] aOriginalURI) {
+	public int GetOriginalURI(long /*int*/[] aOriginalURI) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 1, getAddress(), aOriginalURI);
 	}
 
-	public int SetOriginalURI(int /*long*/ aOriginalURI) {
+	public int SetOriginalURI(long /*int*/ aOriginalURI) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 2, getAddress(), aOriginalURI);
 	}
 
-	public int GetURI(int /*long*/[] aURI) {
+	public int GetURI(long /*int*/[] aURI) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 3, getAddress(), aURI);
 	}
 
-	public int GetOwner(int /*long*/[] aOwner) {
+	public int GetOwner(long /*int*/[] aOwner) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 4, getAddress(), aOwner);
 	}
 
-	public int SetOwner(int /*long*/ aOwner) {
+	public int SetOwner(long /*int*/ aOwner) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 5, getAddress(), aOwner);
 	}
 
-	public int GetNotificationCallbacks(int /*long*/[] aNotificationCallbacks) {
+	public int GetNotificationCallbacks(long /*int*/[] aNotificationCallbacks) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 6, getAddress(), aNotificationCallbacks);
 	}
 
-	public int SetNotificationCallbacks(int /*long*/ aNotificationCallbacks) {
+	public int SetNotificationCallbacks(long /*int*/ aNotificationCallbacks) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 7, getAddress(), aNotificationCallbacks);
 	}
 
-	public int GetSecurityInfo(int /*long*/[] aSecurityInfo) {
+	public int GetSecurityInfo(long /*int*/[] aSecurityInfo) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 8, getAddress(), aSecurityInfo);
 	}
 
-	public int GetContentType(int /*long*/ aContentType) {
+	public int GetContentType(long /*int*/ aContentType) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 9, getAddress(), aContentType);
 	}
 
-	public int SetContentType(int /*long*/ aContentType) {
+	public int SetContentType(long /*int*/ aContentType) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 10, getAddress(), aContentType);
 	}
 
-	public int GetContentCharset(int /*long*/ aContentCharset) {
+	public int GetContentCharset(long /*int*/ aContentCharset) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 11, getAddress(), aContentCharset);
 	}
 
-	public int SetContentCharset(int /*long*/ aContentCharset) {
+	public int SetContentCharset(long /*int*/ aContentCharset) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 12, getAddress(), aContentCharset);
 	}
 
@@ -103,11 +103,11 @@ public class nsIChannel extends nsIRequest {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 14, getAddress(), aContentLength);
 	}
 
-	public int Open(int /*long*/[] _retval) {
+	public int Open(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 15, getAddress(), _retval);
 	}
 
-	public int AsyncOpen(int /*long*/ aListener, int /*long*/ aContext) {
+	public int AsyncOpen(long /*int*/ aListener, long /*int*/ aContext) {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);
 	}
 
@@ -116,12 +116,12 @@ public class nsIChannel extends nsIRequest {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 17, getAddress(), aContentDisposition);
 	}
 
-	public int GetContentDispositionFilename(int /*long*/ aContentDispositionFilename) {
+	public int GetContentDispositionFilename(long /*int*/ aContentDispositionFilename) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 18, getAddress(), aContentDispositionFilename);
 	}
 
-	public int GetContentDispositionHeader(int /*long*/ aContentDispositionHeader) {
+	public int GetContentDispositionHeader(long /*int*/ aContentDispositionHeader) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 19, getAddress(), aContentDispositionHeader);
 	}
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
index 92f9c35ada..58d68a4aab 100644
--- 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
@@ -37,27 +37,27 @@ public class nsIClassInfo extends nsISupports {
 	public static final nsID NS_ICLASSINFO_IID =
 		new nsID(NS_ICLASSINFO_IID_STR);
 
-	public nsIClassInfo(int /*long*/ address) {
+	public nsIClassInfo(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetInterfaces(int[] count, int /*long*/[] array) {
+	public int GetInterfaces(int[] count, long /*int*/[] array) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array);
 	}
 
-	public int GetHelperForLanguage(int language, int /*long*/[] _retval) {
+	public int GetHelperForLanguage(int language, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval);
 	}
 
-	public int GetContractID(int /*long*/[] aContractID) {
+	public int GetContractID(long /*int*/[] aContractID) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID);
 	}
 
-	public int GetClassDescription(int /*long*/[] aClassDescription) {
+	public int GetClassDescription(long /*int*/[] aClassDescription) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription);
 	}
 
-	public int GetClassID(int /*long*/ aClassID) {
+	public int GetClassID(long /*int*/ aClassID) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);
 	}
 
@@ -78,7 +78,7 @@ public class nsIClassInfo extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);
 	}
 
-	public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) {
+	public int GetClassIDNoAlloc(long /*int*/ aClassIDNoAlloc) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);
 	}
 }
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
index 9da2f35ba5..7140219d74 100644
--- 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
@@ -37,23 +37,23 @@ public class nsIComponentManager extends nsISupports {
 	public static final nsID NS_ICOMPONENTMANAGER_IID =
 		new nsID(NS_ICOMPONENTMANAGER_IID_STR);
 
-	public nsIComponentManager(int /*long*/ address) {
+	public nsIComponentManager(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetClassObject(nsID aClass, nsID aIID, int /*long*/[] result) {
+	public int GetClassObject(nsID aClass, nsID aIID, long /*int*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
 	}
 
-	public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
+	public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
 	}
 
-	public int CreateInstance(nsID aClass, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
+	public int CreateInstance(nsID aClass, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aDelegate, aIID, result);
 	}
 
-	public int CreateInstanceByContractID(byte[] aContractID, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
+	public int CreateInstanceByContractID(byte[] aContractID, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, 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
index 6ff0cfff91..ce333513d7 100644
--- 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
@@ -37,31 +37,31 @@ public class nsIComponentRegistrar extends nsISupports {
 	public static final nsID NS_ICOMPONENTREGISTRAR_IID =
 		new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
 
-	public nsIComponentRegistrar(int /*long*/ address) {
+	public nsIComponentRegistrar(long /*int*/ address) {
 		super(address);
 	}
 
-	public int AutoRegister(int /*long*/ aSpec) {
+	public int AutoRegister(long /*int*/ aSpec) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
 	}
 
-	public int AutoUnregister(int /*long*/ aSpec) {
+	public int AutoUnregister(long /*int*/ aSpec) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
 	}
 
-	public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
+	public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
 	}
 
-	public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
+	public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
 	}
 
-	public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
+	public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
 	}
 
-	public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
+	public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
 	}
 
@@ -73,19 +73,19 @@ public class nsIComponentRegistrar extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
 	}
 
-	public int EnumerateCIDs(int /*long*/[] _retval) {
+	public int EnumerateCIDs(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
 	}
 
-	public int EnumerateContractIDs(int /*long*/[] _retval) {
+	public int EnumerateContractIDs(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
 	}
 
-	public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
+	public int CIDToContractID(nsID aClass, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
 	}
 
-	public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
+	public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
index 8cbac68536..3e4d4b92c8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
@@ -37,7 +37,7 @@ public class nsIContextMenuListener extends nsISupports {
 	public static final nsID NS_ICONTEXTMENULISTENER_IID =
 		new nsID(NS_ICONTEXTMENULISTENER_IID_STR);
 
-	public nsIContextMenuListener(int /*long*/ address) {
+	public nsIContextMenuListener(long /*int*/ address) {
 		super(address);
 	}
 
@@ -48,7 +48,7 @@ public class nsIContextMenuListener extends nsISupports {
 	public static final int CONTEXT_TEXT = 8;
 	public static final int CONTEXT_INPUT = 16;
 
-	public int OnShowContextMenu(int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
+	public int OnShowContextMenu(int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode);
 	}
 }
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
index 76a1d64b9f..446992922f 100644
--- 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
@@ -37,15 +37,15 @@ public class nsICookie extends nsISupports {
 	public static final nsID NS_ICOOKIE_IID =
 		new nsID(NS_ICOOKIE_IID_STR);
 
-	public nsICookie(int /*long*/ address) {
+	public nsICookie(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetName(int /*long*/ aName) {
+	public int GetName(long /*int*/ aName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
 	}
 
-	public int GetValue(int /*long*/ aValue) {
+	public int GetValue(long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
 	}
 
@@ -53,11 +53,11 @@ public class nsICookie extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
 	}
 
-	public int GetHost(int /*long*/ aHost) {
+	public int GetHost(long /*int*/ aHost) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
 	}
 
-	public int GetPath(int /*long*/ aPath) {
+	public int GetPath(long /*int*/ aPath) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
 	}
 
@@ -75,7 +75,7 @@ public class nsICookie extends nsISupports {
 	public static final int STATUS_FLAGGED = 3;
 	public static final int STATUS_REJECTED = 4;
 
-	public int GetStatus(int /*long*/ aStatus) {
+	public int GetStatus(long /*int*/ aStatus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
 	}
 
@@ -86,7 +86,7 @@ public class nsICookie extends nsISupports {
 	public static final int POLICY_EXPLICIT_CONSENT = 4;
 	public static final int POLICY_NO_II = 5;
 
-	public int GetPolicy(int /*long*/ aPolicy) {
+	public int GetPolicy(long /*int*/ aPolicy) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
 	}
 }
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
index a925dd8cc2..56c8a12bf8 100644
--- 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
@@ -37,7 +37,7 @@ public class nsICookieManager extends nsISupports {
 	public static final nsID NS_ICOOKIEMANAGER_IID =
 		new nsID(NS_ICOOKIEMANAGER_IID_STR);
 
-	public nsICookieManager(int /*long*/ address) {
+	public nsICookieManager(long /*int*/ address) {
 		super(address);
 	}
 
@@ -45,11 +45,11 @@ public class nsICookieManager extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
 	}
 
-	public int GetEnumerator(int /*long*/[] aEnumerator) {
+	public int GetEnumerator(long /*int*/[] aEnumerator) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
 	}
 
-	public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
+	public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, 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
index eebe8abb43..86407ec412 100644
--- 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
@@ -37,23 +37,23 @@ public class nsICookieService extends nsISupports {
 	public static final nsID NS_ICOOKIESERVICE_IID =
 		new nsID(NS_ICOOKIESERVICE_IID_STR);
 
-	public nsICookieService(int /*long*/ address) {
+	public nsICookieService(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+	public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
 	}
 
-	public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+	public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
 	}
 
-	public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+	public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
 	}
 
-	public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+	public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
index afff59ff8f..cc203de936 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
@@ -37,23 +37,23 @@ public class nsICookieService_1_9 extends nsISupports {
 	public static final nsID NS_ICOOKIESERVICE_IID =
 		new nsID(NS_ICOOKIESERVICE_IID_STR);
 
-	public nsICookieService_1_9(int /*long*/ address) {
+	public nsICookieService_1_9(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+	public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
 	}
 
-	public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+	public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
 	}
 
-	public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+	public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
 	}
 
-	public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+	public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, 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
index 9e2a28b520..71987ad099 100644
--- 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
@@ -46,9 +46,9 @@ public nsID(String id) {
 }
 
 public boolean Equals(nsID other) {
-	int /*long*/ ptr = XPCOM.nsID_new ();
+	long /*int*/ ptr = XPCOM.nsID_new ();
 	XPCOM.memmove (ptr, this, nsID.sizeof);
-	int /*long*/ otherPtr = XPCOM.nsID_new ();
+	long /*int*/ otherPtr = XPCOM.nsID_new ();
 	XPCOM.memmove (otherPtr, other, nsID.sizeof);
 	boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
 	XPCOM.nsID_delete (ptr);
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
index 36134ceebb..2ff7477231 100644
--- 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
@@ -43,166 +43,166 @@ public class nsIDOMDocument extends nsIDOMNode {
 	public static final nsID NS_IDOMDOCUMENT_10_IID =
 		new nsID(NS_IDOMDOCUMENT_10_IID_STR);
 
-	public nsIDOMDocument(int /*long*/ address) {
+	public nsIDOMDocument(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetDoctype(int /*long*/[] aDoctype) {
+	public int GetDoctype(long /*int*/[] aDoctype) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aDoctype);
 	}
 
-	public int GetImplementation(int /*long*/[] aImplementation) {
+	public int GetImplementation(long /*int*/[] aImplementation) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), aImplementation);
 	}
 
-	public int GetDocumentElement(int /*long*/[] aDocumentElement) {
+	public int GetDocumentElement(long /*int*/[] aDocumentElement) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), aDocumentElement);
 	}
 
-	public int CreateElement(int /*long*/ tagName, int /*long*/[] _retval) {
+	public int CreateElement(long /*int*/ tagName, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), tagName, _retval);
 	}
 
-	public int CreateDocumentFragment(int /*long*/[] _retval) {
+	public int CreateDocumentFragment(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), _retval);
 	}
 
-	public int CreateTextNode(int /*long*/ data, int /*long*/[] _retval) {
+	public int CreateTextNode(long /*int*/ data, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), data, _retval);
 	}
 
-	public int CreateComment(int /*long*/ data, int /*long*/[] _retval) {
+	public int CreateComment(long /*int*/ data, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), data, _retval);
 	}
 
-	public int CreateCDATASection(int /*long*/ data, int /*long*/[] _retval) {
+	public int CreateCDATASection(long /*int*/ data, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), data, _retval);
 	}
 
-	public int CreateProcessingInstruction(int /*long*/ target, int /*long*/ data, int /*long*/[] _retval) {
+	public int CreateProcessingInstruction(long /*int*/ target, long /*int*/ data, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), target, data, _retval);
 	}
 
-	public int CreateAttribute(int /*long*/ name, int /*long*/[] _retval) {
+	public int CreateAttribute(long /*int*/ name, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), name, _retval);
 	}
 
-	public int CreateEntityReference(int /*long*/ name, int /*long*/[] _retval) {
+	public int CreateEntityReference(long /*int*/ name, long /*int*/[] _retval) {
 		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), name, _retval);
 	}
 
-	public int GetElementsByTagName(int /*long*/ tagname, int /*long*/[] _retval) {
+	public int GetElementsByTagName(long /*int*/ tagname, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 12), getAddress(), tagname, _retval);
 	}
 
-	public int ImportNode(int /*long*/ importedNode, int deep, int /*long*/[] _retval) {
+	public int ImportNode(long /*int*/ importedNode, int deep, long /*int*/[] _retval) {
 		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), importedNode, deep, _retval);
 	}
 
-	public int ImportNode(int /*long*/ importedNode, int deep, int _argc, int /*long*/[] _retval) {
+	public int ImportNode(long /*int*/ importedNode, int deep, int _argc, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), importedNode, deep, _argc, _retval);
 	}
 
-	public int CreateElementNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
+	public int CreateElementNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 14), getAddress(), namespaceURI, qualifiedName, _retval);
 	}
 
-	public int CreateAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
+	public int CreateAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), namespaceURI, qualifiedName, _retval);
 	}
 
-	public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+	public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), namespaceURI, localName, _retval);
 	}
 
-	public int GetElementById(int /*long*/ elementId, int /*long*/[] _retval) {
+	public int GetElementById(long /*int*/ elementId, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 17), getAddress(), elementId, _retval);
 	}
 	
-	public int GetInputEncoding(int /*long*/ aInputEncoding) {
+	public int GetInputEncoding(long /*int*/ aInputEncoding) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), aInputEncoding);
 	}
 
-	public int GetDocumentURI(int /*long*/ aDocumentURI) {
+	public int GetDocumentURI(long /*int*/ aDocumentURI) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), aDocumentURI);
 	}
 
-	public int AdoptNode(int /*long*/ source, int /*long*/[] _retval) {
+	public int AdoptNode(long /*int*/ source, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), source, _retval);
 	}
 
-	public int CreateRange(int /*long*/[] _retval) {
+	public int CreateRange(long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), _retval);
 	}
 
-	public int CreateNodeIterator(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
+	public int CreateNodeIterator(long /*int*/ root, int whatToShow, long /*int*/ filter, int entityReferenceExpansion, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 21, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
 	}
 
-	public int CreateTreeWalker(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
+	public int CreateTreeWalker(long /*int*/ root, int whatToShow, long /*int*/ filter, int entityReferenceExpansion, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 22, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
 	}
 
-	public int CreateEvent(int /*long*/ eventType, int /*long*/[] _retval) {
+	public int CreateEvent(long /*int*/ eventType, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 23, getAddress(), eventType, _retval);
 	}
 
-	public int GetDefaultView(int /*long*/[] aDefaultView) {
+	public int GetDefaultView(long /*int*/[] aDefaultView) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 24, getAddress(), aDefaultView);
 	}
 
-	public int GetCharacterSet(int /*long*/ aCharacterSet) {
+	public int GetCharacterSet(long /*int*/ aCharacterSet) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 25, getAddress(), aCharacterSet);
 	}
 
-	public int GetDir(int /*long*/ aDir) {
+	public int GetDir(long /*int*/ aDir) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 26, getAddress(), aDir);
 	}
 
-	public int SetDir(int /*long*/ aDir) {
+	public int SetDir(long /*int*/ aDir) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 27, getAddress(), aDir);
 	}
 
-	public int GetLocation(int /*long*/[] aLocation) {
+	public int GetLocation(long /*int*/[] aLocation) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 28, getAddress(), aLocation);
 	}
 
-	public int GetTitle(int /*long*/ aTitle) {
+	public int GetTitle(long /*int*/ aTitle) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 29, getAddress(), aTitle);
 	}
 
-	public int SetTitle(int /*long*/ aTitle) {
+	public int SetTitle(long /*int*/ aTitle) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 30, getAddress(), aTitle);
 	}
 
-	public int GetReadyState(int /*long*/ aReadyState) {
+	public int GetReadyState(long /*int*/ aReadyState) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 31, getAddress(), aReadyState);
 	}
 
-	public int GetLastModified(int /*long*/ aLastModified) {
+	public int GetLastModified(long /*int*/ aLastModified) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 32, getAddress(), aLastModified);
 	}
 
-	public int GetReferrer(int /*long*/ aReferrer) {
+	public int GetReferrer(long /*int*/ aReferrer) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 33, getAddress(), aReferrer);
 	}
@@ -212,57 +212,57 @@ public class nsIDOMDocument extends nsIDOMNode {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 34, getAddress(), _retval);
 	}
 
-	public int GetActiveElement(int /*long*/[] aActiveElement) {
+	public int GetActiveElement(long /*int*/[] aActiveElement) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 35, getAddress(), aActiveElement);
 	}
 
-	public int GetElementsByClassName(int /*long*/ classes, int /*long*/[] _retval) {
+	public int GetElementsByClassName(long /*int*/ classes, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 36, getAddress(), classes, _retval);
 	}
 
-	public int GetStyleSheets(int /*long*/[] aStyleSheets) {
+	public int GetStyleSheets(long /*int*/[] aStyleSheets) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 37, getAddress(), aStyleSheets);
 	}
 
-	public int GetPreferredStyleSheetSet(int /*long*/ aPreferredStyleSheetSet) {
+	public int GetPreferredStyleSheetSet(long /*int*/ aPreferredStyleSheetSet) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 38, getAddress(), aPreferredStyleSheetSet);
 	}
 
-	public int GetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
+	public int GetSelectedStyleSheetSet(long /*int*/ aSelectedStyleSheetSet) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 39, getAddress(), aSelectedStyleSheetSet);
 	}
 
-	public int SetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
+	public int SetSelectedStyleSheetSet(long /*int*/ aSelectedStyleSheetSet) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 40, getAddress(), aSelectedStyleSheetSet);
 	}
 
-	public int GetLastStyleSheetSet(int /*long*/ aLastStyleSheetSet) {
+	public int GetLastStyleSheetSet(long /*int*/ aLastStyleSheetSet) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 41, getAddress(), aLastStyleSheetSet);
 	}
 
-	public int GetStyleSheetSets(int /*long*/[] aStyleSheetSets) {
+	public int GetStyleSheetSets(long /*int*/[] aStyleSheetSets) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 42, getAddress(), aStyleSheetSets);
 	}
 
-	public int EnableStyleSheetsForSet(int /*long*/ name) {
+	public int EnableStyleSheetsForSet(long /*int*/ name) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 43, getAddress(), name);
 	}
 
-	public int ElementFromPoint(float x, float y, int /*long*/[] _retval) {
+	public int ElementFromPoint(float x, float y, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 44, getAddress(), x, y, _retval);
 	}
 
-	public int GetContentType(int /*long*/ aContentType) {
+	public int GetContentType(long /*int*/ aContentType) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 45, getAddress(), aContentType);
 	}
@@ -272,7 +272,7 @@ public class nsIDOMDocument extends nsIDOMNode {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 46, getAddress(), aMozSyntheticDocument);
 	}
 
-	public int GetCurrentScript(int /*long*/[] aCurrentScript) {
+	public int GetCurrentScript(long /*int*/[] aCurrentScript) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 47, getAddress(), aCurrentScript);
 	}
@@ -282,12 +282,12 @@ public class nsIDOMDocument extends nsIDOMNode {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 48, getAddress());
 	}
 
-	public int MozSetImageElement(int /*long*/ aImageElementId, int /*long*/ aImageElement) {
+	public int MozSetImageElement(long /*int*/ aImageElementId, long /*int*/ aImageElement) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 49, getAddress(), aImageElementId, aImageElement);
 	}
 
-	public int GetMozFullScreenElement(int /*long*/[] aMozFullScreenElement) {
+	public int GetMozFullScreenElement(long /*int*/[] aMozFullScreenElement) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 50, getAddress(), aMozFullScreenElement);
 	}
@@ -307,32 +307,32 @@ public class nsIDOMDocument extends nsIDOMNode {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 53, getAddress(), aMozFullScreenEnabled);
 	}
 
-	public int GetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
+	public int GetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 54, getAddress(), cx, aOnreadystatechange);
 	}
 
-	public int SetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
+	public int SetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 55, getAddress(), cx, aOnreadystatechange);
 	}
 
-	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+	public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 56, getAddress(), cx, aOnmouseenter);
 	}
 
-	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+	public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 57, getAddress(), cx, aOnmouseenter);
 	}
 
-	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+	public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 58, getAddress(), cx, aOnmouseleave);
 	}
 
-	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+	public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 59, getAddress(), cx, aOnmouseleave);
 	}
@@ -342,7 +342,7 @@ public class nsIDOMDocument extends nsIDOMNode {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 60, getAddress(), aMozHidden);
 	}
 
-	public int GetMozVisibilityState(int /*long*/ aMozVisibilityState) {
+	public int GetMozVisibilityState(long /*int*/ aMozVisibilityState) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 61, getAddress(), aMozVisibilityState);
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
index caaee0b887..0d30cbd4fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
@@ -43,90 +43,90 @@ public class nsIDOMElement extends nsIDOMNode {
 	public static final nsID NS_IDOMELEMENT_10_IID =
 		new nsID(NS_IDOMELEMENT_10_IID_STR);
 
-	public nsIDOMElement(int /*long*/ address) {
+	public nsIDOMElement(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetTagName(int /*long*/ aTagName) {
+	public int GetTagName(long /*int*/ aTagName) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aTagName);
 	}
 
-	public int GetAttribute(int /*long*/ name, int /*long*/ _retval) {
+	public int GetAttribute(long /*int*/ name, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), name, _retval);
 	}
 
-	public int SetAttribute(int /*long*/ name, int /*long*/ value) {
+	public int SetAttribute(long /*int*/ name, long /*int*/ value) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), name, value);
 	}
 
-	public int RemoveAttribute(int /*long*/ name) {
+	public int RemoveAttribute(long /*int*/ name) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), name);
 	}
 
-	public int GetAttributeNode(int /*long*/ name, int /*long*/[] _retval) {
+	public int GetAttributeNode(long /*int*/ name, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), name, _retval);
 	}
 
-	public int SetAttributeNode(int /*long*/ newAttr, int /*long*/[] _retval) {
+	public int SetAttributeNode(long /*int*/ newAttr, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), newAttr, _retval);
 	}
 
-	public int RemoveAttributeNode(int /*long*/ oldAttr, int /*long*/[] _retval) {
+	public int RemoveAttributeNode(long /*int*/ oldAttr, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), oldAttr, _retval);
 	}
 
-	public int GetElementsByTagName(int /*long*/ name, int /*long*/[] _retval) {
+	public int GetElementsByTagName(long /*int*/ name, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), name, _retval);
 	}
 
-	public int GetAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/ _retval) {
+	public int GetAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), namespaceURI, localName, _retval);
 	}
 
-	public int SetAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/ value) {
+	public int SetAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/ value) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), namespaceURI, qualifiedName, value);
 	}
 
-	public int RemoveAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName) {
+	public int RemoveAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), namespaceURI, localName);
 	}
 
-	public int GetAttributeNodeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+	public int GetAttributeNodeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), namespaceURI, localName, _retval);
 	}
 
-	public int SetAttributeNodeNS(int /*long*/ newAttr, int /*long*/[] _retval) {
+	public int SetAttributeNodeNS(long /*int*/ newAttr, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), newAttr, _retval);
 	}
 
-	public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+	public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 14, getAddress(), namespaceURI, localName, _retval);
 	}
 
-	public int HasAttribute(int /*long*/ name, int[] _retval) {
+	public int HasAttribute(long /*int*/ name, int[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 15, getAddress(), name, _retval);
 	}
 
-	public int HasAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int[] _retval) {
+	public int HasAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, int[] _retval) {
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval);
 	}
 
-	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+	public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), cx, aOnmouseenter);
 	}
 
-	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+	public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), cx, aOnmouseenter);
 	}
 
-	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+	public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), cx, aOnmouseleave);
 	}
 
-	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+	public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), cx, aOnmouseleave);
 	}
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
index c38dc7ff5c..a031d616b4 100644
--- 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
@@ -43,7 +43,7 @@ public class nsIDOMEvent extends nsISupports {
 	public static final nsID NS_IDOMEVENT_10_IID =
 		new nsID(NS_IDOMEVENT_10_IID_STR);
 
-	public nsIDOMEvent(int /*long*/ address) {
+	public nsIDOMEvent(long /*int*/ address) {
 		super(address);
 	}
 
@@ -51,15 +51,15 @@ public class nsIDOMEvent extends nsISupports {
 	public static final int AT_TARGET = 2;
 	public static final int BUBBLING_PHASE = 3;
 
-	public int GetType(int /*long*/ aType) {
+	public int GetType(long /*int*/ aType) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
 	}
 
-	public int GetTarget(int /*long*/[] aTarget) {
+	public int GetTarget(long /*int*/[] aTarget) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
 	}
 
-	public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
+	public int GetCurrentTarget(long /*int*/[] aCurrentTarget) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
 	}
 
@@ -75,7 +75,7 @@ public class nsIDOMEvent extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
 	}
 
-	public int GetTimeStamp(int /*long*/ aTimeStamp) {
+	public int GetTimeStamp(long /*int*/ aTimeStamp) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
 	}
 
@@ -87,7 +87,7 @@ public class nsIDOMEvent extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
 	}
 
-	public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
+	public int InitEvent(long /*int*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
 	}
 	
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
index 46543bc3f0..891bfe9e75 100644
--- 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
@@ -43,25 +43,25 @@ public class nsIDOMEventTarget extends nsISupports {
 	public static final nsID NS_IDOMEVENTTARGET_10_IID =
 		new nsID(NS_IDOMEVENTTARGET_10_IID_STR);
 
-	public nsIDOMEventTarget(int /*long*/ address) {
+	public nsIDOMEventTarget(long /*int*/ address) {
 		super(address);
 	}
 
-	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+	public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
 		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
 	}
 
-	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture, int wantsUntrusted, int _argc) {
+	public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture, int wantsUntrusted, int _argc) {
 		if (!IsXULRunner10) return AddEventListener(type, listener, useCapture);
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture, wantsUntrusted, _argc);
 	}
 
-	public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+	public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
 	}
 
-	public int DispatchEvent(int /*long*/ evt, int[] _retval) {
+	public int DispatchEvent(long /*int*/ evt, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
 	}
 }
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
index 5af974480e..dd1cbb4469 100644
--- 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
@@ -43,7 +43,7 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent {
 	public static final nsID NS_IDOMKEYEVENT_10_IID =
 		new nsID(NS_IDOMKEYEVENT_10_IID_STR);
 	
-	public nsIDOMKeyEvent(int /*long*/ address) {
+	public nsIDOMKeyEvent(long /*int*/ address) {
 		super(address);
 	}
 
@@ -204,7 +204,7 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
 	}
 
-	public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
+	public int InitKeyEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
 	}
 }
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
index e6f100c49d..e4e99ee43b 100644
--- 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
@@ -43,7 +43,7 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
 	public static final nsID NS_IDOMMOUSEEVENT_10_IID =
 		new nsID(NS_IDOMMOUSEEVENT_10_IID_STR);
 
-	public nsIDOMMouseEvent(int /*long*/ address) {
+	public nsIDOMMouseEvent(long /*int*/ address) {
 		super(address);
 	}
 
@@ -83,11 +83,11 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
 	}
 
-	public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
+	public int GetRelatedTarget(long /*int*/[] aRelatedTarget) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
 	}
 
-	public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
+	public int InitMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
 	}
 
@@ -110,7 +110,7 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 13, getAddress(), aMozInputSource);
 	}
 
-	public int InitNSMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg, float pressure, short inputSourceArg) {
+	public int InitNSMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg, float pressure, short inputSourceArg) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 14, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg, pressure, inputSourceArg);
 	}
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
index 9ce83a5a0a..2437ff288b 100644
--- 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
@@ -43,7 +43,7 @@ public class nsIDOMNode extends nsISupports {
 	public static final nsID NS_IDOMNODE_10_IID =
 		new nsID(NS_IDOMNODE_10_IID_STR);
 
-	public nsIDOMNode(int /*long*/ address) {
+	public nsIDOMNode(long /*int*/ address) {
 		super(address);
 	}
 
@@ -60,15 +60,15 @@ public class nsIDOMNode extends nsISupports {
 	public static final int DOCUMENT_FRAGMENT_NODE = 11;
 	public static final int NOTATION_NODE = 12;
 
-	public int GetNodeName(int /*long*/ aNodeName) {
+	public int GetNodeName(long /*int*/ aNodeName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNodeName);
 	}
 
-	public int GetNodeValue(int /*long*/ aNodeValue) {
+	public int GetNodeValue(long /*int*/ aNodeValue) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNodeValue);
 	}
 
-	public int SetNodeValue(int /*long*/ aNodeValue) {
+	public int SetNodeValue(long /*int*/ aNodeValue) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNodeValue);
 	}
 
@@ -76,56 +76,56 @@ public class nsIDOMNode extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNodeType);
 	}
 
-	public int GetParentNode(int /*long*/[] aParentNode) {
+	public int GetParentNode(long /*int*/[] aParentNode) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentNode);
 	}
 
-	public int GetParentElement(int /*long*/[] aParentElement) {
+	public int GetParentElement(long /*int*/[] aParentElement) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentElement);
 	}
 
-	public int GetChildNodes(int /*long*/[] aChildNodes) {
+	public int GetChildNodes(long /*int*/[] aChildNodes) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aChildNodes);
 	}
 
-	public int GetFirstChild(int /*long*/[] aFirstChild) {
+	public int GetFirstChild(long /*int*/[] aFirstChild) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), aFirstChild);
 	}
 
-	public int GetLastChild(int /*long*/[] aLastChild) {
+	public int GetLastChild(long /*int*/[] aLastChild) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), aLastChild);
 	}
 
-	public int GetPreviousSibling(int /*long*/[] aPreviousSibling) {
+	public int GetPreviousSibling(long /*int*/[] aPreviousSibling) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), aPreviousSibling);
 	}
 
-	public int GetNextSibling(int /*long*/[] aNextSibling) {
+	public int GetNextSibling(long /*int*/[] aNextSibling) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), aNextSibling);
 	}
 
-	public int GetAttributes(int /*long*/[] aAttributes) {
+	public int GetAttributes(long /*int*/[] aAttributes) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), aAttributes);
 	}
 
-	public int GetOwnerDocument(int /*long*/[] aOwnerDocument) {
+	public int GetOwnerDocument(long /*int*/[] aOwnerDocument) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), aOwnerDocument);
 	}
 
-	public int InsertBefore(int /*long*/ newChild, int /*long*/ refChild, int /*long*/[] _retval) {
+	public int InsertBefore(long /*int*/ newChild, long /*int*/ refChild, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), newChild, refChild, _retval);
 	}
 
-	public int ReplaceChild(int /*long*/ newChild, int /*long*/ oldChild, int /*long*/[] _retval) {
+	public int ReplaceChild(long /*int*/ newChild, long /*int*/ oldChild, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), newChild, oldChild, _retval);
 	}
 
-	public int RemoveChild(int /*long*/ oldChild, int /*long*/[] _retval) {
+	public int RemoveChild(long /*int*/ oldChild, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), oldChild, _retval);
 	}
 
-	public int AppendChild(int /*long*/ newChild, int /*long*/[] _retval) {
+	public int AppendChild(long /*int*/ newChild, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), newChild, _retval);
 	}
 
@@ -133,7 +133,7 @@ public class nsIDOMNode extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), _retval);
 	}
 
-	public int CloneNode(int deep, int /*long*/[] _retval) {
+	public int CloneNode(int deep, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), deep, _retval);
 	}
 
@@ -141,24 +141,24 @@ public class nsIDOMNode extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress());
 	}
 
-	public int IsSupported(int /*long*/ feature, int /*long*/ version, int[] _retval) {
+	public int IsSupported(long /*int*/ feature, long /*int*/ version, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), feature, version, _retval);
 	}
 
-	public int GetNamespaceURI(int /*long*/ aNamespaceURI) {
+	public int GetNamespaceURI(long /*int*/ aNamespaceURI) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), aNamespaceURI);
 	}
 
-	public int GetPrefix(int /*long*/ aPrefix) {
+	public int GetPrefix(long /*int*/ aPrefix) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aPrefix);
 	}
 
-	public int SetPrefix(int /*long*/ aPrefix) {
+	public int SetPrefix(long /*int*/ aPrefix) {
 		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aPrefix);
 	}
 
-	public int GetLocalName(int /*long*/ aLocalName) {
+	public int GetLocalName(long /*int*/ aLocalName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aLocalName);
 	}
 
@@ -166,7 +166,7 @@ public class nsIDOMNode extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), _retval);
 	}
 	
-	public int GetDOMBaseURI(int /*long*/ aBaseURI) {
+	public int GetDOMBaseURI(long /*int*/ aBaseURI) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aBaseURI);
 	}
@@ -179,52 +179,52 @@ public class nsIDOMNode extends nsISupports {
 	public static final int DOCUMENT_POSITION_CONTAINED_BY = 16;
 	public static final int DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;
 
-	public int CompareDocumentPosition(int /*long*/ other, short[] _retval) {
+	public int CompareDocumentPosition(long /*int*/ other, short[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
 	}
 
-	public int GetTextContent(int /*long*/ aTextContent) {
+	public int GetTextContent(long /*int*/ aTextContent) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aTextContent);
 	}
 
-	public int SetTextContent(int /*long*/ aTextContent) {
+	public int SetTextContent(long /*int*/ aTextContent) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aTextContent);
 	}
 
-	public int LookupPrefix(int /*long*/ namespaceURI, int /*long*/ _retval) {
+	public int LookupPrefix(long /*int*/ namespaceURI, long /*int*/ _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), namespaceURI, _retval);
 	}
 
-	public int IsDefaultNamespace(int /*long*/ namespaceURI, int[] _retval) {
+	public int IsDefaultNamespace(long /*int*/ namespaceURI, int[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), namespaceURI, _retval);
 	}
 
-	public int LookupNamespaceURI(int /*long*/ prefix, int /*long*/ _retval) {
+	public int LookupNamespaceURI(long /*int*/ prefix, long /*int*/ _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), prefix, _retval);
 	}
 
-	public int IsEqualNode(int /*long*/ arg, int[] _retval) {
+	public int IsEqualNode(long /*int*/ arg, int[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), arg, _retval);
 	}
 
-	public int SetUserData(int /*long*/ key, int /*long*/ data, int /*long*/ handler, int /*long*/[] _retval) {
+	public int SetUserData(long /*int*/ key, long /*int*/ data, long /*int*/ handler, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), key, data, handler, _retval);
 	}
 
-	public int GetUserData(int /*long*/ key, int /*long*/[] _retval) {
+	public int GetUserData(long /*int*/ key, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), key, _retval);
 	}
 
-	public int Contains(int /*long*/ aOther, int[] _retval) {
+	public int Contains(long /*int*/ aOther, int[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aOther, _retval);
 	}
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
index a44ec1ff2b..6648049493 100644
--- 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
@@ -37,15 +37,15 @@ public class nsIDOMSerializer extends nsISupports {
 	public static final nsID NS_IDOMSERIALIZER_IID =
 		new nsID(NS_IDOMSERIALIZER_IID_STR);
 
-	public nsIDOMSerializer(int /*long*/ address) {
+	public nsIDOMSerializer(long /*int*/ address) {
 		super(address);
 	}
 
-	public int SerializeToString(int /*long*/ root, int /*long*/[] _retval) {
+	public int SerializeToString(long /*int*/ root, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);
 	}
 
-	public int SerializeToStream(int /*long*/ root, int /*long*/ stream, byte[] charset) {
+	public int SerializeToStream(long /*int*/ root, long /*int*/ stream, byte[] charset) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
index 3a8ec8bb6c..39b41ed774 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
@@ -37,15 +37,15 @@ public class nsIDOMSerializer_1_7 extends nsISupports {
 	public static final nsID NS_IDOMSERIALIZER_IID =
 		new nsID(NS_IDOMSERIALIZER_IID_STR);
 
-	public nsIDOMSerializer_1_7(int /*long*/ address) {
+	public nsIDOMSerializer_1_7(long /*int*/ address) {
 		super(address);
 	}
 
-	public int SerializeToString(int /*long*/ root, int /*long*/ _retval) {
+	public int SerializeToString(long /*int*/ root, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);
 	}
 
-	public int SerializeToStream(int /*long*/ root, int /*long*/ stream, int /*long*/ charset) {
+	public int SerializeToStream(long /*int*/ root, long /*int*/ stream, long /*int*/ charset) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
 	}
 }
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
index e8b4ca57af..2dbb51a6b4 100644
--- 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
@@ -43,11 +43,11 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
 	public static final nsID NS_IDOMUIEVENT_10_IID =
 		new nsID(NS_IDOMUIEVENT_10_IID_STR);
 
-	public nsIDOMUIEvent(int /*long*/ address) {
+	public nsIDOMUIEvent(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetView(int /*long*/[] aView) {
+	public int GetView(long /*int*/[] aView) {
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
 	}
 
@@ -55,7 +55,7 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
 	}
 
-	public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
+	public int InitUIEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg) {
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
 	}
 	
@@ -88,7 +88,7 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 8, getAddress(), aWhich);
 	}
 
-	public int GetRangeParent(int /*long*/[] aRangeParent) {
+	public int GetRangeParent(long /*int*/[] aRangeParent) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 9, getAddress(), aRangeParent);
 	}
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
index 6dd6bf6756..e2d80f628f 100644
--- 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
@@ -43,69 +43,69 @@ public class nsIDOMWindow extends nsISupports {
 	public static final nsID NS_IDOMWINDOW_10_IID =
 		new nsID(NS_IDOMWINDOW_10_IID_STR);
 
-	public nsIDOMWindow(int /*long*/ address) {
+	public nsIDOMWindow(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetWindow(int /*long*/[] aWindow) {
+	public int GetWindow(long /*int*/[] aWindow) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWindow);
 	}
 
-	public int GetSelf(int /*long*/[] aSelf) {
+	public int GetSelf(long /*int*/[] aSelf) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSelf);
 	}
 
-	public int GetDocument(int /*long*/[] aDocument) {
+	public int GetDocument(long /*int*/[] aDocument) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 3 : 1), getAddress(), aDocument);
 	}
 
-	public int GetParent(int /*long*/[] aParent) {
+	public int GetParent(long /*int*/[] aParent) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 2), getAddress(), aParent);
 	}
 
-	public int GetTop(int /*long*/[] aTop) {
+	public int GetTop(long /*int*/[] aTop) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 3), getAddress(), aTop);
 	}
 
-	public int GetScrollbars(int /*long*/[] aScrollbars) {
+	public int GetScrollbars(long /*int*/[] aScrollbars) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 4), getAddress(), aScrollbars);
 	}
 
-	public int GetFrames(int /*long*/[] aFrames) {
+	public int GetFrames(long /*int*/[] aFrames) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 62 : 5), getAddress(), aFrames);
 	}
 
-	public int GetName(int /*long*/ aName) {
+	public int GetName(long /*int*/ aName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 6), getAddress(), aName);
 	}
 
-	public int SetName(int /*long*/ aName) {
+	public int SetName(long /*int*/ aName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 7), getAddress(), aName);
 	}
 
-	public int GetLocation(int /*long*/[] aLocation) {
+	public int GetLocation(long /*int*/[] aLocation) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLocation);
 	}
 
-	public int GetHistory(int /*long*/[] aHistory) {
+	public int GetHistory(long /*int*/[] aHistory) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aHistory);
 	}
 
-	public int GetLocationbar(int /*long*/[] aLocationbar) {
+	public int GetLocationbar(long /*int*/[] aLocationbar) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLocationbar);
 	}
 
-	public int GetMenubar(int /*long*/[] aMenubar) {
+	public int GetMenubar(long /*int*/[] aMenubar) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMenubar);
 	}
 
-	public int GetPersonalbar(int /*long*/[] aPersonalbar) {
+	public int GetPersonalbar(long /*int*/[] aPersonalbar) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPersonalbar);
 	}
@@ -134,7 +134,7 @@ public class nsIDOMWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 51 : 13), getAddress(), xScrollDif, yScrollDif);
 	}
 
-	public int GetSelection(int /*long*/[] _retval) {
+	public int GetSelection(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 38 : 14), getAddress(), _retval);
 	}
 
@@ -151,22 +151,22 @@ public class nsIDOMWindow extends nsISupports {
 	}
 	
 
-	public int GetStatusbar(int /*long*/[] aStatusbar) {
+	public int GetStatusbar(long /*int*/[] aStatusbar) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aStatusbar);
 	}
 
-	public int GetToolbar(int /*long*/[] aToolbar) {
+	public int GetToolbar(long /*int*/[] aToolbar) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aToolbar);
 	}
 
-	public int GetStatus(int /*long*/ aStatus) {
+	public int GetStatus(long /*int*/ aStatus) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aStatus);
 	}
 
-	public int SetStatus(int /*long*/ aStatus) {
+	public int SetStatus(long /*int*/ aStatus) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aStatus);
 	}
@@ -196,42 +196,42 @@ public class nsIDOMWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aLength);
 	}
 
-	public int GetOpener(int /*long*/[] aOpener) {
+	public int GetOpener(long /*int*/[] aOpener) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aOpener);
 	}
 
-	public int SetOpener(int /*long*/ aOpener) {
+	public int SetOpener(long /*int*/ aOpener) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aOpener);
 	}
 
-	public int GetFrameElement(int /*long*/[] aFrameElement) {
+	public int GetFrameElement(long /*int*/[] aFrameElement) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFrameElement);
 	}
 
-	public int GetNavigator(int /*long*/[] aNavigator) {
+	public int GetNavigator(long /*int*/[] aNavigator) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aNavigator);
 	}
 
-	public int GetApplicationCache(int /*long*/[] aApplicationCache) {
+	public int GetApplicationCache(long /*int*/[] aApplicationCache) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aApplicationCache);
 	}
 
-	public int Alert(int /*long*/ text) {
+	public int Alert(long /*int*/ text) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), text);
 	}
 
-	public int Confirm(int /*long*/ text, int[] _retval) {
+	public int Confirm(long /*int*/ text, int[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), text, _retval);
 	}
 
-	public int Prompt(int /*long*/ aMessage, int /*long*/ aInitial, int /*long*/ _retval) {
+	public int Prompt(long /*int*/ aMessage, long /*int*/ aInitial, long /*int*/ _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aMessage, aInitial, _retval);
 	}
@@ -241,42 +241,42 @@ public class nsIDOMWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress());
 	}
 
-	public int ShowModalDialog(int /*long*/ aURI, int /*long*/ aArgs, int /*long*/ aOptions, int /*long*/[] _retval) {
+	public int ShowModalDialog(long /*int*/ aURI, long /*int*/ aArgs, long /*int*/ aOptions, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aURI, aArgs, aOptions, _retval);
 	}
 
-	public int PostMessageMoz(int /*long*/ message, int /*long*/ targetOrigin, int /*long*/ cx) {
+	public int PostMessageMoz(long /*int*/ message, long /*int*/ targetOrigin, long /*int*/ cx) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), message, targetOrigin, cx);
 	}
 
-	public int Atob(int /*long*/ aAsciiString, int /*long*/ _retval) {
+	public int Atob(long /*int*/ aAsciiString, long /*int*/ _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aAsciiString, _retval);
 	}
 
-	public int Btoa(int /*long*/ aBase64Data, int /*long*/ _retval) {
+	public int Btoa(long /*int*/ aBase64Data, long /*int*/ _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aBase64Data, _retval);
 	}
 
-	public int GetSessionStorage(int /*long*/[] aSessionStorage) {
+	public int GetSessionStorage(long /*int*/[] aSessionStorage) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aSessionStorage);
 	}
 
-	public int GetLocalStorage(int /*long*/[] aLocalStorage) {
+	public int GetLocalStorage(long /*int*/[] aLocalStorage) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aLocalStorage);
 	}
 
-	public int MatchMedia(int /*long*/ media_query_list, int /*long*/[] _retval) {
+	public int MatchMedia(long /*int*/ media_query_list, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), media_query_list, _retval);
 	}
 
-	public int GetScreen(int /*long*/[] aScreen) {
+	public int GetScreen(long /*int*/[] aScreen) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aScreen);
 	}
@@ -356,22 +356,22 @@ public class nsIDOMWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aOuterHeight);
 	}
 
-	public int GetComputedStyle(int /*long*/ elt, int /*long*/ pseudoElt, int /*long*/[] _retval) {
+	public int GetComputedStyle(long /*int*/ elt, long /*int*/ pseudoElt, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), elt, pseudoElt, _retval);
 	}
 
-	public int GetWindowRoot(int /*long*/[] aWindowRoot) {
+	public int GetWindowRoot(long /*int*/[] aWindowRoot) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), aWindowRoot);
 	}
 
-	public int GetContent(int /*long*/[] aContent) {
+	public int GetContent(long /*int*/[] aContent) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 68, getAddress(), aContent);
 	}
 
-	public int GetPrompter(int /*long*/[] aPrompter) {
+	public int GetPrompter(long /*int*/[] aPrompter) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 69, getAddress(), aPrompter);
 	}
@@ -381,27 +381,27 @@ public class nsIDOMWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 70, getAddress(), aClosed);
 	}
 
-	public int GetCrypto(int /*long*/[] aCrypto) {
+	public int GetCrypto(long /*int*/[] aCrypto) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 71, getAddress(), aCrypto);
 	}
 
-	public int GetPkcs11(int /*long*/[] aPkcs11) {
+	public int GetPkcs11(long /*int*/[] aPkcs11) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 72, getAddress(), aPkcs11);
 	}
 
-	public int GetControllers(int /*long*/[] aControllers) {
+	public int GetControllers(long /*int*/[] aControllers) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 73, getAddress(), aControllers);
 	}
 
-	public int GetDefaultStatus(int /*long*/ aDefaultStatus) {
+	public int GetDefaultStatus(long /*int*/ aDefaultStatus) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 74, getAddress(), aDefaultStatus);
 	}
 
-	public int SetDefaultStatus(int /*long*/ aDefaultStatus) {
+	public int SetDefaultStatus(long /*int*/ aDefaultStatus) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 75, getAddress(), aDefaultStatus);
 	}
@@ -471,32 +471,32 @@ public class nsIDOMWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 88, getAddress(), widthDif, heightDif);
 	}
 
-	public int Open(int /*long*/ url, int /*long*/ name, int /*long*/ options, int /*long*/[] _retval) {
+	public int Open(long /*int*/ url, long /*int*/ name, long /*int*/ options, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 89, getAddress(), url, name, options, _retval);
 	}
 
-	public int OpenDialog(int /*long*/ url, int /*long*/ name, int /*long*/ options, int /*long*/ aExtraArgument, int /*long*/[] _retval) {
+	public int OpenDialog(long /*int*/ url, long /*int*/ name, long /*int*/ options, long /*int*/ aExtraArgument, long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 90, getAddress(), url, name, options, aExtraArgument, _retval);
 	}
 
-	public int UpdateCommands(int /*long*/ action) {
+	public int UpdateCommands(long /*int*/ action) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 91, getAddress(), action);
 	}
 
-	public int Find(int /*long*/ str, int caseSensitive, int backwards, int wrapAround, int wholeWord, int searchInFrames, int showDialog, int[] _retval) {
+	public int Find(long /*int*/ str, int caseSensitive, int backwards, int wrapAround, int wholeWord, int searchInFrames, int showDialog, int[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 92, getAddress(), str, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog, _retval);
 	}
 
-	public int GetMozPaintCount(int /*long*/ aMozPaintCount) {
+	public int GetMozPaintCount(long /*int*/ aMozPaintCount) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 93, getAddress(), aMozPaintCount);
 	}
 
-	public int MozRequestAnimationFrame(int /*long*/ aListener) {
+	public int MozRequestAnimationFrame(long /*int*/ aListener) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 94, getAddress(), aListener);
 	}
@@ -506,172 +506,172 @@ public class nsIDOMWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 95, getAddress(), aMozAnimationStartTime);
 	}
 
-	public int GetURL(int /*long*/[] aURL) {
+	public int GetURL(long /*int*/[] aURL) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 96, getAddress(), aURL);
 	}
 
-	public int GetGlobalStorage(int /*long*/[] aGlobalStorage) {
+	public int GetGlobalStorage(long /*int*/[] aGlobalStorage) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 97, getAddress(), aGlobalStorage);
 	}
 
-	public int GetOnafterprint(int /*long*/ cx, int /*long*/ aOnafterprint) {
+	public int GetOnafterprint(long /*int*/ cx, long /*int*/ aOnafterprint) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 98, getAddress(), cx, aOnafterprint);
 	}
 
-	public int SetOnafterprint(int /*long*/ cx, int /*long*/ aOnafterprint) {
+	public int SetOnafterprint(long /*int*/ cx, long /*int*/ aOnafterprint) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 99, getAddress(), cx, aOnafterprint);
 	}
 
-	public int GetOnbeforeprint(int /*long*/ cx, int /*long*/ aOnbeforeprint) {
+	public int GetOnbeforeprint(long /*int*/ cx, long /*int*/ aOnbeforeprint) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 100, getAddress(), cx, aOnbeforeprint);
 	}
 
-	public int SetOnbeforeprint(int /*long*/ cx, int /*long*/ aOnbeforeprint) {
+	public int SetOnbeforeprint(long /*int*/ cx, long /*int*/ aOnbeforeprint) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 101, getAddress(), cx, aOnbeforeprint);
 	}
 
-	public int GetOnbeforeunload(int /*long*/ cx, int /*long*/ aOnbeforeunload) {
+	public int GetOnbeforeunload(long /*int*/ cx, long /*int*/ aOnbeforeunload) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 102, getAddress(), cx, aOnbeforeunload);
 	}
 
-	public int SetOnbeforeunload(int /*long*/ cx, int /*long*/ aOnbeforeunload) {
+	public int SetOnbeforeunload(long /*int*/ cx, long /*int*/ aOnbeforeunload) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 103, getAddress(), cx, aOnbeforeunload);
 	}
 
-	public int GetOnhashchange(int /*long*/ cx, int /*long*/ aOnhashchange) {
+	public int GetOnhashchange(long /*int*/ cx, long /*int*/ aOnhashchange) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 104, getAddress(), cx, aOnhashchange);
 	}
 
-	public int SetOnhashchange(int /*long*/ cx, int /*long*/ aOnhashchange) {
+	public int SetOnhashchange(long /*int*/ cx, long /*int*/ aOnhashchange) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 105, getAddress(), cx, aOnhashchange);
 	}
 
-	public int GetOnmessage(int /*long*/ cx, int /*long*/ aOnmessage) {
+	public int GetOnmessage(long /*int*/ cx, long /*int*/ aOnmessage) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 106, getAddress(), cx, aOnmessage);
 	}
 
-	public int SetOnmessage(int /*long*/ cx, int /*long*/ aOnmessage) {
+	public int SetOnmessage(long /*int*/ cx, long /*int*/ aOnmessage) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 107, getAddress(), cx, aOnmessage);
 	}
 
-	public int GetOnoffline(int /*long*/ cx, int /*long*/ aOnoffline) {
+	public int GetOnoffline(long /*int*/ cx, long /*int*/ aOnoffline) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 108, getAddress(), cx, aOnoffline);
 	}
 
-	public int SetOnoffline(int /*long*/ cx, int /*long*/ aOnoffline) {
+	public int SetOnoffline(long /*int*/ cx, long /*int*/ aOnoffline) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 109, getAddress(), cx, aOnoffline);
 	}
 
-	public int GetOnonline(int /*long*/ cx, int /*long*/ aOnonline) {
+	public int GetOnonline(long /*int*/ cx, long /*int*/ aOnonline) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 110, getAddress(), cx, aOnonline);
 	}
 
-	public int SetOnonline(int /*long*/ cx, int /*long*/ aOnonline) {
+	public int SetOnonline(long /*int*/ cx, long /*int*/ aOnonline) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 111, getAddress(), cx, aOnonline);
 	}
 
-	public int GetOnpopstate(int /*long*/ cx, int /*long*/ aOnpopstate) {
+	public int GetOnpopstate(long /*int*/ cx, long /*int*/ aOnpopstate) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 112, getAddress(), cx, aOnpopstate);
 	}
 
-	public int SetOnpopstate(int /*long*/ cx, int /*long*/ aOnpopstate) {
+	public int SetOnpopstate(long /*int*/ cx, long /*int*/ aOnpopstate) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 113, getAddress(), cx, aOnpopstate);
 	}
 
-	public int GetOnpagehide(int /*long*/ cx, int /*long*/ aOnpagehide) {
+	public int GetOnpagehide(long /*int*/ cx, long /*int*/ aOnpagehide) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 114, getAddress(), cx, aOnpagehide);
 	}
 
-	public int SetOnpagehide(int /*long*/ cx, int /*long*/ aOnpagehide) {
+	public int SetOnpagehide(long /*int*/ cx, long /*int*/ aOnpagehide) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 115, getAddress(), cx, aOnpagehide);
 	}
 
-	public int GetOnpageshow(int /*long*/ cx, int /*long*/ aOnpageshow) {
+	public int GetOnpageshow(long /*int*/ cx, long /*int*/ aOnpageshow) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 116, getAddress(), cx, aOnpageshow);
 	}
 
-	public int SetOnpageshow(int /*long*/ cx, int /*long*/ aOnpageshow) {
+	public int SetOnpageshow(long /*int*/ cx, long /*int*/ aOnpageshow) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 117, getAddress(), cx, aOnpageshow);
 	}
 
-	public int GetOnresize(int /*long*/ cx, int /*long*/ aOnresize) {
+	public int GetOnresize(long /*int*/ cx, long /*int*/ aOnresize) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 118, getAddress(), cx, aOnresize);
 	}
 
-	public int SetOnresize(int /*long*/ cx, int /*long*/ aOnresize) {
+	public int SetOnresize(long /*int*/ cx, long /*int*/ aOnresize) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 119, getAddress(), cx, aOnresize);
 	}
 
-	public int GetOnunload(int /*long*/ cx, int /*long*/ aOnunload) {
+	public int GetOnunload(long /*int*/ cx, long /*int*/ aOnunload) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 120, getAddress(), cx, aOnunload);
 	}
 
-	public int SetOnunload(int /*long*/ cx, int /*long*/ aOnunload) {
+	public int SetOnunload(long /*int*/ cx, long /*int*/ aOnunload) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 121, getAddress(), cx, aOnunload);
 	}
 
-	public int GetOndevicemotion(int /*long*/ cx, int /*long*/ aOndevicemotion) {
+	public int GetOndevicemotion(long /*int*/ cx, long /*int*/ aOndevicemotion) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 122, getAddress(), cx, aOndevicemotion);
 	}
 
-	public int SetOndevicemotion(int /*long*/ cx, int /*long*/ aOndevicemotion) {
+	public int SetOndevicemotion(long /*int*/ cx, long /*int*/ aOndevicemotion) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 123, getAddress(), cx, aOndevicemotion);
 	}
 
-	public int GetOndeviceorientation(int /*long*/ cx, int /*long*/ aOndeviceorientation) {
+	public int GetOndeviceorientation(long /*int*/ cx, long /*int*/ aOndeviceorientation) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 124, getAddress(), cx, aOndeviceorientation);
 	}
 
-	public int SetOndeviceorientation(int /*long*/ cx, int /*long*/ aOndeviceorientation) {
+	public int SetOndeviceorientation(long /*int*/ cx, long /*int*/ aOndeviceorientation) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 125, getAddress(), cx, aOndeviceorientation);
 	}
 
-	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+	public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 126, getAddress(), cx, aOnmouseenter);
 	}
 
-	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+	public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 127, getAddress(), cx, aOnmouseenter);
 	}
 
-	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+	public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 128, getAddress(), cx, aOnmouseleave);
 	}
 
-	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+	public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 129, getAddress(), cx, aOnmouseleave);
 	}
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
index 663688ad78..e2500930b5 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIDOMWindowCollection extends nsISupports {
 	public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
 		new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
 
-	public nsIDOMWindowCollection(int /*long*/ address) {
+	public nsIDOMWindowCollection(long /*int*/ address) {
 		super(address);
 	}
 
@@ -45,11 +45,11 @@ public class nsIDOMWindowCollection extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
 	}
 
-	public int Item(int index, int /*long*/[] _retval) {
+	public int Item(int index, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
 	}
 
-	public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
+	public int NamedItem(long /*int*/ name, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _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
index 1b60b12b78..518878a201 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIDataType extends nsISupports {
 	public static final nsID NS_IDATATYPE_IID =
 		new nsID(NS_IDATATYPE_IID_STR);
 
-	public nsIDataType(int /*long*/ address) {
+	public nsIDataType(long /*int*/ address) {
 		super(address);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
index 58aef5f984..9b0719748b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
@@ -37,7 +37,7 @@ public class nsIDirectoryService extends nsISupports {
 	public static final nsID NS_IDIRECTORYSERVICE_IID =
 		new nsID(NS_IDIRECTORYSERVICE_IID_STR);
 
-	public nsIDirectoryService(int /*long*/ address) {
+	public nsIDirectoryService(long /*int*/ address) {
 		super(address);
 	}
 
@@ -45,11 +45,11 @@ public class nsIDirectoryService extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
 	}
 
-	public int RegisterProvider(int /*long*/ prov) {
+	public int RegisterProvider(long /*int*/ prov) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
 	}
 
-	public int UnregisterProvider(int /*long*/ prov) {
+	public int UnregisterProvider(long /*int*/ prov) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
index 8998396675..435d97d05c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
@@ -37,11 +37,11 @@ public class nsIDirectoryServiceProvider extends nsISupports {
 	public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
 		new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
 
-	public nsIDirectoryServiceProvider(int /*long*/ address) {
+	public nsIDirectoryServiceProvider(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
+	public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
index b67059a306..a3b68f2609 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
@@ -37,11 +37,11 @@ public class nsIDirectoryServiceProvider2 extends nsIDirectoryServiceProvider {
 	public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID =
 		new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING);
 
-	public nsIDirectoryServiceProvider2(int /*long*/ address) {
+	public nsIDirectoryServiceProvider2(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetFiles(byte[] prop, int /*long*/[] _retval) {
+	public int GetFiles(byte[] prop, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIDirectoryServiceProvider.LAST_METHOD_ID + 1, getAddress(), prop, _retval);
 	}
 }
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
index 160bfe3540..4c8d7b7f24 100644
--- 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
@@ -49,23 +49,23 @@ public class nsIDocShell extends nsISupports {
 	public static final nsID NS_IDOCSHELL_10_IID =
 		new nsID(NS_IDOCSHELL_10_IID_STR);
 
-	public nsIDocShell(int /*long*/ address) {
+	public nsIDocShell(long /*int*/ address) {
 		super(address);
 	}
 
-	public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
+	public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
 	}
 
-	public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
+	public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
 	}
 
-	public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
+	public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aInheritOwner, char[] aWindowTarget, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
 	}
 
-	public int CreateLoadInfo(int /*long*/[] loadInfo) {
+	public int CreateLoadInfo(long /*int*/[] loadInfo) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
 	}
 
@@ -73,7 +73,7 @@ public class nsIDocShell extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
 	}
 
-	public int SetCurrentURI(int /*long*/ aURI) {
+	public int SetCurrentURI(long /*int*/ aURI) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
 	}
 
@@ -81,43 +81,43 @@ public class nsIDocShell extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
 	}
 
-	public int GetPresContext(int /*long*/[] aPresContext) {
+	public int GetPresContext(long /*int*/[] aPresContext) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
 	}
 
-	public int GetPresShell(int /*long*/[] aPresShell) {
+	public int GetPresShell(long /*int*/[] aPresShell) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
 	}
 
-	public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
+	public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
 	}
 
-	public int GetContentViewer(int /*long*/[] aContentViewer) {
+	public int GetContentViewer(long /*int*/[] aContentViewer) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
 	}
 
-	public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
+	public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
 	}
 
-	public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
+	public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
 	}
 
-	public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
+	public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
 	}
 
-	public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
+	public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
 	}
 
-	public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
+	public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
 	}
 
-	public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
+	public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
 	}
 
@@ -165,7 +165,7 @@ public class nsIDocShell extends nsISupports {
 
 	public static final int ENUMERATE_BACKWARDS = 1;
 
-	public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
+	public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
 	}
 
@@ -261,11 +261,11 @@ public class nsIDocShell extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
 	}
 
-	public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
+	public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
 	}
 
-	public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
+	public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java
index ba9aaa4bcc..c808c0b240 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java
@@ -37,23 +37,23 @@ public class nsIDownload extends nsISupports {
 	public static final nsID NS_IDOWNLOAD_IID =
 		new nsID(NS_IDOWNLOAD_IID_STR);
 
-	public nsIDownload(int /*long*/ address) {
+	public nsIDownload(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Init(int /*long*/ aSource, int /*long*/ aTarget, char[] aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aPersist) {
+	public int Init(long /*int*/ aSource, long /*int*/ aTarget, char[] aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aPersist) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist);
 	}
 
-	public int GetSource(int /*long*/[] aSource) {
+	public int GetSource(long /*int*/[] aSource) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
 	}
 
-	public int GetTarget(int /*long*/[] aTarget) {
+	public int GetTarget(long /*int*/[] aTarget) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget);
 	}
 
-	public int GetPersist(int /*long*/[] aPersist) {
+	public int GetPersist(long /*int*/[] aPersist) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist);
 	}
 
@@ -61,7 +61,7 @@ public class nsIDownload extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);
 	}
 
-	public int GetDisplayName(int /*long*/[] aDisplayName) {
+	public int GetDisplayName(long /*int*/[] aDisplayName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName);
 	}
 
@@ -73,23 +73,23 @@ public class nsIDownload extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime);
 	}
 
-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+	public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo);
 	}
 
-	public int GetListener(int /*long*/[] aListener) {
+	public int GetListener(long /*int*/[] aListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener);
 	}
 
-	public int SetListener(int /*long*/ aListener) {
+	public int SetListener(long /*int*/ aListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener);
 	}
 
-	public int GetObserver(int /*long*/[] aObserver) {
+	public int GetObserver(long /*int*/[] aObserver) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver);
 	}
 
-	public int SetObserver(int /*long*/ aObserver) {
+	public int SetObserver(long /*int*/ aObserver) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
index aeeb02446e..8105fd7c57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
@@ -37,11 +37,11 @@ public class nsIDownload_1_8 extends nsITransfer {
 	public static final nsID NS_IDOWNLOAD_IID =
 		new nsID(NS_IDOWNLOAD_IID_STR);
 
-	public nsIDownload_1_8(int /*long*/ address) {
+	public nsIDownload_1_8(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetTargetFile(int /*long*/[] aTargetFile) {
+	public int GetTargetFile(long /*int*/[] aTargetFile) {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 1, getAddress(), aTargetFile);
 	}
 
@@ -49,27 +49,27 @@ public class nsIDownload_1_8 extends nsITransfer {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 2, getAddress(), aPercentComplete);
 	}
 
-	public int GetAmountTransferred(int /*long*/ aAmountTransferred) {
+	public int GetAmountTransferred(long /*int*/ aAmountTransferred) {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 3, getAddress(), aAmountTransferred);
 	}
 
-	public int GetSize(int /*long*/ aSize) {
+	public int GetSize(long /*int*/ aSize) {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 4, getAddress(), aSize);
 	}
 
-	public int GetSource(int /*long*/[] aSource) {
+	public int GetSource(long /*int*/[] aSource) {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 5, getAddress(), aSource);
 	}
 
-	public int GetTarget(int /*long*/[] aTarget) {
+	public int GetTarget(long /*int*/[] aTarget) {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 6, getAddress(), aTarget);
 	}
 
-	public int GetCancelable(int /*long*/[] aCancelable) {
+	public int GetCancelable(long /*int*/[] aCancelable) {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 7, getAddress(), aCancelable);
 	}
 
-	public int GetDisplayName(int /*long*/[] aDisplayName) {
+	public int GetDisplayName(long /*int*/[] aDisplayName) {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 8, getAddress(), aDisplayName);
 	}
 
@@ -77,7 +77,7 @@ public class nsIDownload_1_8 extends nsITransfer {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 9, getAddress(), aStartTime);
 	}
 
-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+	public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
 		return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo);
 	}
 }
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
index aaa10c3afd..a584ac20a2 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
 	public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
 		new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
 
-	public nsIEmbeddingSiteWindow(int /*long*/ address) {
+	public nsIEmbeddingSiteWindow(long /*int*/ address) {
 		super(address);
 	}
 
@@ -65,7 +65,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
 	}
 
-	public int GetTitle(int /*long*/[] aTitle) {
+	public int GetTitle(long /*int*/[] aTitle) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
 	}
 
@@ -73,7 +73,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
 	}
 
-	public int GetSiteWindow(int /*long*/[] aSiteWindow) {
+	public int GetSiteWindow(long /*int*/[] aSiteWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
index cd83018e5d..3429f561e2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
@@ -37,11 +37,11 @@ public class nsIFactory extends nsISupports {
 	public static final nsID NS_IFACTORY_IID =
 		new nsID(NS_IFACTORY_IID_STR);
 
-	public nsIFactory(int /*long*/ address) {
+	public nsIFactory(long /*int*/ address) {
 		super(address);
 	}
 
-	public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
+	public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
 	}
 
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
index 073380fe55..455f59bc73 100644
--- 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
@@ -37,18 +37,18 @@ public class nsIFile extends nsISupports {
 	public static final nsID NS_IFILE_IID =
 		new nsID(NS_IFILE_IID_STR);
 
-	public nsIFile(int /*long*/ address) {
+	public nsIFile(long /*int*/ address) {
 		super(address);
 	}
 
 	public static final int NORMAL_FILE_TYPE = 0;
 	public static final int DIRECTORY_TYPE = 1;
 
-	public int Append(int /*long*/ node) {
+	public int Append(long /*int*/ node) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
 	}
 
-	public int AppendNative(int /*long*/ node) {
+	public int AppendNative(long /*int*/ node) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
 	}
 
@@ -60,43 +60,43 @@ public class nsIFile extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
 	}
 
-	public int GetLeafName(int /*long*/ aLeafName) {
+	public int GetLeafName(long /*int*/ aLeafName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
 	}
 
-	public int SetLeafName(int /*long*/ aLeafName) {
+	public int SetLeafName(long /*int*/ aLeafName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
 	}
 
-	public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
+	public int GetNativeLeafName(long /*int*/ aNativeLeafName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
 	}
 
-	public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
+	public int SetNativeLeafName(long /*int*/ aNativeLeafName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
 	}
 
-	public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
+	public int CopyTo(long /*int*/ newParentDir, long /*int*/ newName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
 	}
 
-	public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
+	public int CopyToNative(long /*int*/ newParentDir, long /*int*/ newName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
 	}
 
-	public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
+	public int CopyToFollowingLinks(long /*int*/ newParentDir, long /*int*/ newName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
 	}
 
-	public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
+	public int CopyToFollowingLinksNative(long /*int*/ newParentDir, long /*int*/ newName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
 	}
 
-	public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
+	public int MoveTo(long /*int*/ newParentDir, long /*int*/ newName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
 	}
 
-	public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
+	public int MoveToNative(long /*int*/ newParentDir, long /*int*/ newName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
 	}
 
@@ -148,19 +148,19 @@ public class nsIFile extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
 	}
 
-	public int GetTarget(int /*long*/ aTarget) {
+	public int GetTarget(long /*int*/ aTarget) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
 	}
 
-	public int GetNativeTarget(int /*long*/ aNativeTarget) {
+	public int GetNativeTarget(long /*int*/ aNativeTarget) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
 	}
 
-	public int GetPath(int /*long*/ aPath) {
+	public int GetPath(long /*int*/ aPath) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
 	}
 
-	public int GetNativePath(int /*long*/ aNativePath) {
+	public int GetNativePath(long /*int*/ aNativePath) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
 	}
 
@@ -204,23 +204,23 @@ public class nsIFile extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
 	}
 
-	public int Clone(int /*long*/[] _retval) {
+	public int Clone(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
 	}
 
-	public int Equals(int /*long*/ inFile, int[] _retval) {
+	public int Equals(long /*int*/ inFile, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
 	}
 
-	public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
+	public int Contains(long /*int*/ inFile, int recur, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
 	}
 
-	public int GetParent(int /*long*/[] aParent) {
+	public int GetParent(long /*int*/[] aParent) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
 	}
 
-	public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
+	public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
 	}
 }
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
index 916f834f99..f74a83c6b0 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIFilePicker extends nsISupports {
 	public static final nsID NS_IFILEPICKER_IID =
 		new nsID(NS_IFILEPICKER_IID_STR);
 
-	public nsIFilePicker(int /*long*/ address) {
+	public nsIFilePicker(long /*int*/ address) {
 		super(address);
 	}
 
@@ -56,7 +56,7 @@ public class nsIFilePicker extends nsISupports {
 	public static final int filterXUL = 32;
 	public static final int filterApps = 64;
 
-	public int Init(int /*long*/ parent, char[] title, int mode) {
+	public int Init(long /*int*/ parent, char[] title, int mode) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
 	}
 
@@ -68,7 +68,7 @@ public class nsIFilePicker extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
 	}
 
-	public int GetDefaultString(int /*long*/[] aDefaultString) {
+	public int GetDefaultString(long /*int*/[] aDefaultString) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
 	}
 
@@ -76,7 +76,7 @@ public class nsIFilePicker extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
 	}
 
-	public int GetDefaultExtension(int /*long*/[] aDefaultExtension) {
+	public int GetDefaultExtension(long /*int*/[] aDefaultExtension) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
 	}
 
@@ -92,27 +92,27 @@ public class nsIFilePicker extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
 	}
 
-	public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
+	public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
 	}
 
-	public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
+	public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
 	}
 
-	public int GetFile(int /*long*/[] aFile) {
+	public int GetFile(long /*int*/[] aFile) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
 	}
 
-	public int GetFileURL(int /*long*/[] aFileURL) {
+	public int GetFileURL(long /*int*/[] aFileURL) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
 	}
 
-	public int GetFiles(int /*long*/[] aFiles) {
+	public int GetFiles(long /*int*/[] aFiles) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
 	}
 
-	public int Show(int /*long*/ _retval) {
+	public int Show(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
index 60bd674749..e0cdd2e2a4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
@@ -43,7 +43,7 @@ public class nsIFilePicker_1_8 extends nsISupports {
 	public static final nsID NS_IFILEPICKER_10_IID =
 		new nsID(NS_IFILEPICKER_10_IID_STR);
 	
-	public nsIFilePicker_1_8(int /*long*/ address) {
+	public nsIFilePicker_1_8(long /*int*/ address) {
 		super(address);
 	}
 
@@ -67,7 +67,7 @@ public class nsIFilePicker_1_8 extends nsISupports {
 	public static final int filterAudio = 256;
 	public static final int filterVideo = 512;
 
-	public int Init(int /*long*/ parent, int /*long*/ title, short mode) {
+	public int Init(long /*int*/ parent, long /*int*/ title, short mode) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
 	}
 
@@ -75,23 +75,23 @@ public class nsIFilePicker_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
 	}
 
-	public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
+	public int AppendFilter(long /*int*/ title, long /*int*/ filter) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
 	}
 
-	public int GetDefaultString(int /*long*/ aDefaultString) {
+	public int GetDefaultString(long /*int*/ aDefaultString) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
 	}
 
-	public int SetDefaultString(int /*long*/ aDefaultString) {
+	public int SetDefaultString(long /*int*/ aDefaultString) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
 	}
 
-	public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
+	public int GetDefaultExtension(long /*int*/ aDefaultExtension) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
 	}
 
-	public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
+	public int SetDefaultExtension(long /*int*/ aDefaultExtension) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
 	}
 
@@ -103,27 +103,27 @@ public class nsIFilePicker_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
 	}
 
-	public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
+	public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
 	}
 
-	public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
+	public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
 	}
 
-	public int GetFile(int /*long*/[] aFile) {
+	public int GetFile(long /*int*/[] aFile) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
 	}
 
-	public int GetFileURL(int /*long*/[] aFileURL) {
+	public int GetFileURL(long /*int*/[] aFileURL) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
 	}
 
-	public int GetFiles(int /*long*/[] aFiles) {
+	public int GetFiles(long /*int*/[] aFiles) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
 	}
 
-	public int Show(int /*long*/ _retval) {
+	public int Show(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 15), getAddress(), _retval);
 	}
 	
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
index ac4d73b264..c795bd79ba 100644
--- 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
@@ -43,51 +43,51 @@ public class nsIFocusManager extends nsISupports {
 	public static final nsID NS_IFOCUSMANAGER_10_IID =
 			new nsID(NS_IFOCUSMANAGER_10_IID_STR);
 
-	public nsIFocusManager(int /*long*/ address) {
+	public nsIFocusManager(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetActiveWindow(int /*long*/[] aActiveWindow) {
+	public int GetActiveWindow(long /*int*/[] aActiveWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aActiveWindow);
 	}
 
-	public int SetActiveWindow(int /*long*/ aActiveWindow) {
+	public int SetActiveWindow(long /*int*/ aActiveWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aActiveWindow);
 	}
 
-	public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
+	public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aFocusedWindow);
 	}
 
-	public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
+	public int SetFocusedWindow(long /*int*/ aFocusedWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFocusedWindow);
 	}
 
-	public int GetFocusedElement(int /*long*/[] aFocusedElement) {
+	public int GetFocusedElement(long /*int*/[] aFocusedElement) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedElement);
 	}
 
-	public int GetLastFocusMethod(int /*long*/ window, int[] _retval) {
+	public int GetLastFocusMethod(long /*int*/ window, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), window, _retval);
 	}
 
-	public int SetFocus(int /*long*/ aElement, int aFlags) {
+	public int SetFocus(long /*int*/ aElement, int aFlags) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aElement, aFlags);
 	}
 
-	public int MoveFocus(int /*long*/ aWindow, int /*long*/ aStartElement, int aType, int aFlags, int /*long*/[] _retval) {
+	public int MoveFocus(long /*int*/ aWindow, long /*int*/ aStartElement, int aType, int aFlags, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, aStartElement, aType, aFlags, _retval);
 	}
 
-	public int ClearFocus(int /*long*/ aWindow) {
+	public int ClearFocus(long /*int*/ aWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aWindow);
 	}
 
-	public int GetFocusedElementForWindow(int /*long*/ aWindow, int aDeep, int /*long*/[] aFocusedWindow, int /*long*/[] _retval) {
+	public int GetFocusedElementForWindow(long /*int*/ aWindow, int aDeep, long /*int*/[] aFocusedWindow, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aWindow, aDeep, aFocusedWindow, _retval);
 	}
 
-	public int MoveCaretToFocus(int /*long*/ aWindow) {
+	public int MoveCaretToFocus(long /*int*/ aWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aWindow);
 	}
 
@@ -106,31 +106,31 @@ public class nsIFocusManager extends nsISupports {
 	public static final int MOVEFOCUS_ROOT = 7;
 	public static final int MOVEFOCUS_CARET = 8;
 
-	public int WindowRaised(int /*long*/ aWindow) {
+	public int WindowRaised(long /*int*/ aWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aWindow);
 	}
 
-	public int WindowLowered(int /*long*/ aWindow) {
+	public int WindowLowered(long /*int*/ aWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aWindow);
 	}
 
-	public int ContentRemoved(int /*long*/ aDocument, int /*long*/ aElement) {
+	public int ContentRemoved(long /*int*/ aDocument, long /*int*/ aElement) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocument, aElement);
 	}
 
-	public int WindowShown(int /*long*/ aWindow) {
+	public int WindowShown(long /*int*/ aWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aWindow);
 	}
 
-	public int WindowHidden(int /*long*/ aWindow) {
+	public int WindowHidden(long /*int*/ aWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aWindow);
 	}
 
-	public int FireDelayedEvents(int /*long*/ aDocument) {
+	public int FireDelayedEvents(long /*int*/ aDocument) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocument);
 	}
 	
-	public int FocusPlugin(int /*long*/ aPlugin) {
+	public int FocusPlugin(long /*int*/ aPlugin) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPlugin);
 	}
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
index c003eb68b8..d1f6a361c2 100644
--- 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
@@ -37,27 +37,27 @@ public class nsIHelperAppLauncher extends nsISupports {
 	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
 		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
 
-	public nsIHelperAppLauncher(int /*long*/ address) {
+	public nsIHelperAppLauncher(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+	public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
 	}
 
-	public int GetSource(int /*long*/[] aSource) {
+	public int GetSource(long /*int*/[] aSource) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
 	}
 
-	public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
+	public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
 	}
 
-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+	public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
 	}
 
-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+	public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
 	}
 
@@ -65,7 +65,7 @@ public class nsIHelperAppLauncher extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
 	}
 
-	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+	public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
 	}
 
@@ -73,7 +73,7 @@ public class nsIHelperAppLauncher extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
 	}
 
-	public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
+	public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
index 3162274c06..cca3b464da 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
@@ -37,19 +37,19 @@ public class nsIHelperAppLauncherDialog extends nsISupports {
 	public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
 		new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
 
-	public nsIHelperAppLauncherDialog(int /*long*/ address) {
+	public nsIHelperAppLauncherDialog(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Show(int /*long*/ aLauncher, int /*long*/ aContext) {
+	public int Show(long /*int*/ aLauncher, long /*int*/ aContext) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext);
 	}
 
-	public int PromptForSaveToFile(int /*long*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, int /*long*/[] _retval) {
+	public int PromptForSaveToFile(long /*int*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval);
 	}
 
-	public int ShowProgressDialog(int /*long*/ aLauncher, int /*long*/ aContext) {
+	public int ShowProgressDialog(long /*int*/ aLauncher, long /*int*/ aContext) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aLauncher, aContext);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
index aaa8ecd232..332abfccca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
@@ -37,7 +37,7 @@ public class nsIHelperAppLauncherDialog_1_9 extends nsISupports {
 	public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
 		new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
 
-	public nsIHelperAppLauncherDialog_1_9(int /*long*/ address) {
+	public nsIHelperAppLauncherDialog_1_9(long /*int*/ address) {
 		super(address);
 	}
 
@@ -45,11 +45,11 @@ public class nsIHelperAppLauncherDialog_1_9 extends nsISupports {
 	public static final int REASON_SERVERREQUEST = 1;
 	public static final int REASON_TYPESNIFFED = 2;
 
-	public int Show(int /*long*/ aLauncher, int /*long*/ aWindowContext, int aReason) {
+	public int Show(long /*int*/ aLauncher, long /*int*/ aWindowContext, int aReason) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aWindowContext, aReason);
 	}
 
-	public int PromptForSaveToFile(int /*long*/ aLauncher, int /*long*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, int /*long*/[] _retval) {
+	public int PromptForSaveToFile(long /*int*/ aLauncher, long /*int*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval);
 	}
 }
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
index 1aca93b2f5..823e42a6d2 100644
--- 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
@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_1_8 extends nsICancelable {
 	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
 		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
 
-	public nsIHelperAppLauncher_1_8(int /*long*/ address) {
+	public nsIHelperAppLauncher_1_8(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+	public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
 	}
 
-	public int GetSource(int /*long*/[] aSource) {
+	public int GetSource(long /*int*/[] aSource) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
 	}
 
-	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+	public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
 	}
 
-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+	public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
 	}
 
-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+	public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
 	}
 
-	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+	public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
 	}
 
@@ -69,11 +69,11 @@ public class nsIHelperAppLauncher_1_8 extends nsICancelable {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
 	}
 
-	public int GetTargetFile(int /*long*/[] aTargetFile) {
+	public int GetTargetFile(long /*int*/[] aTargetFile) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
 	}
 
-	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+	public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
index d277e754a0..bb3c6cf513 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
 	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
 		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
 
-	public nsIHelperAppLauncher_1_9(int /*long*/ address) {
+	public nsIHelperAppLauncher_1_9(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+	public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
 	}
 
-	public int GetSource(int /*long*/[] aSource) {
+	public int GetSource(long /*int*/[] aSource) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
 	}
 
-	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+	public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
 	}
 
-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+	public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
 	}
 
-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+	public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
 	}
 
-	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+	public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
 	}
 
@@ -69,7 +69,7 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
 	}
 
-	public int GetTargetFile(int /*long*/[] aTargetFile) {
+	public int GetTargetFile(long /*int*/[] aTargetFile) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
 	}
 
@@ -77,7 +77,7 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
 	}
 
-	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+	public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
index a593aa0022..022162df5d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_8 extends nsICancelable {
 	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
 		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
 
-	public nsIHelperAppLauncher_8(int /*long*/ address) {
+	public nsIHelperAppLauncher_8(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+	public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
 	}
 
-	public int GetSource(int /*long*/[] aSource) {
+	public int GetSource(long /*int*/[] aSource) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
 	}
 
-	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+	public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
 	}
 
-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+	public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
 	}
 
-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+	public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
 	}
 
-	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+	public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
 	}
 
@@ -69,7 +69,7 @@ public class nsIHelperAppLauncher_8 extends nsICancelable {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
 	}
 
-	public int GetTargetFile(int /*long*/[] aTargetFile) {
+	public int GetTargetFile(long /*int*/[] aTargetFile) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
 	}
 
@@ -77,11 +77,11 @@ public class nsIHelperAppLauncher_8 extends nsICancelable {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
 	}
 
-	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+	public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
 	}
 	
-	public int GetContentLength(int /*long*/ aContentLength) {
+	public int GetContentLength(long /*int*/ aContentLength) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 11, getAddress(), aContentLength);
 	}
 }
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
index f72f1fd02a..26d0805cbb 100644
--- 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
@@ -37,35 +37,35 @@ public class nsIHttpChannel extends nsIChannel {
 	public static final nsID NS_IHTTPCHANNEL_IID =
 		new nsID(NS_IHTTPCHANNEL_IID_STR);
 
-	public nsIHttpChannel(int /*long*/ address) {
+	public nsIHttpChannel(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetRequestMethod(int /*long*/ aRequestMethod) {
+	public int GetRequestMethod(long /*int*/ aRequestMethod) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 1, getAddress(), aRequestMethod);
 	}
 
-	public int SetRequestMethod(int /*long*/ aRequestMethod) {
+	public int SetRequestMethod(long /*int*/ aRequestMethod) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 2, getAddress(), aRequestMethod);
 	}
 
-	public int GetReferrer(int /*long*/[] aReferrer) {
+	public int GetReferrer(long /*int*/[] aReferrer) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 3, getAddress(), aReferrer);
 	}
 
-	public int SetReferrer(int /*long*/ aReferrer) {
+	public int SetReferrer(long /*int*/ aReferrer) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 4, getAddress(), aReferrer);
 	}
 
-	public int GetRequestHeader(int /*long*/ aHeader, int /*long*/ _retval) {
+	public int GetRequestHeader(long /*int*/ aHeader, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 5, getAddress(), aHeader, _retval);
 	}
 
-	public int SetRequestHeader(int /*long*/ aHeader, int /*long*/ aValue, int aMerge) {
+	public int SetRequestHeader(long /*int*/ aHeader, long /*int*/ aValue, int aMerge) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 6, getAddress(), aHeader, aValue, aMerge);
 	}
 
-	public int VisitRequestHeaders(int /*long*/ aVisitor) {
+	public int VisitRequestHeaders(long /*int*/ aVisitor) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 7, getAddress(), aVisitor);
 	}
 
@@ -89,7 +89,7 @@ public class nsIHttpChannel extends nsIChannel {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 12, getAddress(), aResponseStatus);
 	}
 
-	public int GetResponseStatusText(int /*long*/ aResponseStatusText) {
+	public int GetResponseStatusText(long /*int*/ aResponseStatusText) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 13, getAddress(), aResponseStatusText);
 	}
 
@@ -97,15 +97,15 @@ public class nsIHttpChannel extends nsIChannel {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 14, getAddress(), aRequestSucceeded);
 	}
 
-	public int GetResponseHeader(int /*long*/ header, int /*long*/ _retval) {
+	public int GetResponseHeader(long /*int*/ header, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 15, getAddress(), header, _retval);
 	}
 
-	public int SetResponseHeader(int /*long*/ header, int /*long*/ value, int merge) {
+	public int SetResponseHeader(long /*int*/ header, long /*int*/ value, int merge) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 16, getAddress(), header, value, merge);
 	}
 
-	public int VisitResponseHeaders(int /*long*/ aVisitor) {
+	public int VisitResponseHeaders(long /*int*/ aVisitor) {
 		return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 17, getAddress(), aVisitor);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java
index 0f8cf30be7..a22e85e9e3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java
@@ -37,11 +37,11 @@ public class nsIHttpHeaderVisitor extends nsISupports {
 	public static final nsID NS_IHTTPHEADERVISITOR_IID =
 		new nsID(NS_IHTTPHEADERVISITOR_IID_STR);
 
-	public nsIHttpHeaderVisitor(int /*long*/ address) {
+	public nsIHttpHeaderVisitor(long /*int*/ address) {
 		super(address);
 	}
 
-	public int VisitHeader(int /*long*/ aHeader, int /*long*/ aValue) {
+	public int VisitHeader(long /*int*/ aHeader, long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHeader, aValue);
 	}
 }
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
index a4b52e16f7..88caa1b9b3 100644
--- 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
@@ -37,11 +37,11 @@ public class nsIIOService extends nsISupports {
 	public static final nsID NS_IIOSERVICE_IID =
 		new nsID(NS_IIOSERVICE_IID_STR);
 
-	public nsIIOService(int /*long*/ address) {
+	public nsIIOService(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
+	public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
 	}
 
@@ -49,19 +49,19 @@ public class nsIIOService extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
 	}
 
-	public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
+	public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
 	}
 
-	public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
+	public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
 	}
 
-	public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
+	public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
 	}
 
-	public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
+	public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
 	}
 
@@ -77,7 +77,7 @@ public class nsIIOService extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
 	}
 
-	public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
+	public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _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
index 62959ad4cc..15026fea9b 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIInputStream extends nsISupports {
 	public static final nsID NS_IINPUTSTREAM_IID =
 		new nsID(NS_IINPUTSTREAM_IID_STR);
 
-	public nsIInputStream(int /*long*/ address) {
+	public nsIInputStream(long /*int*/ address) {
 		super(address);
 	}
 
@@ -53,7 +53,7 @@ public class nsIInputStream extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
 	}
 
-	public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
+	public int ReadSegments(long /*int*/ aWriter, long /*int*/ aClosure, int aCount, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
 	}
 
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
index 5d62a6bc44..854a78202a 100644
--- 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
@@ -37,11 +37,11 @@ public class nsIInterfaceRequestor extends nsISupports {
 	public static final nsID NS_IINTERFACEREQUESTOR_IID =
 		new nsID(NS_IINTERFACEREQUESTOR_IID_STR);
 
-	public nsIInterfaceRequestor(int /*long*/ address) {
+	public nsIInterfaceRequestor(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetInterface(nsID uuid, int /*long*/[] result) {
+	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
index 5dbedbe533..ea54083857 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIJSContextStack extends nsISupports {
 	public static final nsID NS_IJSCONTEXTSTACK_IID =
 		new nsID(NS_IJSCONTEXTSTACK_IID_STR);
 
-	public nsIJSContextStack(int /*long*/ address) {
+	public nsIJSContextStack(long /*int*/ address) {
 		super(address);
 	}
 
@@ -45,15 +45,15 @@ public class nsIJSContextStack extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
 	}
 
-	public int Peek(int /*long*/[] _retval) {
+	public int Peek(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
 	}
 
-	public int Pop(int /*long*/[] _retval) {
+	public int Pop(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
 	}
 
-	public int Push(int /*long*/ cx) {
+	public int Push(long /*int*/ cx) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, 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
index 772bec8096..b3c75d93e1 100644
--- 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
@@ -37,19 +37,19 @@ public class nsILocalFile extends nsIFile {
 	public static final nsID NS_ILOCALFILE_IID =
 		new nsID(NS_ILOCALFILE_IID_STR);
 
-	public nsILocalFile(int /*long*/ address) {
+	public nsILocalFile(long /*int*/ address) {
 		super(address);
 	}
 
-	public int InitWithPath(int /*long*/ filePath) {
+	public int InitWithPath(long /*int*/ filePath) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
 	}
 
-	public int InitWithNativePath(int /*long*/ filePath) {
+	public int InitWithNativePath(long /*int*/ filePath) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
 	}
 
-	public int InitWithFile(int /*long*/ aFile) {
+	public int InitWithFile(long /*int*/ aFile) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
 	}
 
@@ -61,15 +61,15 @@ public class nsILocalFile extends nsIFile {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
 	}
 
-	public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
+	public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
 	}
 
-	public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
+	public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
 	}
 
-	public int Load(int /*long*/[] _retval) {
+	public int Load(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
 	}
 
@@ -77,19 +77,19 @@ public class nsILocalFile extends nsIFile {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
 	}
 
-	public int AppendRelativePath(int /*long*/ relativeFilePath) {
+	public int AppendRelativePath(long /*int*/ relativeFilePath) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
 	}
 
-	public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
+	public int AppendRelativeNativePath(long /*int*/ relativeFilePath) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
 	}
 
-	public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
+	public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
 	}
 
-	public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
+	public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
 	}
 
@@ -101,11 +101,11 @@ public class nsILocalFile extends nsIFile {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
 	}
 
-	public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
+	public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
 	}
 
-	public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
+	public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
 	}
 }
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
index e4bfd34ce6..a1ce9663e7 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIMIMEInputStream extends nsIInputStream {
 	public static final nsID NS_IMIMEINPUTSTREAM_IID =
 		new nsID(NS_IMIMEINPUTSTREAM_IID_STR);
 
-	public nsIMIMEInputStream(int /*long*/ address) {
+	public nsIMIMEInputStream(long /*int*/ address) {
 		super(address);
 	}
 
@@ -53,7 +53,7 @@ public class nsIMIMEInputStream extends nsIInputStream {
 		return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 3, getAddress(), name, value);
 	}
 
-	public int SetData(int /*long*/ stream) {
+	public int SetData(long /*int*/ stream) {
 		return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 4, 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
index 641777edbd..6083add105 100644
--- 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
@@ -37,19 +37,19 @@ public class nsIMemory extends nsISupports {
 	public static final nsID NS_IMEMORY_IID =
 		new nsID(NS_IMEMORY_IID_STR);
 
-	public nsIMemory(int /*long*/ address) {
+	public nsIMemory(long /*int*/ address) {
 		super(address);
 	}
 
-	public int /*long*/ Alloc(int size) {
+	public long /*int*/ Alloc(int size) {
 		return XPCOM.nsIMemory_Alloc(getAddress(), size);
 	}
 
-	public int /*long*/ Realloc(int /*long*/ ptr, int newSize) {
+	public long /*int*/ Realloc(long /*int*/ ptr, int newSize) {
 		return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize);
 	}
 
-	public int Free(int /*long*/ ptr) {
+	public int Free(long /*int*/ ptr) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, 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
index 5b3775d472..79c03e880c 100644
--- 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
@@ -37,23 +37,23 @@ public class nsIObserverService extends nsISupports {
 	public static final nsID NS_IOBSERVERSERVICE_IID =
 		new nsID(NS_IOBSERVERSERVICE_IID_STR);
 
-	public nsIObserverService(int /*long*/ address) {
+	public nsIObserverService(long /*int*/ address) {
 		super(address);
 	}
 
-	public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
+	public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
 	}
 
-	public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
+	public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
 	}
 
-	public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
+	public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
 	}
 
-	public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
+	public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
 	}
 }
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
index 55f9d83b5a..37612614a3 100644
--- 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
@@ -43,7 +43,7 @@ public class nsIPrefBranch extends nsISupports {
 	public static final nsID NS_IPREFBRANCH_10_IID =
 		new nsID(NS_IPREFBRANCH_10_IID_STR);
 	
-	public nsIPrefBranch(int /*long*/ address) {
+	public nsIPrefBranch(long /*int*/ address) {
 		super(address);
 	}
 
@@ -52,7 +52,7 @@ public class nsIPrefBranch extends nsISupports {
 	public static final int PREF_INT = 64;
 	public static final int PREF_BOOL = 128;
 
-	public int GetRoot(int /*long*/[] aRoot) {
+	public int GetRoot(long /*int*/[] aRoot) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
 	}
 
@@ -68,7 +68,7 @@ public class nsIPrefBranch extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
 	}
 
-	public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
+	public int GetCharPref(byte[] aPrefName, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
 	}
 
@@ -84,11 +84,11 @@ public class nsIPrefBranch extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
 	}
 
-	public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
+	public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
 	}
 
-	public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
+	public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
 	}
 
@@ -116,7 +116,7 @@ public class nsIPrefBranch extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
 	}
 
-	public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) {
+	public int GetChildList(byte[] aStartingAt, int[] aCount, long /*int*/[] aChildArray) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);
 	}
 
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
index ba0c32ac15..85ce21935a 100644
--- 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
@@ -37,11 +37,11 @@ public class nsIPrefLocalizedString extends nsISupports {
 	public static final nsID NS_IPREFLOCALIZEDSTRING_IID =
 		new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR);
 
-	public nsIPrefLocalizedString(int /*long*/ address) {
+	public nsIPrefLocalizedString(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetData(int /*long*/[] aData) {
+	public int GetData(long /*int*/[] aData) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aData);
 	}
 
@@ -49,7 +49,7 @@ public class nsIPrefLocalizedString extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData);
 	}
 
-	public int ToString(int /*long*/[] _retval) {
+	public int ToString(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
 	}
 
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
index b3fc9fbc75..76459a0185 100644
--- 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
@@ -37,11 +37,11 @@ public class nsIPrefService extends nsISupports {
 	public static final nsID NS_IPREFSERVICE_IID =
 		new nsID(NS_IPREFSERVICE_IID_STR);
 
-	public nsIPrefService(int /*long*/ address) {
+	public nsIPrefService(long /*int*/ address) {
 		super(address);
 	}
 
-	public int ReadUserPrefs(int /*long*/ aFile) {
+	public int ReadUserPrefs(long /*int*/ aFile) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile);
 	}
 
@@ -53,15 +53,15 @@ public class nsIPrefService extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
 
-	public int SavePrefFile(int /*long*/ aFile) {
+	public int SavePrefFile(long /*int*/ aFile) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile);
 	}
 
-	public int GetBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
+	public int GetBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval);
 	}
 
-	public int GetDefaultBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
+	public int GetDefaultBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, 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
index 808682b013..b3f5760560 100644
--- 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
@@ -43,7 +43,7 @@ public class nsIPrincipal extends nsISerializable {
 	public static final nsID NS_IPRINCIPAL_10_IID =
 		new nsID(NS_IPRINCIPAL_10_IID_STR);
 
-	public nsIPrincipal(int /*long*/ address) {
+	public nsIPrincipal(long /*int*/ address) {
 		super(address);
 	}
 
@@ -52,15 +52,15 @@ public class nsIPrincipal extends nsISerializable {
 	public static final int ENABLE_WITH_USER_PERMISSION = 3;
 	public static final int ENABLE_GRANTED = 4;
 
-	public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {
+	public int GetPreferences(long /*int*/[] prefBranch, long /*int*/[] id, long /*int*/[] subjectName, long /*int*/[] grantedList, long /*int*/[] deniedList, int[] isTrusted) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted);
 	}
 
-	public int Equals(int /*long*/ other, int[] _retval) {
+	public int Equals(long /*int*/ other, int[] _retval) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
 	}
 
-	public int EqualsIgnoringDomain(int /*long*/ other, int[] _retval) {
+	public int EqualsIgnoringDomain(long /*int*/ other, int[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), other, _retval);
 	}
@@ -69,19 +69,19 @@ public class nsIPrincipal extends nsISerializable {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 3), getAddress(), aHashValue);
 	}
 
-	public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
+	public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 4), getAddress(), cx, _retval);
 	}
 
-	public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
+	public int GetSecurityPolicy(long /*int*/[] aSecurityPolicy) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 6 : 5), getAddress(), aSecurityPolicy);
 	}
 
-	public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
+	public int SetSecurityPolicy(long /*int*/ aSecurityPolicy) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aSecurityPolicy);
 	}
 
-	public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
+	public int CanEnableCapability(byte[] capability, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), capability, _retval);
 	}
 
@@ -89,35 +89,35 @@ public class nsIPrincipal extends nsISerializable {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), capability, canEnable);
 	}
 
-	public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
+	public int IsCapabilityEnabled(byte[] capability, long /*int*/ annotation, int[] _retval) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), capability, annotation, _retval);
 	}
 
-	public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
+	public int EnableCapability(byte[] capability, long /*int*/[] annotation) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), capability, annotation);
 	}
 
-	public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
+	public int RevertCapability(byte[] capability, long /*int*/[] annotation) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), capability, annotation);
 	}
 
-	public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
+	public int DisableCapability(byte[] capability, long /*int*/[] annotation) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), capability, annotation);
 	}
 
-	public int GetURI(int /*long*/[] aURI) {
+	public int GetURI(long /*int*/[] aURI) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), aURI);
 	}
 
-	public int GetDomain(int /*long*/[] aDomain) {
+	public int GetDomain(long /*int*/[] aDomain) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), aDomain);
 	}
 
-	public int SetDomain(int /*long*/ aDomain) {
+	public int SetDomain(long /*int*/ aDomain) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), aDomain);
 	}
 
-	public int GetOrigin(int /*long*/[] aOrigin) {
+	public int GetOrigin(long /*int*/[] aOrigin) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), aOrigin);
 	}
 
@@ -125,36 +125,36 @@ public class nsIPrincipal extends nsISerializable {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), aHasCertificate);
 	}
 
-	public int GetFingerprint(int /*long*/ aFingerprint) {
+	public int GetFingerprint(long /*int*/ aFingerprint) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), aFingerprint);
 	}
 
-	public int GetPrettyName(int /*long*/ aPrettyName) {
+	public int GetPrettyName(long /*int*/ aPrettyName) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress(), aPrettyName);
 	}
 
-	public int Subsumes(int /*long*/ other, int[] _retval) {
+	public int Subsumes(long /*int*/ other, int[] _retval) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), other, _retval);
 	}
 
-	public int CheckMayLoad(int /*long*/ uri, int report) {
+	public int CheckMayLoad(long /*int*/ uri, int report) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), uri, report);
 	}
 
-	public int GetSubjectName(int /*long*/ aSubjectName) {
+	public int GetSubjectName(long /*int*/ aSubjectName) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aSubjectName);
 	}
 
-	public int GetCertificate(int /*long*/[] aCertificate) {
+	public int GetCertificate(long /*int*/[] aCertificate) {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 23), getAddress(), aCertificate);
 	}
 	
-	public int GetCsp(int /*long*/[] aCsp) {
+	public int GetCsp(long /*int*/[] aCsp) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 25, getAddress(), aCsp);
 	}
 
-	public int SetCsp(int /*long*/ aCsp) {
+	public int SetCsp(long /*int*/ aCsp) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 26, getAddress(), aCsp);
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
index 2cc99e4f7b..1170dc5458 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
@@ -37,11 +37,11 @@ public class nsIProgressDialog extends nsIDownload {
 	public static final nsID NS_IPROGRESSDIALOG_IID =
 		new nsID(NS_IPROGRESSDIALOG_IID_STR);
 
-	public nsIProgressDialog(int /*long*/ address) {
+	public nsIProgressDialog(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Open(int /*long*/ aParent) {
+	public int Open(long /*int*/ aParent) {
 		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
 	}
 
@@ -53,11 +53,11 @@ public class nsIProgressDialog extends nsIDownload {
 		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
 	}
 
-	public int GetDialog(int /*long*/[] aDialog) {
+	public int GetDialog(long /*int*/[] aDialog) {
 		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
 	}
 
-	public int SetDialog(int /*long*/ aDialog) {
+	public int SetDialog(long /*int*/ aDialog) {
 		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
index 13c38f71e1..f3be58f77f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
@@ -37,11 +37,11 @@ public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
 	public static final nsID NS_IPROGRESSDIALOG_IID =
 		new nsID(NS_IPROGRESSDIALOG_IID_STR);
 
-	public nsIProgressDialog_1_8(int /*long*/ address) {
+	public nsIProgressDialog_1_8(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Open(int /*long*/ aParent) {
+	public int Open(long /*int*/ aParent) {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
 	}
 
@@ -53,19 +53,19 @@ public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
 	}
 
-	public int GetObserver(int /*long*/[] aObserver) {
+	public int GetObserver(long /*int*/[] aObserver) {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
 	}
 
-	public int SetObserver(int /*long*/ aObserver) {
+	public int SetObserver(long /*int*/ aObserver) {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
 	}
 
-	public int GetDialog(int /*long*/[] aDialog) {
+	public int GetDialog(long /*int*/[] aDialog) {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
 	}
 
-	public int SetDialog(int /*long*/ aDialog) {
+	public int SetDialog(long /*int*/ aDialog) {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
 	}
 }
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
index e94737a32c..8dcd408ccb 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIPrompt extends nsISupports {
 	public static final nsID NS_IPROMPT_IID =
 		new nsID(NS_IPROMPT_IID_STR);
 
-	public nsIPrompt(int /*long*/ address) {
+	public nsIPrompt(long /*int*/ address) {
 		super(address);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java
index 4ee01295ae..1a467a0ab7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java
@@ -37,11 +37,11 @@ public class nsIPromptFactory extends nsISupports {
 	public static final nsID NS_IPROMPTFACTORY_IID =
 		new nsID(NS_IPROMPTFACTORY_IID_STR);
 
-	public nsIPromptFactory(int /*long*/ address) {
+	public nsIPromptFactory(long /*int*/ address) {
 		super(address);
 	}
 
-	public int getPrompt(int /*long*/ aParent, nsID iid, int /*long*/[] result) {
+	public int getPrompt(long /*int*/ aParent, nsID iid, long /*int*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, iid, result);
 	}
 }
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
index 1ce5e55163..9cfb774a19 100644
--- 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
@@ -37,23 +37,23 @@ public class nsIPromptService extends nsISupports {
 	public static final nsID NS_IPROMPTSERVICE_IID =
 		new nsID(NS_IPROMPTSERVICE_IID_STR);
 
-	public nsIPromptService(int /*long*/ address) {
+	public nsIPromptService(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
+	public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
 	}
 
-	public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
+	public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
 	}
 
-	public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
+	public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
 	}
 
-	public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+	public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
 	}
 
@@ -75,23 +75,23 @@ public class nsIPromptService extends nsISupports {
 	public static final int STD_OK_CANCEL_BUTTONS = 513;
 	public static final int STD_YES_NO_BUTTONS = 1027;
 	
-	public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+	public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
 	}
 
-	public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+	public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
 	}
 
-	public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+	public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
 	}
 
-	public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+	public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
 	}
 
-	public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
+	public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
index fec6bc5897..5d0207fc1f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
@@ -37,15 +37,15 @@ public class nsIPromptService2 extends nsIPromptService {
 	public static final nsID NS_IPROMPTSERVICE2_IID =
 		new nsID(NS_IPROMPTSERVICE2_IID_STR);
 
-	public nsIPromptService2(int /*long*/ address) {
+	public nsIPromptService2(long /*int*/ address) {
 		super(address);
 	}
 
-	public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+	public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
 		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
 	}
 
-	public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
+	public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
 	}
 }
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
index 6311098ca2..bd276755cb 100644
--- 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
@@ -37,15 +37,15 @@ public class nsIProperties extends nsISupports {
 	public static final nsID NS_IPROPERTIES_IID =
 		new nsID(NS_IPROPERTIES_IID_STR);
 
-	public nsIProperties(int /*long*/ address) {
+	public nsIProperties(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
+	public int Get(byte[] prop, nsID iid, long /*int*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
 	}
 
-	public int Set(byte[] prop, int /*long*/ value) {
+	public int Set(byte[] prop, long /*int*/ value) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
 	}
 
@@ -57,7 +57,7 @@ public class nsIProperties extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
 	}
 
-	public int GetKeys(int[] count, int /*long*/[] keys) {
+	public int GetKeys(int[] count, long /*int*/[] keys) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);
 	}
 }
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
index a0689a7739..d931f3f58d 100644
--- 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
@@ -37,11 +37,11 @@ public class nsIRequest extends nsISupports {
 	public static final nsID NS_IREQUEST_IID =
 		new nsID(NS_IREQUEST_IID_STR);
 
-	public nsIRequest(int /*long*/ address) {
+	public nsIRequest(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetName(int /*long*/ aName) {
+	public int GetName(long /*int*/ aName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
 	}
 
@@ -49,7 +49,7 @@ public class nsIRequest extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
 	}
 
-	public int GetStatus(int /*long*/[] aStatus) {
+	public int GetStatus(long /*int*/[] aStatus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
 	}
 
@@ -65,15 +65,15 @@ public class nsIRequest extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
 	}
 
-	public int GetLoadGroup(int /*long*/[] aLoadGroup) {
+	public int GetLoadGroup(long /*int*/[] aLoadGroup) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
 	}
 
-	public int SetLoadGroup(int /*long*/ aLoadGroup) {
+	public int SetLoadGroup(long /*int*/ aLoadGroup) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
 	}
 
-	public int GetLoadFlags(int /*long*/[] aLoadFlags) {
+	public int GetLoadFlags(long /*int*/[] aLoadFlags) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
 	}
 
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
index f366b1c7c3..0a8b3c3531 100644
--- 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
@@ -43,15 +43,15 @@ public class nsISSLStatus extends nsISupports {
 	public static final nsID NS_ISSLSTATUS_10_IID =
 		new nsID(NS_ISSLSTATUS_10_IID_STR);
 
-	public nsISSLStatus(int /*long*/ address) {
+	public nsISSLStatus(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetServerCert(int /*long*/[] aServerCert) {
+	public int GetServerCert(long /*int*/[] aServerCert) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert);
 	}
 
-	public int GetCipherName(int /*long*/[] aCipherName) {
+	public int GetCipherName(long /*int*/[] aCipherName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);
 	}
 
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
index 7a36f9f35e..2ecc2c9765 100644
--- 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
@@ -49,20 +49,20 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 	public static final nsID NS_ISCRIPTSECURITYMANAGER_10_IID =
 		new nsID(NS_ISCRIPTSECURITYMANAGER_10_IID_STR);
 
-	public nsIScriptSecurityManager(int /*long*/ address) {
+	public nsIScriptSecurityManager(long /*int*/ address) {
 		super(address);
 	}
 
-//	public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+//	public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
 //		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
 //	}
 
-	public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+	public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
 		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
 	}
 
-	public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
+	public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 2 : 3), getAddress(), cx, uri);
 	}
 
@@ -73,47 +73,47 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 	public static final int DISALLOW_SCRIPT_OR_DATA = 4;
 	public static final int DISALLOW_SCRIPT = 8;
 
-	public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+	public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 3 : 4), getAddress(), aPrincipal, uri, flags);
 	}
 
-	public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
+	public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 5), getAddress(), from, uri, flags);
 	}
 
-	public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+	public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 6), getAddress(), aPrincipal, uri, flags);
 	}
 
-	public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
+	public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 6 : 7), getAddress(), from, uri, flags);
 	}
 
-	public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
+	public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 8), getAddress(), cx, funObj, targetObj);
 	}
 
-	public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {
+	public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 9), getAddress(), cx, principal, _retval);
 	}
 
-	public int GetSubjectPrincipal(int /*long*/[] _retval) {
+	public int GetSubjectPrincipal(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 10), getAddress(), _retval);
 	}
 
-	public int GetSystemPrincipal(int /*long*/[] _retval) {
+	public int GetSystemPrincipal(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 11), getAddress(), _retval);
 	}
 
-//	public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {
+//	public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval) {
 //		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 11 : 12), getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval);
 //	}
 
-	public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {
+	public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 13), getAddress(), aURI, _retval);
 	}
 
-//	public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {
+//	public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval) {
 //		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 13 : 14), getAddress(), principal, capability, _retval);
 //	}
 
@@ -133,11 +133,11 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 18), getAddress(), capability);
 	}
 
-//	public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+//	public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
 //		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 18 : 19), getAddress(), certificateFingerprint, capability, canEnable);
 //	}
 
-	public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
+	public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 20), getAddress(), cx, obj, _retval);
 	}
 	
@@ -145,32 +145,32 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 21), getAddress(), _retval);
 	}
 	
-	public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
+	public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 22), getAddress(), aJSContext, aTargetURI);
 	}
 	
-	public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
+	public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 23), getAddress(), aSourceURI, aTargetURI, reportError);
 	}
 	
-	public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {
+	public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 24), getAddress(), cx, _retval);
 	}
 	
-	public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {
+	public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 25), getAddress(), aChannel, _retval);
 	}
 	
-	public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {
+	public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval) {
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 25 : 26), getAddress(), aPrincipal, _retval);
 	}
 	
-	public int PushContextPrincipal(int /*long*/ cx, int /*long*/ fp, int /*long*/ principal) {
+	public int PushContextPrincipal(long /*int*/ cx, long /*int*/ fp, long /*int*/ principal) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), cx, fp, principal);
 	}
 	
-	public int PopContextPrincipal(int /*long*/ cx) {
+	public int PopContextPrincipal(long /*int*/ cx) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 27, getAddress(), cx);
 	}
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
index 74ddd6eb3b..af8d253f81 100644
--- 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
@@ -37,7 +37,7 @@ public class nsISeekableStream extends nsISupports {
 	public static final nsID NS_ISEEKABLESTREAM_IID =
 		new nsID(NS_ISEEKABLESTREAM_IID_STR);
 
-	public nsISeekableStream(int /*long*/ address) {
+	public nsISeekableStream(long /*int*/ address) {
 		super(address);
 	}
 
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
index 9537c3619c..25d86c9480 100644
--- 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
@@ -37,15 +37,15 @@ public class nsISerializable extends nsISupports {
 	public static final nsID NS_ISERIALIZABLE_IID =
 		new nsID(NS_ISERIALIZABLE_IID_STR);
 
-	public nsISerializable(int /*long*/ address) {
+	public nsISerializable(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Read(int /*long*/ aInputStream) {
+	public int Read(long /*int*/ aInputStream) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream);
 	}
 
-	public int Write(int /*long*/ aOutputStream) {
+	public int Write(long /*int*/ aOutputStream) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);
 	}
 }
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
index 2f46a6913f..6b357810c4 100644
--- 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
@@ -37,15 +37,15 @@ public class nsIServiceManager extends nsISupports {
 	public static final nsID NS_ISERVICEMANAGER_IID =
 		new nsID(NS_ISERVICEMANAGER_IID_STR);
 
-	public nsIServiceManager(int /*long*/ address) {
+	public nsIServiceManager(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
+	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, int /*long*/[] 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
index 9f29e75265..3a65d38012 100644
--- 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
@@ -37,7 +37,7 @@ public class nsISimpleEnumerator extends nsISupports {
 	public static final nsID NS_ISIMPLEENUMERATOR_IID =
 		new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
 
-	public nsISimpleEnumerator(int /*long*/ address) {
+	public nsISimpleEnumerator(long /*int*/ address) {
 		super(address);
 	}
 
@@ -45,7 +45,7 @@ public class nsISimpleEnumerator extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
 	}
 
-	public int GetNext(int /*long*/[] _retval) {
+	public int GetNext(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, 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
index 2cd9f390f5..885542a894 100644
--- 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
@@ -46,17 +46,17 @@ public class nsISupports {
 	public static final nsID NS_ISUPPORTS_IID =
 		new nsID(NS_ISUPPORTS_IID_STR);
 
-	int /*long*/ address;
+	long /*int*/ address;
 
-	public nsISupports(int /*long*/ address) {
+	public nsISupports(long /*int*/ address) {
 		this.address = address;
 	}
 
-	public int /*long*/ getAddress() {
+	public long /*int*/ getAddress() {
 		return this.address;
 	}
 
-	public int QueryInterface(nsID uuid, int /*long*/[] result) {
+	public int QueryInterface(nsID uuid, long /*int*/[] result) {
 		return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
index be23ec2a5e..92f390afa5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
@@ -37,11 +37,11 @@ public class nsISupportsWeakReference extends nsISupports {
 	public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID =
 		new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR);
 
-	public nsISupportsWeakReference(int /*long*/ address) {
+	public nsISupportsWeakReference(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetWeakReference(int /*long*/[] _retval) {
+	public int GetWeakReference(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
index 50126a60b7..c362e6b1b9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
@@ -37,7 +37,7 @@ public class nsITooltipListener extends nsISupports {
 	public static final nsID NS_ITOOLTIPLISTENER_IID =
 		new nsID(NS_ITOOLTIPLISTENER_IID_STR);
 
-	public nsITooltipListener(int /*long*/ address) {
+	public nsITooltipListener(long /*int*/ address) {
 		super(address);
 	}
 
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
index c9f0ba686d..454b81f102 100644
--- 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
@@ -37,11 +37,11 @@ public class nsITransfer extends nsIWebProgressListener2 {
 	public static final nsID NS_ITRANSFER_IID =
 		new nsID(NS_ITRANSFER_IID_STR);
 
-	public nsITransfer(int /*long*/ address) {
+	public nsITransfer(long /*int*/ address) {
 		super(address);
 	}
 
-	public int Init(int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {
+	public int Init(long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {
 		return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
 	}
 }
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
index f6b6a7cf82..28adbdb1cb 100644
--- 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
@@ -43,67 +43,67 @@ public class nsIURI extends nsISupports {
 	public static final nsID NS_IURI_10_IID =
 			new nsID(NS_IURI_10_IID_STR);
 
-	public nsIURI(int /*long*/ address) {
+	public nsIURI(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetSpec(int /*long*/ aSpec) {
+	public int GetSpec(long /*int*/ aSpec) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
 	}
 
-	public int SetSpec(int /*long*/ aSpec) {
+	public int SetSpec(long /*int*/ aSpec) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
 	}
 
-	public int GetPrePath(int /*long*/ aPrePath) {
+	public int GetPrePath(long /*int*/ aPrePath) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
 	}
 
-	public int GetScheme(int /*long*/ aScheme) {
+	public int GetScheme(long /*int*/ aScheme) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
 	}
 
-	public int SetScheme(int /*long*/ aScheme) {
+	public int SetScheme(long /*int*/ aScheme) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
 	}
 
-	public int GetUserPass(int /*long*/ aUserPass) {
+	public int GetUserPass(long /*int*/ aUserPass) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
 	}
 
-	public int SetUserPass(int /*long*/ aUserPass) {
+	public int SetUserPass(long /*int*/ aUserPass) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
 	}
 
-	public int GetUsername(int /*long*/ aUsername) {
+	public int GetUsername(long /*int*/ aUsername) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
 	}
 
-	public int SetUsername(int /*long*/ aUsername) {
+	public int SetUsername(long /*int*/ aUsername) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
 	}
 
-	public int GetPassword(int /*long*/ aPassword) {
+	public int GetPassword(long /*int*/ aPassword) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
 	}
 
-	public int SetPassword(int /*long*/ aPassword) {
+	public int SetPassword(long /*int*/ aPassword) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
 	}
 
-	public int GetHostPort(int /*long*/ aHostPort) {
+	public int GetHostPort(long /*int*/ aHostPort) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
 	}
 
-	public int SetHostPort(int /*long*/ aHostPort) {
+	public int SetHostPort(long /*int*/ aHostPort) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
 	}
 
-	public int GetHost(int /*long*/ aHost) {
+	public int GetHost(long /*int*/ aHost) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
 	}
 
-	public int SetHost(int /*long*/ aHost) {
+	public int SetHost(long /*int*/ aHost) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
 	}
 
@@ -115,15 +115,15 @@ public class nsIURI extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
 	}
 
-	public int GetPath(int /*long*/ aPath) {
+	public int GetPath(long /*int*/ aPath) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
 	}
 
-	public int SetPath(int /*long*/ aPath) {
+	public int SetPath(long /*int*/ aPath) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
 	}
 
-	public int Equals(int /*long*/ other, int[] _retval) {
+	public int Equals(long /*int*/ other, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
 	}
 
@@ -131,47 +131,47 @@ public class nsIURI extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
 	}
 
-	public int Clone(int /*long*/[] _retval) {
+	public int Clone(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
 	}
 
-	public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
+	public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
 	}
 
-	public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
+	public int GetAsciiSpec(long /*int*/ aAsciiSpec) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
 	}
 
-	public int GetAsciiHost(int /*long*/ aAsciiHost) {
+	public int GetAsciiHost(long /*int*/ aAsciiHost) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
 	}
 
-	public int GetOriginCharset(int /*long*/ aOriginCharset) {
+	public int GetOriginCharset(long /*int*/ aOriginCharset) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
 	}
 	
-	public int GetRef(int /*long*/ aRef) {
+	public int GetRef(long /*int*/ aRef) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aRef);
 	}
 
-	public int SetRef(int /*long*/ aRef) {
+	public int SetRef(long /*int*/ aRef) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aRef);
 	}
 
-	public int EqualsExceptRef(int /*long*/ other, int[] _retval) {
+	public int EqualsExceptRef(long /*int*/ other, int[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), other, _retval);
 	}
 
-	public int CloneIgnoringRef(int /*long*/[] _retval) {
+	public int CloneIgnoringRef(long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), _retval);
 	}
 
-	public int GetSpecIgnoringRef(int /*long*/ aSpecIgnoringRef) {
+	public int GetSpecIgnoringRef(long /*int*/ aSpecIgnoringRef) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aSpecIgnoringRef);
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
index aa6378e315..8b2235f2cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
@@ -37,39 +37,39 @@ public class nsIURIContentListener extends nsISupports {
 	public static final nsID NS_IURICONTENTLISTENER_IID =
 		new nsID(NS_IURICONTENTLISTENER_IID_STR);
 
-	public nsIURIContentListener(int /*long*/ address) {
+	public nsIURIContentListener(long /*int*/ address) {
 		super(address);
 	}
 
-	public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
+	public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
 	}
 
-	public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
+	public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
 	}
 
-	public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
+	public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
 	}
 
-	public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
+	public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
 	}
 
-	public int GetLoadCookie(int /*long*/[] aLoadCookie) {
+	public int GetLoadCookie(long /*int*/[] aLoadCookie) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
 	}
 
-	public int SetLoadCookie(int /*long*/ aLoadCookie) {
+	public int SetLoadCookie(long /*int*/ aLoadCookie) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
 	}
 
-	public int GetParentContentListener(int /*long*/[] aParentContentListener) {
+	public int GetParentContentListener(long /*int*/[] aParentContentListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
 	}
 
-	public int SetParentContentListener(int /*long*/ aParentContentListener) {
+	public int SetParentContentListener(long /*int*/ aParentContentListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
 	}
 }
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
index 9a8dc985b9..582f637afd 100644
--- 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
@@ -37,15 +37,15 @@ public class nsIUploadChannel extends nsISupports {
 	public static final nsID NS_IUPLOADCHANNEL_IID =
 		new nsID(NS_IUPLOADCHANNEL_IID_STR);
 
-	public nsIUploadChannel(int /*long*/ address) {
+	public nsIUploadChannel(long /*int*/ address) {
 		super(address);
 	}
 
-	public int SetUploadStream(int /*long*/ aStream, int /*long*/ aContentType, int aContentLength) {
+	public int SetUploadStream(long /*int*/ aStream, long /*int*/ aContentType, int aContentLength) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aStream, aContentType, aContentLength);
 	}
 
-	public int GetUploadStream(int /*long*/[] aUploadStream) {
+	public int GetUploadStream(long /*int*/[] aUploadStream) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, 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
index 29f9bad86f..07b3525ecd 100644
--- 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
@@ -43,7 +43,7 @@ public class nsIVariant extends nsISupports {
 	public static final nsID NS_IVARIANT_10_IID =
 		new nsID(NS_IVARIANT_10_IID_STR);
 
-	public nsIVariant(int /*long*/ address) {
+	public nsIVariant(long /*int*/ address) {
 		super(address);
 	}
 
@@ -51,11 +51,11 @@ public class nsIVariant extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
 	}
 
-	public int GetAsInt8(int /*long*/ _retval) {
+	public int GetAsInt8(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
 	}
 
-	public int GetAsInt16(int /*long*/ _retval) {
+	public int GetAsInt16(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
 	}
 
@@ -67,7 +67,7 @@ public class nsIVariant extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
 	}
 
-	public int GetAsUint8(int /*long*/ _retval) {
+	public int GetAsUint8(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
 	}
 
@@ -79,7 +79,7 @@ public class nsIVariant extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
 	}
 
-	public int GetAsUint64(int /*long*/ _retval) {
+	public int GetAsUint64(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
 	}
 
@@ -87,7 +87,7 @@ public class nsIVariant extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
 	}
 
-	public int GetAsDouble(int /*long*/ _retval) {
+	public int GetAsDouble(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
 	}
 
@@ -103,56 +103,56 @@ public class nsIVariant extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
 	}
 
-	public int GetAsID(int /*long*/ retval) {
+	public int GetAsID(long /*int*/ retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval);
 	}
 
-	public int GetAsAString(int /*long*/ _retval) {
+	public int GetAsAString(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval);
 	}
 
-	public int GetAsDOMString(int /*long*/ _retval) {
+	public int GetAsDOMString(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);
 	}
 
-	public int GetAsACString(int /*long*/ _retval) {
+	public int GetAsACString(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval);
 	}
 
-	public int GetAsAUTF8String(int /*long*/ _retval) {
+	public int GetAsAUTF8String(long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval);
 	}
 
-	public int GetAsString(int /*long*/[] _retval) {
+	public int GetAsString(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval);
 	}
 
-	public int GetAsWString(int /*long*/[] _retval) {
+	public int GetAsWString(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
 	}
 
-	public int GetAsISupports(int /*long*/[] _retval) {
+	public int GetAsISupports(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
 	}
 
-	public int GetAsJSVal(int /*long*/[] _retval) {
+	public int GetAsJSVal(long /*int*/[] _retval) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), _retval);
 	}
 
-	public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {
+	public int GetAsInterface(long /*int*/[] iid, long /*int*/[] iface) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 23), getAddress(), iid, iface);
 	}
 
-	public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {
+	public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 25 : 24), getAddress(), type, iid, count, ptr);
 	}
 
-	public int GetAsStringWithSize(int[] size, int /*long*/[] str) {
+	public int GetAsStringWithSize(int[] size, long /*int*/[] str) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 26 : 25), getAddress(), size, str);
 	}
 
-	public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {
+	public int GetAsWStringWithSize(int[] size, long /*int*/[] str) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 27 : 26), getAddress(), size, str);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
index 8cccddcac3..7a37dbd41d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
@@ -37,11 +37,11 @@ public class nsIWeakReference extends nsISupports {
 	public static final nsID NS_IWEAKREFERENCE_IID =
 		new nsID(NS_IWEAKREFERENCE_IID_STR);
 
-	public nsIWeakReference(int /*long*/ address) {
+	public nsIWeakReference(long /*int*/ address) {
 		super(address);
 	}
 
-	public int QueryReferent(nsID uuid, int /*long*/[] result) {
+	public int QueryReferent(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/nsIWebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
index ba6c3a5316..02c79c1c58 100644
--- 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
@@ -43,35 +43,35 @@ public class nsIWebBrowser extends nsISupports {
 	public static final nsID NS_IWEBBROWSER_10_IID =
 		new nsID(NS_IWEBBROWSER_10_IID_STR);
 	
-	public nsIWebBrowser(int /*long*/ address) {
+	public nsIWebBrowser(long /*int*/ address) {
 		super(address);
 	}
 
-	public int AddWebBrowserListener(int /*long*/ aListener, nsID aIID) {
+	public int AddWebBrowserListener(long /*int*/ aListener, nsID aIID) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aListener, aIID);
 	}
 
-	public int RemoveWebBrowserListener(int /*long*/ aListener, nsID aIID) {
+	public int RemoveWebBrowserListener(long /*int*/ aListener, nsID aIID) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aListener, aIID);
 	}
 
-	public int GetContainerWindow(int /*long*/[] aContainerWindow) {
+	public int GetContainerWindow(long /*int*/[] aContainerWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContainerWindow);
 	}
 
-	public int SetContainerWindow(int /*long*/ aContainerWindow) {
+	public int SetContainerWindow(long /*int*/ aContainerWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContainerWindow);
 	}
 
-	public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
+	public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener);
 	}
 
-	public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
+	public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener);
 	}
 
-	public int GetContentDOMWindow(int /*long*/[] aContentDOMWindow) {
+	public int GetContentDOMWindow(long /*int*/[] aContentDOMWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, 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
index e97440b48d..e0e0a14cd3 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIWebBrowserChrome extends nsISupports {
 	public static final nsID NS_IWEBBROWSERCHROME_IID =
 		new nsID(NS_IWEBBROWSERCHROME_IID_STR);
 
-	public nsIWebBrowserChrome(int /*long*/ address) {
+	public nsIWebBrowserChrome(long /*int*/ address) {
 		super(address);
 	}
 
@@ -49,11 +49,11 @@ public class nsIWebBrowserChrome extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
 	}
 
-	public int GetWebBrowser(int /*long*/[] aWebBrowser) {
+	public int GetWebBrowser(long /*int*/[] aWebBrowser) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
 	}
 
-	public int SetWebBrowser(int /*long*/ aWebBrowser) {
+	public int SetWebBrowser(long /*int*/ aWebBrowser) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
index 68136bd0df..4f85413a52 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
@@ -37,7 +37,7 @@ public class nsIWebBrowserChromeFocus extends nsISupports {
 	public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID =
 		new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR);
 
-	public nsIWebBrowserChromeFocus(int /*long*/ address) {
+	public nsIWebBrowserChromeFocus(long /*int*/ address) {
 		super(address);
 	}
 
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
index d128470774..ece56a634d 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIWebBrowserFocus extends nsISupports {
 	public static final nsID NS_IWEBBROWSERFOCUS_IID =
 		new nsID(NS_IWEBBROWSERFOCUS_IID_STR);
 
-	public nsIWebBrowserFocus(int /*long*/ address) {
+	public nsIWebBrowserFocus(long /*int*/ address) {
 		super(address);
 	}
 
@@ -57,19 +57,19 @@ public class nsIWebBrowserFocus extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
 	}
 
-	public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
+	public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow);
 	}
 
-	public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
+	public int SetFocusedWindow(long /*int*/ aFocusedWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow);
 	}
 
-	public int GetFocusedElement(int /*long*/[] aFocusedElement) {
+	public int GetFocusedElement(long /*int*/[] aFocusedElement) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement);
 	}
 
-	public int SetFocusedElement(int /*long*/ aFocusedElement) {
+	public int SetFocusedElement(long /*int*/ aFocusedElement) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);
 	}
 }
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
index 7ea0bdd22f..a5cc363817 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIWebBrowserSetup extends nsISupports {
 	public static final nsID NS_IWEBBROWSERSETUP_IID =
 		new nsID(NS_IWEBBROWSERSETUP_IID_STR);
 
-	public nsIWebBrowserSetup(int /*long*/ address) {
+	public nsIWebBrowserSetup(long /*int*/ address) {
 		super(address);
 	}
 
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
index a6d7c266a8..87a26e8142 100644
--- 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
@@ -37,15 +37,15 @@ public class nsIWebBrowserStream extends nsISupports {
 	public static final nsID NS_IWEBBROWSERSTREAM_IID =
 		new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
 
-	public nsIWebBrowserStream(int /*long*/ address) {
+	public nsIWebBrowserStream(long /*int*/ address) {
 		super(address);
 	}
 
-	public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
+	public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
 	}
 
-	public int AppendToStream(int /*long*/ aData, int aLen) {
+	public int AppendToStream(long /*int*/ aData, int aLen) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
 	}
 
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
index 5dc9dda95e..1ca0612827 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIWebNavigation extends nsISupports {
 	public static final nsID NS_IWEBNAVIGATION_IID =
 		new nsID(NS_IWEBNAVIGATION_IID_STR);
 
-	public nsIWebNavigation(int /*long*/ address) {
+	public nsIWebNavigation(long /*int*/ address) {
 		super(address);
 	}
 
@@ -71,7 +71,7 @@ public class nsIWebNavigation extends nsISupports {
 	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, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
+	public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
 	}
 
@@ -87,23 +87,23 @@ public class nsIWebNavigation extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
 	}
 
-	public int GetDocument(int /*long*/[] aDocument) {
+	public int GetDocument(long /*int*/[] aDocument) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
 	}
 
-	public int GetCurrentURI(int /*long*/[] aCurrentURI) {
+	public int GetCurrentURI(long /*int*/[] aCurrentURI) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
 	}
 
-	public int GetReferringURI(int /*long*/[] aReferringURI) {
+	public int GetReferringURI(long /*int*/[] aReferringURI) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
 	}
 
-	public int GetSessionHistory(int /*long*/[] aSessionHistory) {
+	public int GetSessionHistory(long /*int*/[] aSessionHistory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
 	}
 
-	public int SetSessionHistory(int /*long*/ aSessionHistory) {
+	public int SetSessionHistory(long /*int*/ aSessionHistory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
 	}
 }
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
index 8b329f51f0..f1f3efaf2f 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIWebNavigationInfo extends nsISupports {
 	public static final nsID NS_IWEBNAVIGATIONINFO_IID =
 		new nsID(NS_IWEBNAVIGATIONINFO_IID_STR);
 
-	public nsIWebNavigationInfo(int /*long*/ address) {
+	public nsIWebNavigationInfo(long /*int*/ address) {
 		super(address);
 	}
 
@@ -46,7 +46,7 @@ public class nsIWebNavigationInfo extends nsISupports {
 	public static final int PLUGIN = 2;
 	public static final int OTHER = 32768;
 
-	public int IsTypeSupported(int /*long*/ aType, int /*long*/ aWebNav, int[] _retval) {
+	public int IsTypeSupported(long /*int*/ aType, long /*int*/ aWebNav, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, 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
index ba4addd0b1..8f9c97e8ae 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIWebProgress extends nsISupports {
 	public static final nsID NS_IWEBPROGRESS_IID =
 		new nsID(NS_IWEBPROGRESS_IID_STR);
 
-	public nsIWebProgress(int /*long*/ address) {
+	public nsIWebProgress(long /*int*/ address) {
 		super(address);
 	}
 
@@ -52,15 +52,15 @@ public class nsIWebProgress extends nsISupports {
 	public static final int NOTIFY_LOCATION = 128;
 	public static final int NOTIFY_ALL = 255;
 
-	public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
+	public int AddProgressListener(long /*int*/ listener, int aNotifyMask) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
 	}
 
-	public int RemoveProgressListener(int /*long*/ listener) {
+	public int RemoveProgressListener(long /*int*/ listener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
 	}
 
-	public int GetDOMWindow(int /*long*/[] aDOMWindow) {
+	public int GetDOMWindow(long /*int*/[] aDOMWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, 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
index 7ce497eaff..902ef3a290 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIWebProgressListener extends nsISupports {
 	public static final nsID NS_IWEBPROGRESSLISTENER_IID =
 		new nsID(NS_IWEBPROGRESSLISTENER_IID_STR);
 
-	public nsIWebProgressListener(int /*long*/ address) {
+	public nsIWebProgressListener(long /*int*/ address) {
 		super(address);
 	}
 
@@ -57,23 +57,23 @@ public class nsIWebProgressListener extends nsISupports {
 	public static final int STATE_SECURE_MED = 65536;
 	public static final int STATE_SECURE_LOW = 131072;
 
-	public int OnStateChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+	public int OnStateChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aStateFlags, aStatus);
 	}
 
-	public int OnProgressChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+	public int OnProgressChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
 	}
 
-	public int OnLocationChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ location) {
+	public int OnLocationChange(long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ location) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebProgress, aRequest, location);
 	}
 
-	public int OnStatusChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, char[] aMessage) {
+	public int OnStatusChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, char[] aMessage) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWebProgress, aRequest, aStatus, aMessage);
 	}
 
-	public int OnSecurityChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
+	public int OnSecurityChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state);
 	}
 }
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
index d27f4863ff..c1fa07ee54 100644
--- 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
@@ -37,11 +37,11 @@ public class nsIWebProgressListener2 extends nsIWebProgressListener {
 	public static final nsID NS_IWEBPROGRESSLISTENER2_IID =
 		new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR);
 
-	public nsIWebProgressListener2(int /*long*/ address) {
+	public nsIWebProgressListener2(long /*int*/ address) {
 		super(address);
 	}
 
-	public int OnProgressChange64(int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
+	public int OnProgressChange64(long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
 		return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
index 01646f5c48..0db573ee20 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
@@ -37,11 +37,11 @@ public class nsIWindowCreator extends nsISupports {
 	public static final nsID NS_IWINDOWCREATOR_IID =
 		new nsID(NS_IWINDOWCREATOR_IID_STR);
 
-	public nsIWindowCreator(int /*long*/ address) {
+	public nsIWindowCreator(long /*int*/ address) {
 		super(address);
 	}
 
-	public int CreateChromeWindow(int /*long*/ parent, int chromeFlags, int /*long*/[] _retval) {
+	public int CreateChromeWindow(long /*int*/ parent, int chromeFlags, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
index 4bfec46ea4..7596227d07 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
@@ -37,13 +37,13 @@ public class nsIWindowCreator2 extends nsIWindowCreator {
 	public static final nsID NS_IWINDOWCREATOR2_IID =
 		new nsID(NS_IWINDOWCREATOR2_IID_STR);
 
-	public nsIWindowCreator2(int /*long*/ address) {
+	public nsIWindowCreator2(long /*int*/ address) {
 		super(address);
 	}
 
 	public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
 
-	public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
+	public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
 	}
 }
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
index bfb747162c..b9a17819d7 100644
--- 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
@@ -37,51 +37,51 @@ public class nsIWindowWatcher extends nsISupports {
 	public static final nsID NS_IWINDOWWATCHER_IID =
 		new nsID(NS_IWINDOWWATCHER_IID_STR);
 
-	public nsIWindowWatcher(int /*long*/ address) {
+	public nsIWindowWatcher(long /*int*/ address) {
 		super(address);
 	}
 
-	public int OpenWindow(int /*long*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, int /*long*/ aArguments, int /*long*/[] _retval) {
+	public int OpenWindow(long /*int*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, long /*int*/ aArguments, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aUrl, aName, aFeatures, aArguments, _retval);
 	}
 
-	public int RegisterNotification(int /*long*/ aObserver) {
+	public int RegisterNotification(long /*int*/ aObserver) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aObserver);
 	}
 
-	public int UnregisterNotification(int /*long*/ aObserver) {
+	public int UnregisterNotification(long /*int*/ aObserver) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aObserver);
 	}
 
-	public int GetWindowEnumerator(int /*long*/[] _retval) {
+	public int GetWindowEnumerator(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval);
 	}
 
-	public int GetNewPrompter(int /*long*/ aParent, int /*long*/[] _retval) {
+	public int GetNewPrompter(long /*int*/ aParent, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, _retval);
 	}
 
-	public int GetNewAuthPrompter(int /*long*/ aParent, int /*long*/[] _retval) {
+	public int GetNewAuthPrompter(long /*int*/ aParent, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, _retval);
 	}
 
-	public int SetWindowCreator(int /*long*/ creator) {
+	public int SetWindowCreator(long /*int*/ creator) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), creator);
 	}
 
-	public int GetChromeForWindow(int /*long*/ aWindow, int /*long*/[] _retval) {
+	public int GetChromeForWindow(long /*int*/ aWindow, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval);
 	}
 
-	public int GetWindowByName(char[] aTargetName, int /*long*/ aCurrentWindow, int /*long*/[] _retval) {
+	public int GetWindowByName(char[] aTargetName, long /*int*/ aCurrentWindow, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval);
 	}
 
-	public int GetActiveWindow(int /*long*/[] aActiveWindow) {
+	public int GetActiveWindow(long /*int*/[] aActiveWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aActiveWindow);
 	}
 
-	public int SetActiveWindow(int /*long*/ aActiveWindow) {
+	public int SetActiveWindow(long /*int*/ aActiveWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow);
 	}
 }
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
index 76566ddc17..2ccd6283a1 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIWritableVariant extends nsIVariant {
 	public static final nsID NS_IWRITABLEVARIANT_IID =
 		new nsID(NS_IWRITABLEVARIANT_IID_STR);
 
-	public nsIWritableVariant(int /*long*/ address) {
+	public nsIWritableVariant(long /*int*/ address) {
 		super(address);
 	}
 
@@ -101,23 +101,23 @@ public class nsIWritableVariant extends nsIVariant {
 //		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);
 //	}
 
-	public int SetAsID(int /*long*/ aValue) {
+	public int SetAsID(long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue);
 	}
 
-	public int SetAsAString(int /*long*/ aValue) {
+	public int SetAsAString(long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue);
 	}
 
-	public int SetAsDOMString(int /*long*/ aValue) {
+	public int SetAsDOMString(long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue);
 	}
 
-	public int SetAsACString(int /*long*/ aValue) {
+	public int SetAsACString(long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue);
 	}
 
-	public int SetAsAUTF8String(int /*long*/ aValue) {
+	public int SetAsAUTF8String(long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);
 	}
 
@@ -129,15 +129,15 @@ public class nsIWritableVariant extends nsIVariant {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);
 	}
 
-	public int SetAsISupports(int /*long*/ aValue) {
+	public int SetAsISupports(long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue);
 	}
 
-	public int SetAsInterface(nsID iid, int /*long*/ iface) {
+	public int SetAsInterface(nsID iid, long /*int*/ iface) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface);
 	}
 
-	public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) {
+	public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);
 	}
 
@@ -161,7 +161,7 @@ public class nsIWritableVariant extends nsIVariant {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());
 	}
 
-	public int SetFromVariant(int /*long*/ aValue) {
+	public int SetFromVariant(long /*int*/ aValue) {
 		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);
 	}
 }
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
index 23705a0765..430bff12d0 100644
--- 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
@@ -37,87 +37,87 @@ public class nsIX509Cert extends nsISupports {
 	public static final nsID NS_IX509CERT_IID =
 		new nsID(NS_IX509CERT_IID_STR);
 
-	public nsIX509Cert(int /*long*/ address) {
+	public nsIX509Cert(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetNickname(int /*long*/ aNickname) {
+	public int GetNickname(long /*int*/ aNickname) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname);
 	}
 
-	public int GetEmailAddress(int /*long*/ aEmailAddress) {
+	public int GetEmailAddress(long /*int*/ aEmailAddress) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress);
 	}
 
-	public int GetEmailAddresses(int[] length, int /*long*/[] addresses) {
+	public int GetEmailAddresses(int[] length, long /*int*/[] addresses) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses);
 	}
 
-	public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) {
+	public int ContainsEmailAddress(long /*int*/ aEmailAddress, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval);
 	}
 
-	public int GetSubjectName(int /*long*/ aSubjectName) {
+	public int GetSubjectName(long /*int*/ aSubjectName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName);
 	}
 
-	public int GetCommonName(int /*long*/ aCommonName) {
+	public int GetCommonName(long /*int*/ aCommonName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName);
 	}
 
-	public int GetOrganization(int /*long*/ aOrganization) {
+	public int GetOrganization(long /*int*/ aOrganization) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization);
 	}
 
-	public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) {
+	public int GetOrganizationalUnit(long /*int*/ aOrganizationalUnit) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit);
 	}
 
-	public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) {
+	public int GetSha1Fingerprint(long /*int*/ aSha1Fingerprint) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint);
 	}
 
-	public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) {
+	public int GetMd5Fingerprint(long /*int*/ aMd5Fingerprint) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint);
 	}
 
-	public int GetTokenName(int /*long*/ aTokenName) {
+	public int GetTokenName(long /*int*/ aTokenName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName);
 	}
 
-	public int GetIssuerName(int /*long*/ aIssuerName) {
+	public int GetIssuerName(long /*int*/ aIssuerName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName);
 	}
 
-	public int GetSerialNumber(int /*long*/ aSerialNumber) {
+	public int GetSerialNumber(long /*int*/ aSerialNumber) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber);
 	}
 
-	public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) {
+	public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName);
 	}
 
-	public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) {
+	public int GetIssuerOrganization(long /*int*/ aIssuerOrganization) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization);
 	}
 
-	public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) {
+	public int GetIssuerOrganizationUnit(long /*int*/ aIssuerOrganizationUnit) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit);
 	}
 
-	public int GetIssuer(int /*long*/[] aIssuer) {
+	public int GetIssuer(long /*int*/[] aIssuer) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer);
 	}
 
-	public int GetValidity(int /*long*/[] aValidity) {
+	public int GetValidity(long /*int*/[] aValidity) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity);
 	}
 
-	public int GetDbKey(int /*long*/[] aDbKey) {
+	public int GetDbKey(long /*int*/[] aDbKey) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey);
 	}
 
-	public int GetWindowTitle(int /*long*/[] aWindowTitle) {
+	public int GetWindowTitle(long /*int*/[] aWindowTitle) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);
 	}
 
@@ -148,15 +148,15 @@ public class nsIX509Cert extends nsISupports {
 	public static final int CERT_USAGE_StatusResponder = 10;
 	public static final int CERT_USAGE_AnyCA = 11;
 
-	public int GetChain(int /*long*/[] _retval) {
+	public int GetChain(long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
 	}
 
-	public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) {
+	public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, long /*int*/[] usages) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages);
 	}
 
-	public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) {
+	public int GetUsagesString(int ignoreOcsp, int[] verified, long /*int*/ usages) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);
 	}
 
@@ -164,15 +164,15 @@ public class nsIX509Cert extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);
 	}
 
-	public int GetASN1Structure(int /*long*/[] aASN1Structure) {
+	public int GetASN1Structure(long /*int*/[] aASN1Structure) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure);
 	}
 
-	public int GetRawDER(int[] length, int /*long*/[] data) {
+	public int GetRawDER(int[] length, long /*int*/[] data) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data);
 	}
 
-	public int Equals(int /*long*/ other, int[] _retval) {
+	public int Equals(long /*int*/ other, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
 	}
 }
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
index c14d59300f..ac5ebd3d70 100644
--- 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
@@ -37,39 +37,39 @@ public class nsIX509CertValidity extends nsISupports {
 	public static final nsID NS_IX509CERTVALIDITY_IID =
 		new nsID(NS_IX509CERTVALIDITY_IID_STR);
 
-	public nsIX509CertValidity(int /*long*/ address) {
+	public nsIX509CertValidity(long /*int*/ address) {
 		super(address);
 	}
 
-	public int GetNotBefore(int /*long*/ aNotBefore) {
+	public int GetNotBefore(long /*int*/ aNotBefore) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore);
 	}
 
-	public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) {
+	public int GetNotBeforeLocalTime(long /*int*/ aNotBeforeLocalTime) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime);
 	}
 
-	public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) {
+	public int GetNotBeforeLocalDay(long /*int*/ aNotBeforeLocalDay) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay);
 	}
 
-	public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) {
+	public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT);
 	}
 
-	public int GetNotAfter(int /*long*/ aNotAfter) {
+	public int GetNotAfter(long /*int*/ aNotAfter) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter);
 	}
 
-	public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) {
+	public int GetNotAfterLocalTime(long /*int*/ aNotAfterLocalTime) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime);
 	}
 
-	public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) {
+	public int GetNotAfterLocalDay(long /*int*/ aNotAfterLocalDay) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay);
 	}
 
-	public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {
+	public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, 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
index c1366d7864..b33d74fe84 100644
--- 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
@@ -37,7 +37,7 @@ public class nsIXPCSecurityManager extends nsISupports {
 	public static final nsID NS_IXPCSECURITYMANAGER_IID =
 		new nsID(NS_IXPCSECURITYMANAGER_IID_STR);
 
-	public nsIXPCSecurityManager(int /*long*/ address) {
+	public nsIXPCSecurityManager(long /*int*/ address) {
 		super(address);
 	}
 
@@ -55,15 +55,15 @@ public class nsIXPCSecurityManager extends nsISupports {
 
 	public static final int HOOK_ALL = 63;
 
-	public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) {
+	public int CanCreateWrapper(long /*int*/ aJSContext, nsID aIID, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/[] aPolicy) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy);
 	}
 
-	public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) {
+	public int CanCreateInstance(long /*int*/ aJSContext, nsID aCID) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID);
 	}
 
-	public int CanGetService(int /*long*/ aJSContext, nsID aCID) {
+	public int CanGetService(long /*int*/ aJSContext, nsID aCID) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);
 	}
 
@@ -73,7 +73,7 @@ public class nsIXPCSecurityManager extends nsISupports {
 
 	public static final int ACCESS_SET_PROPERTY = 2;
 
-	public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) {
+	public int CanAccess(int aAction, long /*int*/ aCallContext, long /*int*/ aJSContext, long /*int*/ aJSObject, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/ aName, long /*int*/[] aPolicy) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
 	}
 }
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
index dc49321651..4a22bff04a 100644
--- 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
@@ -37,15 +37,15 @@ public class nsIXPConnect extends nsISupports {
 	public static final nsID NS_IXPCONNECT_IID =
 		new nsID(NS_IXPCONNECT_IID_STR);
 
-	public nsIXPConnect(int /*long*/ address) {
+	public nsIXPConnect(long /*int*/ address) {
 		super(address);
 	}
 
-	public int JSValToVariant(int /*long*/ cx, int /*long*/ aJSVal, int /*long*/[] _retval) {
+	public int JSValToVariant(long /*int*/ cx, long /*int*/ aJSVal, long /*int*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, aJSVal, _retval);
 	}
 
-	public int VariantToJS(int /*long*/ ctx, int /*long*/ scope, int /*long*/ value, int /*long*/ _retval) {
+	public int VariantToJS(long /*int*/ ctx, long /*int*/ scope, long /*int*/ value, long /*int*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), ctx, scope, value, _retval);
 	}
 }